From df2bb097458eb1ddcfd96c420bf353be5360b144 Mon Sep 17 00:00:00 2001 From: Vasilii Rogin Date: Sun, 15 Jun 2025 21:41:29 +0300 Subject: [PATCH 1/3] Use noderawfs --- .github/workflows/ci.yml | 6 +++--- CMakeLists.txt | 4 ++-- compiler.mjs | 20 +------------------- 3 files changed, 6 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1df6f13..2553347 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -245,7 +245,7 @@ jobs: - name: Upload .wasm artifacts uses: actions/upload-artifact@v4 with: - name: wasm-emscripten-node-nodefs + name: wasm-emscripten-node-noderawfs path: build/bin/** build_linux: @@ -315,8 +315,8 @@ jobs: cd artifacts - mv wasm-emscripten-node-nodefs package - tar -czf wasm-emscripten-node-nodefs.tar.gz package + mv wasm-emscripten-node-noderawfs package + tar -czf wasm-emscripten-node-noderawfs.tar.gz package rm -rf package ls -laR diff --git a/CMakeLists.txt b/CMakeLists.txt index f76a6a4..417a5da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten") target_link_options(${EXECUTABLE_NAME} PRIVATE "-sNO_DISABLE_EXCEPTION_CATCHING") target_link_options( ${EXECUTABLE_NAME} PRIVATE "-lnodefs.js" ) - # target_link_options(${EXECUTABLE_NAME} PRIVATE "-sNODERAWFS") + target_link_options(${EXECUTABLE_NAME} PRIVATE "-sNODERAWFS") # Disabled because of emscipten bug # target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sCASE_INSENSITIVE_FS" ) @@ -88,7 +88,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten") set(PACKAGE_JSON_CONTENT [[ { - "name": "sslc-emscripten-nodefs", + "name": "sslc-emscripten-noderawfs", "version": "1.0.0", "description": "", "main": "sslc.mjs", diff --git a/compiler.mjs b/compiler.mjs index 21dc57b..3ae35d4 100755 --- a/compiler.mjs +++ b/compiler.mjs @@ -34,26 +34,9 @@ async function compile(sslcArgs, wasmBinary, cwd) { : {}), }); - instance.FS.mkdir("/host"); - const cwdPath = path.parse(cwd || process.cwd()); - // console.info("DEBUG cwd", cwd); - - instance.FS.mount( - // Using NODEFS instead of NODERAWFS because - // NODERAWFS caused errors when the same module - // runs the second time - instance.NODEFS, - { - root: cwdPath.root, - }, - "/host" - ); - - // console.info("DEBUG after mount"); - - instance.FS.chdir(path.join("host", cwdPath.dir, cwdPath.name)); + instance.FS.chdir(path.join(cwdPath.dir, cwdPath.name)); // console.info("DEBUG after chdir"); @@ -62,7 +45,6 @@ async function compile(sslcArgs, wasmBinary, cwd) { // console.info("DEBUG after call"); instance.FS.chdir("/"); - instance.FS.unmount("/host"); return { returnCode, From 9707febbf6cf9c74e9df89e3f4ab96a90c94cba6 Mon Sep 17 00:00:00 2001 From: Vasilii Rogin Date: Sun, 15 Jun 2025 23:17:04 +0300 Subject: [PATCH 2/3] Remove __dirname version --- CMakeLists.txt | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 417a5da..f6d01d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,24 +68,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten") target_link_options(${EXECUTABLE_NAME} PRIVATE "-sSTACK_SIZE=2048000") - # Next commands replaces import.meta.url with __filename in sslc.mjs - # This is done to support importing in VScode-BGforge-MLS - set(patch_script "${CMAKE_BINARY_DIR}/patch_sslc.cmake") - file(WRITE "${patch_script}" " - if(EXISTS \"${CMAKE_CURRENT_BINARY_DIR}/bin/sslc.mjs\") - file(READ \"${CMAKE_CURRENT_BINARY_DIR}/bin/sslc.mjs\" file_content) - string(REPLACE \"import.meta.url\" \"__filename\" file_content \"\${file_content}\") - file(WRITE \"${CMAKE_CURRENT_BINARY_DIR}/bin/sslc.__filename.mjs\" \"\${file_content}\") - message(STATUS \"Patched sslc.mjs\") - else() - message(FATAL_ERROR \"sslc.mjs does not exist!\") - endif() - ") - add_custom_command(TARGET ${EXECUTABLE_NAME} POST_BUILD - COMMAND ${CMAKE_COMMAND} -P "${patch_script}" - COMMENT "Applying patch to sslc.mjs" - ) - set(PACKAGE_JSON_CONTENT [[ { "name": "sslc-emscripten-noderawfs", From 4ee5bbe878294e1df0d197470af1e5925c1a3a01 Mon Sep 17 00:00:00 2001 From: Vasilii Rogin Date: Sun, 15 Jun 2025 23:25:44 +0300 Subject: [PATCH 3/3] Create absolute symlink to test on RPU --- test/test_on_fallout2_rpu_setup.bash | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/test_on_fallout2_rpu_setup.bash b/test/test_on_fallout2_rpu_setup.bash index 05c7b9f..d17e96d 100755 --- a/test/test_on_fallout2_rpu_setup.bash +++ b/test/test_on_fallout2_rpu_setup.bash @@ -65,9 +65,12 @@ fi cd Fallout2_Restoration_Project/scripts_src if [ ! -L 'sfall' ] && [ ! -d 'sfall' ]; then - # ln -s "$MODDERPACK_DIR/scripting_docs/headers" sfall - echo "== Creating symlink to modderspack headers ==" - ln -s ../../modderspack/scripting_docs/headers sfall + + # echo "== Creating relative symlink to modderspack headers ==" + # ln -s ../../modderspack/scripting_docs/headers sfall + + echo "== Creating absolute symlink to modderspack headers ==" + ln -s "$MODDERPACK_DIR/scripting_docs/headers" sfall else echo "== Symlink to modderspack headers already exists ==" fi