Renamed and fixed profiles

Author: perseoGI

examples/cross_build/wasm/bindings/CMakeLists.txt renamed to examples/cross_build/emscripten/bindings/CMakeLists.txt

@@ -2,9 +2,11 @@ cmake_minimum_required(VERSION 3.15)
 project(wasm_example CXX)
 
 find_package(Eigen3 REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(fmt REQUIRED)
 add_executable(wasm_example main.cpp)
 
-target_link_libraries(${PROJECT_NAME} PRIVATE Eigen3::Eigen)
+target_link_libraries(${PROJECT_NAME} PRIVATE Eigen3::Eigen ZLIB::ZLIB fmt::fmt)
 
 # 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

examples/cross_build/wasm/bindings/README.md renamed to examples/cross_build/emscripten/bindings/README.md

@@ -1,6 +1,5 @@
 # WASM project with bindings and conan dependency
 
-
 ## Build and run
 
 To compile the project:
@@ -12,7 +11,21 @@ $ conan build . -pr:h ../profiles/wasm32 --build=missing
 To open a WASM webpage locally, most of the browsers will complain due to security reasons as WASM must be loaded asynchronous
 
 The easiest way of opening the generated webpage (should be in `build/release-wasm/wasm_example.html`) is by running a local server.
-This can be done via `emrun` command (needs to be downloaded):
+This can be done via `emrun` command:
+
+`emrun` is packaged with `emskd` recipe so it should be available by activating build environment:
+
+**POSIX**
+```sh
+$ source build/release-wasm/generators/conanbuild.sh
+```
+
+**Windows**
+```sh
+$ build\release-wasm\generators\conanbuild.bat
+```
+
+By this time, `emrun`, `node`, and other JS/WASM tools should be available in the path:
 
 ```sh
 $ emrun --browser <browser_name> build/release-wasm/wasm_example.html   

examples/cross_build/wasm/bindings/ci_test_example.py renamed to examples/cross_build/emscripten/bindings/ci_test_example.py

@@ -1,8 +1,5 @@
-import os
-
 from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import copy
 
 
 class WasmExampleRecipe(ConanFile):
@@ -16,21 +13,23 @@ def layout(self):
 
     def requirements(self):
         self.requires("eigen/3.4.0")
+        self.requires("zlib/1.3.1")
+        self.requires("fmt/11.1.4")
 
     def generate(self):
         deps = CMakeDeps(self)
         deps.generate()
         tc = CMakeToolchain(self)
 
+        # HEAPxx values need to be exported explicitly since Emscripten 4.0.7  
+        # https://github.com/emscripten-core/emscripten/blob/main/ChangeLog.md#407---041525
         tc.extra_exelinkflags.append(
             "-sEXPORTED_FUNCTIONS=['_malloc','_free'] \
-            -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap','getValue','setValue'] \
-            -sENVIRONMENT=web \
+            -sEXPORTED_RUNTIME_METHODS=['ccall','cwrap','getValue','setValue','HEAPF32'] \
             -sALLOW_MEMORY_GROWTH=1 \
             -sNO_EXIT_RUNTIME=1 \
             --shell-file ${CMAKE_SOURCE_DIR}/shell.html"
         )
-
         tc.generate()
 
     def build(self):

examples/cross_build/wasm/bindings/conanfile.py renamed to examples/cross_build/emscripten/bindings/conanfile.py

@@ -1,8 +1,10 @@
 #include <Eigen/Core>
 #include <cstdint>
 #include <emscripten/emscripten.h>
+#include <fmt/printf.h>
 #include <iostream>
 #include <string>
+#include <zlib.h>
 
 #ifdef __cplusplus
 #define EXTERN extern "C"
@@ -36,18 +38,22 @@ EXTERN EMSCRIPTEN_KEEPALIVE void addOne(int32_t *input, int32_t *output) {
 }
 
 EXTERN EMSCRIPTEN_KEEPALIVE float sumArray(const float *data, int32_t size) {
-  // print data input
-  std::cout << "Data input: ";
+  fmt::print("Data input: ");
   for (int i = 0; i < size; ++i) {
-    std::cout << data[i] << " ";
+    fmt::print("{} ", data[i]);
   }
   std::cout << std::endl;
   Eigen::Map<const Eigen::ArrayXf> vec(data, size);
   return vec.sum();
 }
 
+EXTERN EMSCRIPTEN_KEEPALIVE void getZlibVersion() {
+  fmt::print("Zlib version being used: {}\n", zlibVersion());
+}
+
 int main() {
   std::cout << "Hello World!" << std::endl;
   auto data = new float[5]{1.0f, 2.0f, 3.0f, 4.0f, 5.0f};
   std::cout << sumArray(data, 5) << std::endl;
+  fmt::print(zlibVersion());
 }

examples/cross_build/wasm/bindings/main.cpp renamed to examples/cross_build/emscripten/bindings/main.cpp

@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="en-us">
   <body>
-    <h1>Conan C++ WebAssembly Example</h1>
+    <h1>Conan C++ Emscripten Example</h1>
     <br />
     <div id="status">Downloading...</div>
     <div>
@@ -14,6 +14,9 @@ <h1>Conan C++ WebAssembly Example</h1>
     <button onclick="printMessage()">Print Message</button>
     <hr />
 
+    <button onclick="getZlibVersion()">Print Zlib version</button>
+    <hr />
+
     <!-- Example of a simple invocation to fibonachi -->
     <input type="number" id="fibInput" placeholder="e.g., 10" />
     <button onclick="fibExample()">Compute Fibonacci</button>
@@ -103,6 +106,9 @@ <h1>Conan C++ WebAssembly Example</h1>
           ["Hello from C++ WebAssembly!"],
         );
       };
+      const getZlibVersion = () => {
+        Module.ccall("getZlibVersion", null, [], []);
+      };
 
       // Example of a simple invocation to fibonachi
       const fibExample = () => {

examples/cross_build/wasm/bindings/shell.html renamed to examples/cross_build/emscripten/bindings/shell.html

@@ -0,0 +1,8 @@
+include(base)
+
+[settings]
+arch=asm.js
+
+[conf]
+tools.build:exelinkflags+=['-sMAXIMUM_MEMORY=2GB', '-sINITIAL_MEMORY=64MB']
+tools.build:sharedlinkflags+=['-sMAXIMUM_MEMORY=2GB', '-sINITIAL_MEMORY=64MB']

examples/cross_build/emscripten/profiles/asmjs

@@ -0,0 +1,39 @@
+# Note: this profile uses emsdk package from Conan Center Index 
+# To use a local emsdk installation could be done by:
+# a) Define a platform_tool_requires ensuring CC, CXX, etc are defined correctly in PATH
+#  [platform_tool_requires]
+#  emsdk/<version>
+# b) Define compiler_executables
+#  tools.build:compiler_executables={'c':'emcc', 'cpp':'em++'}
+# c) Define buildenv
+#  [buildenv]
+#  CC=<path/to/emcc>
+#  CXX=<path/to/em++>
+#  AR ..
+
+[settings]
+build_type=Release
+compiler=emcc
+compiler.cppstd=17  
+compiler.libcxx=libc++
+compiler.version=4.0.9
+os=Emscripten
+
+[tool_requires]
+emsdk/4.0.9
+ninja/[*]
+
+[conf]
+tools.build:exelinkflags=['-sALLOW_MEMORY_GROWTH=1']
+tools.build:sharedlinkflags=['-sALLOW_MEMORY_GROWTH=1']
+
+# Set Ninja as default generator as it is faster and will sove issues on Windows
+tools.cmake.cmaketoolchain:generator=Ninja
+
+# Verbosity to see emcc invocations
+tools.build:verbosity=verbose
+tools.compilation:verbosity=verbose
+
+# Distinguish between architectures
+tools.cmake.cmake_layout:build_folder_vars=['settings.build_type', 'settings.arch']
+

examples/cross_build/emscripten/profiles/base

@@ -0,0 +1,8 @@
+include(base)
+
+[settings]
+arch=wasm
+
+[conf]
+tools.build:exelinkflags+=['-sMAXIMUM_MEMORY=4GB', '-sINITIAL_MEMORY=64MB']
+tools.build:sharedlinkflags+=['-sMAXIMUM_MEMORY=4GB', '-sINITIAL_MEMORY=64MB']

examples/cross_build/emscripten/profiles/wasm32

@@ -0,0 +1,10 @@
+include(base)
+
+[settings]
+arch=wasm64
+
+[conf]
+# In this early stage of wasm64, ALLOW_MEMORY_GROWTH is not having effect. Also it may not be the most efficient solution.
+# wasm64 for now needs to declare INITIAL_MEMORY as the maximum memory
+tools.build:exelinkflags+=['-sMAXIMUM_MEMORY=16GB', '-sINITIAL_MEMORY=16GB']
+tools.build:sharedlinkflags+=['-sMAXIMUM_MEMORY=16GB', '-sINITIAL_MEMORY=16GB']