Skip to content

Use NODERAWFS for wasm builds #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NovaRain merged 3 commits into from
Jun 18, 2025
Merged

Use NODERAWFS for wasm builds #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df2bb09
Use noderawfs
roginvs Jun 15, 2025
9707feb
Remove __dirname version
roginvs Jun 15, 2025
4ee5bbe
Create absolute symlink to test on RPU
roginvs Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
22 changes: 2 additions & 20 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
Expand All @@ -68,27 +68,9 @@ 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-nodefs",
"name": "sslc-emscripten-noderawfs",
"version": "1.0.0",
"description": "",
"main": "sslc.mjs",
Expand Down
20 changes: 1 addition & 19 deletions compiler.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand All @@ -62,7 +45,6 @@ async function compile(sslcArgs, wasmBinary, cwd) {
// console.info("DEBUG after call");

instance.FS.chdir("/");
instance.FS.unmount("/host");

return {
returnCode,
Expand Down
9 changes: 6 additions & 3 deletions test/test_on_fallout2_rpu_setup.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down