Renamed bindings and updated profiles

Author: perseoGI

examples/cross_build/wasm/bindings/CMakeLists.txt

@@ -6,21 +6,7 @@ add_executable(wasm_example main.cpp)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE Eigen3::Eigen)
 
-install(TARGETS wasm_example DESTINATION "."
-        RUNTIME DESTINATION bin
-        ARCHIVE DESTINATION lib
-        LIBRARY DESTINATION lib
-        )
-
-# Required for Emscripten + embind
+# Set the executable suffix to .html in order to generate a html page by
+# Emscripten (there is no way of setting this from a user toolchain or
+# conanfile as it is later overridden by the Emscripten toolchain)
 set(CMAKE_EXECUTABLE_SUFFIX ".html")
-
-set_target_properties(wasm_example PROPERTIES
-    LINK_FLAGS
-        "-sEXPORTED_FUNCTIONS=['_malloc','_free'] \
-        -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap','getValue','setValue'] \
-        -sENVIRONMENT=web \
-        -sALLOW_MEMORY_GROWTH=1 \
-        -sNO_EXIT_RUNTIME=1 \
-        --shell-file ${CMAKE_SOURCE_DIR}/shell.html"
-)

examples/cross_build/wasm/bindings/ci_test_example.py

@@ -0,0 +1,8 @@
+import os
+from test.examples_tools import run
+
+run("conan build . --build=missing --profile:host ../profiles/wasm32")
+
+assert os.path.exists(os.path.join("build", "release-wasm", "wasm_example.html"))
+assert os.path.exists(os.path.join("build", "release-wasm", "wasm_example.js"))
+assert os.path.exists(os.path.join("build", "release-wasm", "wasm_example.wasm"))

examples/cross_build/wasm/bindings/conanfile.py

@@ -9,20 +9,8 @@ class WasmExampleRecipe(ConanFile):
     name = "wasm-example"
     version = "1.0"
     package_type = "application"
-
-    # Optional metadata
-    license = "<Put the package license here>"
-    author = "<Put your name here> <And your email here>"
-    url = "<Package recipe repository url here, for issues about the package>"
-    description = "<Description of exe package here>"
-    topics = ("<Put some tag here>", "<here>", "<and here>")
-
-    # Binary configuration
     settings = "os", "compiler", "build_type", "arch"
 
-    # Sources are located in the same place as this recipe, copy them to the recipe
-    exports_sources = "CMakeLists.txt", "src/*"
-
     def layout(self):
         cmake_layout(self)
 
@@ -33,13 +21,19 @@ def generate(self):
         deps = CMakeDeps(self)
         deps.generate()
         tc = CMakeToolchain(self)
+
+        tc.extra_exelinkflags.append(
+            "-sEXPORTED_FUNCTIONS=['_malloc','_free'] \
+            -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap','getValue','setValue'] \
+            -sENVIRONMENT=web \
+            -sALLOW_MEMORY_GROWTH=1 \
+            -sNO_EXIT_RUNTIME=1 \
+            --shell-file ${CMAKE_SOURCE_DIR}/shell.html"
+        )
+
         tc.generate()
 
     def build(self):
         cmake = CMake(self)
         cmake.configure()
         cmake.build()
-
-    def package(self):
-        cmake = CMake(self)
-        cmake.install()

examples/cross_build/wasm/wasm64/ci_test_example.py

@@ -0,0 +1,17 @@
+import platform
+from test.examples_tools import chdir, run
+
+run("conan build . --build=missing --profile:host ../profiles/wasm32")
+run("conan build . --build=missing --profile:host ../profiles/wasm64")
+
+if platform.system() == "Windows":
+    with chdir("build"):
+        run("generators\\conanbuild.bat && node --version && node release-wasm\\wasm-alloc.js")
+        # Needs at least Node.js 24.0.0
+        # run("generators\\conanbuild.bat && node --version && node release-wasm64\\wasm-alloc.js")
+else: 
+    with chdir("build/release-wasm"):
+        run(". generators/conanbuild.sh && node --version && node release-wasm/wasm-alloc.js")
+        # Needs at least Node.js 24.0.0
+        # run(". generators/conanbuild.sh && node --version && node release-wasm64/wasm-alloc.js")
+

examples/cross_build/wasm/wasm_game/CMakeLists.txt

@@ -9,5 +9,5 @@ target_link_libraries(wasm_game raylib)
 
 # Set the executable suffix to .html in order to generate a html page by
 # Emscripten (there is no way of setting this from a user toolchain or
-# conanfile as it is later overriden by the emscripten toolchain)
+# conanfile as it is later overridden by the Emscripten toolchain)
 set(CMAKE_EXECUTABLE_SUFFIX ".html")

examples/cross_build/wasm/wasm_game/README.md

@@ -4,8 +4,9 @@ This project is a copy of our [raylib](https://github.com/conan-io/examples2/tre
 
 It has minor modifications:
 
-- C++ source code has been modified in order to accept mouse clicks as inputs as it is more convenient for a webpage
-- `CMakeLists.txt` has been modified in order to link against raylib correctly using WASM
+- C++ source code has been slightly modified in order to accept mouse clicks as inputs as it is more convenient for a webpage
+- `CMakeLists.txt` has been modified in order to generate a `html` target which can bee opened by a web browser
+- `conanfile.py` `generate()` method has been modified in order to link against raylib correctly using WASM
     - `-sUSE_GLFW=3 -sASYNCIFY`: see [raylib web manual](https://github.com/raysan5/raylib/wiki/Working-for-Web-(HTML5)#23-using-cmake) for a deeper explanation
     - `--shell-file`: generate the html code from the template
 

examples/cross_build/wasm/wasm_game/ci_test_example.py

@@ -0,0 +1,8 @@
+import os
+from test.examples_tools import run
+
+run("conan build . --build=missing --profile:host ../profiles/wasm32")
+
+assert os.path.exists(os.path.join("build", "release-wasm", "wasm_game.html"))
+assert os.path.exists(os.path.join("build", "release-wasm", "wasm_game.js"))
+assert os.path.exists(os.path.join("build", "release-wasm", "wasm_game.wasm"))