Use finalize and remove unneded environment script

Author: perseoGI

conan_config/profiles/emsdk/.base

@@ -5,12 +5,12 @@ compiler.cppstd=17
 compiler.libcxx=libc++
 # Choose between both types of multithreading support (or none)
 # compiler.threads=<posix|wasm_workers>
-compiler.version=4.0.10
+compiler.version=4.0.21
 os=Emscripten
 
 [tool_requires]
 ninja/[*]
-emsdk/4.0.10
+emsdk/4.0.21
 
 [conf]
 tools.build:exelinkflags+=['-sALLOW_MEMORY_GROWTH=1']

conan_config/profiles/emsdk/README.md

@@ -83,7 +83,7 @@ This repository includes the following profiles:
 
 ⚠️ WASM64 caveats:
 
-The latest node version `emsdk/4.0.10` installs is the `node/22.16.0`, which can not run directly wasm64 binaries.
+The latest node version `emsdk/4.0.21` installs is the `node/22.16.0`, which can not run directly wasm64 binaries.
 Also, it is not valid to compile wasm64 with `-sMIN_NODE_VERSION=221600`, see following error:
 ```
 em++: warning: MIN_NODE_VERSION=221600 is not compatible with MEMORY64 (230000 or above required) [-Wcompatibility]

conan_config/profiles/emsdk/local

@@ -1,7 +1,7 @@
 include(./.base)
 
 [platform_tool_requires]
-emsdk/4.0.10
+emsdk/4.0.21
 
 [conf]
 tools.build:compiler_executables={'c':'emcc', 'cpp':'em++'}

conan_config/profiles/emsdk/wasm64

@@ -9,4 +9,4 @@ arch=wasm64
 tools.build:exelinkflags+=['-sMAXIMUM_MEMORY=16GB', '-sINITIAL_MEMORY=16GB', '-sASSERTIONS']
 tools.build:sharedlinkflags+=['-sMAXIMUM_MEMORY=16GB', '-sINITIAL_MEMORY=16GB', '-sASSERTIONS']
 
-# Node version from emsdk/4.0.10 can not run a wasm64 binary. See more details in README
+# Node version from emsdk/4.0.21 can not run a wasm64 binary. See more details in README

recipes/emsdk/all/conandata.yml

@@ -1,4 +1,4 @@
 sources:
-  "4.0.10":
-    url: "https://github.com/emscripten-core/emsdk/archive/4.0.10.tar.gz"
-    sha256: "2497b55ddbba9bf9be2d18cfca3e973d40a0cfaa8d18f6caacb882a65b2faf1c"
+  "4.0.21":
+    url: "https://github.com/emscripten-core/emsdk/archive/4.0.21.tar.gz"
+    sha256: "af986f9594c68df24a9dc70ba9849eec1e9fbe8ddc2e797d5458cadb58b335b7"

recipes/emsdk/all/conanfile.py

@@ -2,8 +2,7 @@
 from pathlib import Path
 
 from conan import ConanFile
-from conan.tools.build import cross_building
-from conan.tools.env import Environment, VirtualBuildEnv
+from conan.tools.env import VirtualBuildEnv
 from conan.tools.files import chdir, copy, get
 from conan.tools.layout import basic_layout
 
@@ -19,39 +18,17 @@ class EmSDKConan(ConanFile):
     license = "MIT"
     package_type = "application"
     settings = "os", "arch"
-    upload_policy = "skip"
-    build_policy = "missing"
 
     def layout(self):
         basic_layout(self, src_folder="src")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True)
 
-    @property
-    def _relative_paths(self):
-        return ["bin", os.path.join("bin", "upstream", "emscripten")]
-
-    @property
-    def _paths(self):
-        return [os.path.join(self.package_folder, path) for path in self._relative_paths]
-
-    @property
-    def _emsdk(self):
-        return os.path.join(self.package_folder, "bin")
-
     @property
     def _emscripten(self):
         return os.path.join(self.package_folder, "bin", "upstream", "emscripten")
 
-    @property
-    def _em_config(self):
-        return os.path.join(self.package_folder, "bin", ".emscripten")
-
-    @property
-    def _em_cache(self):
-        return os.path.join(self.package_folder, "bin", ".emscripten_cache")
-
     @property
     def _node_path(self):
         subfolders = [path for path in (Path(self.package_folder) / "bin" / "node").iterdir() if path.is_dir()]
@@ -77,28 +54,21 @@ def build(self):
     def package(self):
         copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
         copy(self, "*", src=self.source_folder, dst=os.path.join(self.package_folder, "bin"))
-        if not cross_building(self):
-            env = Environment()
-            env.prepend_path("PATH", self._paths)
-            env.define_path("EMSDK", self._emsdk)
-            env.define_path("EMSCRIPTEN", self._emscripten)
-            env.define_path("EM_CONFIG", self._em_config)
-            env.define_path("EM_CACHE", self._em_cache)
-            with env.vars(self, scope="emsdk").apply():
-                self.run("which embuilder")
-                self.run("embuilder build MINIMAL", env=["conanrun"])  # force cache population
-                # Avoid cache failures in case this package is uploaded as paths in sanity.txt are absolute
-                sanity_path = os.path.join(self._em_cache, "sanity.txt")
-                if os.path.exists(sanity_path):
-                    os.remove(sanity_path)
+
+    def finalize(self):
+        copy(self, "*", src=self.immutable_package_folder, dst=self.package_folder)
+        embuilder = os.path.join(
+            self._emscripten, "embuilder" if self.info.settings.os != "Windows" else "embuilder.bat"
+        )
+        self.run(f"{embuilder} build MINIMAL")
 
     def _define_tool_var(self, value):
         suffix = ".bat" if self.settings.os == "Windows" else ""
         path = os.path.join(self._emscripten, f"{value}{suffix}")
         return path
 
     def package_info(self):
-        self.cpp_info.bindirs = self._relative_paths + [self._node_path]
+        self.cpp_info.bindirs = ["bin", os.path.join("bin", "upstream", "emscripten"), self._node_path]
         self.cpp_info.includedirs = []
         self.cpp_info.libdirs = []
         self.cpp_info.resdirs = []
@@ -119,10 +89,10 @@ def package_info(self):
         )
         self.conf_info.prepend("tools.cmake.cmaketoolchain:user_toolchain", toolchain)
 
-        self.buildenv_info.define_path("EMSDK", self._emsdk)
+        self.buildenv_info.define_path("EMSDK", os.path.join(self.package_folder, "bin"))
         self.buildenv_info.define_path("EMSCRIPTEN", self._emscripten)
-        self.buildenv_info.define_path("EM_CONFIG", self._em_config)
-        self.buildenv_info.define_path("EM_CACHE", self._em_cache)
+        self.buildenv_info.define_path("EM_CONFIG", os.path.join(self.package_folder, "bin", ".emscripten"))
+        self.buildenv_info.define_path("EM_CACHE", os.path.join(self.package_folder, "bin", ".emscripten_cache"))
 
         compiler_executables = {
             "c": self._define_tool_var("emcc"),

recipes/emsdk/config.yml

@@ -1,3 +1,3 @@
 versions:
-  "4.0.10":
+  "4.0.21":
     folder: all