@ai-ecoverse/wasm-emscripten 6.0.9-17 → 6.0.9-18

package/README.md

@@ -4,6 +4,12 @@ Emscripten **6.0.9-git** for the SLICC wasm realm. Launchers run `emcc.py`
 (and friends) on `@ai-ecoverse/wasix-python` (`python3 -S`) with `EM_CONFIG`
 pointing at this package's config.
 
+> **emcc does not run on slicc-kernel yet** (exec of the glue by path, and no
+> `node`), see [slicc-kernel#390](https://github.com/ai-ecoverse/slicc-kernel/issues/390).
+> Since 6.0.9-18 the companions are found beside this package (npm, slicc's
+> `ipk add -g`, pnpm's virtual store) instead of only under
+> `/shared/lib/node_modules`.
+
 ## Companions
 
 | Package | Role |

package/emscripten-config

@@ -4,9 +4,19 @@ import os
 from pathlib import Path
 
 _pkg = Path(os.environ.get('EM_PACKAGE_ROOT', Path(__file__).resolve().parent))
-_clang = Path(os.environ.get('EM_LLVM_PACKAGE', '/shared/lib/node_modules/@ai-ecoverse/wasm-clang'))
-_binaryen = Path(os.environ.get('EM_BINARYEN_PACKAGE', '/shared/lib/node_modules/@ai-ecoverse/wasm-binaryen'))
-_cache_pkg = Path(os.environ.get('EM_CACHE_PACKAGE', '/shared/lib/node_modules/@ai-ecoverse/emscripten-cache'))
+
+
+def _dep(var, default):
+  # slicc.env gives ${package}/../<dep>: the dependency beside this package
+  # (npm, slicc's ipk), or beside it in pnpm's virtual store, reached through
+  # the project's symlink. resolve() takes the `..` physically; slicc-kernel
+  # looks up commands spawned by path (LLVM_ROOT/clang) lexically.
+  return Path(os.environ.get(var, default)).resolve()
+
+
+_clang = _dep('EM_LLVM_PACKAGE', '/shared/lib/node_modules/@ai-ecoverse/wasm-clang')
+_binaryen = _dep('EM_BINARYEN_PACKAGE', '/shared/lib/node_modules/@ai-ecoverse/wasm-binaryen')
+_cache_pkg = _dep('EM_CACHE_PACKAGE', '/shared/lib/node_modules/@ai-ecoverse/emscripten-cache')
 
 LLVM_ROOT = str(_clang / 'bin')
 BINARYEN_ROOT = str(_binaryen)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-ecoverse/wasm-emscripten",
-  "version": "6.0.9-17",
+  "version": "6.0.9-18",
   "description": "Emscripten 6.0.9 for slicc (emcc via wasix-python)",
   "license": "MIT",
   "repository": {
@@ -64,9 +64,9 @@
     "env": {
       "EM_PACKAGE_ROOT": "${package}",
       "EM_CONFIG": "${package}/emscripten-config",
-      "EM_CACHE_PACKAGE": "/shared/lib/node_modules/@ai-ecoverse/emscripten-cache",
-      "EM_LLVM_PACKAGE": "/shared/lib/node_modules/@ai-ecoverse/wasm-clang",
-      "EM_BINARYEN_PACKAGE": "/shared/lib/node_modules/@ai-ecoverse/wasm-binaryen",
+      "EM_CACHE_PACKAGE": "${package}/../emscripten-cache",
+      "EM_LLVM_PACKAGE": "${package}/../wasm-clang",
+      "EM_BINARYEN_PACKAGE": "${package}/../wasm-binaryen",
       "SLICC_EM_LIBDIR": "${package}/lib/slicc"
     },
     "commands": {