modularized binaries (#1231)

* modularized binary * modularized binary
emscripten-forge · Jul 22, 2024 · e8b4804 · e8b4804
1 parent 5a7b67f
commit e8b4804
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 7 deletions.
diff --git a/recipes/recipes/run_modularized/build.sh b/recipes/recipes/run_modularized/build.sh
@@ -0,0 +1,5 @@
+
+mkdir -p $PREFIX/bin
+cp $RECIPE_DIR/run_modularized.js   $PREFIX/bin/run_modularized
+chmod +x $PREFIX/bin/run_modularized
+
diff --git a/recipes/recipes/run_modularized/recipe.yaml b/recipes/recipes/run_modularized/recipe.yaml
@@ -0,0 +1,22 @@
+context:
+  name: run_modularized
+  version: "0.1.0"
+
+package:
+  name: ${{ name|lower }}
+  version: ${{ version }}
+
+build:
+  number: 0
+
+requirements:
+  run:
+    - nodejs 
+
+about:
+  license: BSD-3-Clause
+  summary: run_modularized
+  description: run_modularized
+extra:
+  recipe-maintainers:
+    - DerThorsten
diff --git a/recipes/recipes/run_modularized/run_modularized.js b/recipes/recipes/run_modularized/run_modularized.js
@@ -0,0 +1,18 @@
+#!/usr/bin/env node
+
+const binary_js_runner = process.argv[2];
+process.argv = process.argv.slice(3);
+async function my_main(){
+    const ModuleF = require(binary_js_runner);
+    const Module = await ModuleF({
+        noInitialRun: true,
+        // arguments: args_without_js_path
+    });
+    const ret = Module.callMain(process.argv);
+    return ret;
+}
+(async function() {
+    const exitCode = await my_main();
+    // exit the process
+    process.exit(exitCode);
+})();
diff --git a/recipes/recipes_emscripten/lua/CMakeLists.txt b/recipes/recipes_emscripten/lua/CMakeLists.txt
@@ -64,13 +64,17 @@ foreach(lua_binary ${lua_binaries})
   target_compile_definitions(${lua_binary} 
       PUBLIC "SHELL: -s FORCE_FILESYSTEM"
       PUBLIC "SHELL: -s ALLOW_MEMORY_GROWTH=1"
-      # PUBLIC "SHELL: -s MODULARIZE=1"
+      PUBLIC "SHELL: -s ENVIRONMENT=web,worker,node"
+      PUBLIC "SHELL: -s EXPORTED_RUNTIME_METHODS=callMain,FS,ENV,getEnvStrings"
+      PUBLIC "SHELL: -s MODULARIZE=1"
   )
   # set target link options
   target_link_options(${lua_binary} 
       PUBLIC "SHELL: -s FORCE_FILESYSTEM"
       PUBLIC "SHELL: -s ALLOW_MEMORY_GROWTH=1"
-      # PUBLIC "SHELL: -s MODULARIZE=1"
+      PUBLIC "SHELL: -s ENVIRONMENT=web,worker,node"
+      PUBLIC "SHELL: -s EXPORTED_RUNTIME_METHODS=callMain,FS,ENV,getEnvStrings"
+      PUBLIC "SHELL: -s MODULARIZE=1"
   )
 endforeach()
 

diff --git a/recipes/recipes_emscripten/lua/recipe.yaml b/recipes/recipes_emscripten/lua/recipe.yaml
@@ -21,7 +21,7 @@ source:
 - path: CMakeLists.txt
 
 build:
-  number: 6
+  number: 10
 
 requirements:
   build:
@@ -31,14 +31,25 @@ requirements:
 
 
 tests:
-  - script: node $PREFIX/bin/lua.js -e "a=1+1;print(a)"
+  - script: |
+      OUTPUT=$(run_modularized $PREFIX/bin/lua.js -e "a=1+1;print(a)")
+      if [[ "$OUTPUT" != "2" ]]; then
+        echo "Unexpected output: $OUTPUT"
+        exit 1
+      fi
     requirements:
       build:
-        - nodejs
-  - script: node $PREFIX/bin/luac.js -v
+        - run_modularized
+  - script: |
+      OUTPUT=$(run_modularized $PREFIX/bin/luac.js -v)
+      if [[ "$OUTPUT" != "Lua 5.4.6  Copyright (C) 1994-2023 Lua.org, PUC-Rio" ]]; then
+        echo "Unexpected output: $OUTPUT"
+        exit 1
+      fi
+
     requirements:
       build:
-        - nodejs
+        - run_modularized
 
 about:
   summary: Lua is a powerful, fast, lightweight, embeddable scripting language