Bocfel now has a no-stdio mode, which means we can now successfully b…

…uild it! (with a few small RemGlk-rs fixes)

.github/workflows/build-and-test.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - run: ./src/build.sh
+      - run: ./build.sh
       - uses: actions/upload-artifact@v4
         with:
           name: build

CMakeLists.txt

@@ -36,20 +36,20 @@ target_compile_definitions(glulxe-profiler-core PRIVATE OS_UNIX VM_PROFILING)
 target_compile_options(glulxe-profiler-core PRIVATE -Wall -Wmissing-prototypes -Wno-unused)
 ]]
 
-#[[
 add_executable(bocfel)
 add_sources(bocfel "garglk/terps/bocfel/"
-    SRCS blorb.cpp branch.cpp dict.cpp iff.cpp io.cpp mathop.cpp meta.cpp memory.cpp objects.cpp
-    osdep.cpp patches.cpp process.cpp random.cpp screen.cpp sound.cpp stack.cpp stash.cpp unicode.cpp
-    util.cpp zoom.cpp zterp.cpp glkstart.cpp)
+    SRCS blorb.cpp branch.cpp dict.cpp glkstart.cpp iff.cpp io.cpp mathop.cpp
+    meta.cpp memory.cpp objects.cpp options.cpp osdep.cpp patches.cpp process.cpp
+    random.cpp screen.cpp sound.cpp stack.cpp stash.cpp unicode.cpp util.cpp
+    zoom.cpp zterp.cpp)
 emglken_vm(bocfel)
 set_property(TARGET bocfel PROPERTY CXX_STANDARD 14)
-target_compile_definitions(bocfel PRIVATE ZTERP_GLK ZTERP_GLK_BLORB ZTERP_GLK_UNIX)
+target_compile_definitions(bocfel PRIVATE ZTERP_GLK ZTERP_GLK_BLORB ZTERP_GLK_UNIX
+    ZTERP_NO_STDIO "ZTERP_STATIC_PATCH_FILE=\"static-patches.h\"")
 target_compile_options(bocfel PRIVATE -Wall)
 # Bocfel now uses exceptions, which takes a little bit to set up
 target_compile_options(bocfel PRIVATE -fexceptions)
-target_link_options(bocfel PRIVATE -sFILESYSTEM=1 -sNO_DISABLE_EXCEPTION_CATCHING)
-]]
+target_link_options(bocfel PRIVATE -sNO_DISABLE_EXCEPTION_CATCHING)
 
 add_executable(git)
 add_sources(git "git/"

src/build.sh → build.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-cd "$(dirname "$0")/.."
+cd "$(dirname "$0")"
 
 mkdir -p build
 

package.json

@@ -29,7 +29,7 @@
     "eslint": "^8.16.0"
   },
   "scripts": {
-    "build": "./src/build.sh",
+    "build": "./build.sh",
     "lint": "eslint bin/ src/",
     "test": "./tests/runtests.sh"
   },

src/Dockerfile

@@ -8,8 +8,8 @@ ENV CARGO_HOME=/.cargo \
     PATH="/.cargo/bin:$PATH" \
     RUSTUP_HOME=/.rustup
 
-RUN embuilder --lto=thin build libc libc++abi-noexcept libc++-noexcept libcompiler_rt \
-    libdlmalloc libsockets libstubs zlib
+RUN embuilder --lto=thin build libc libc++ libc++abi libc++-noexcept libc++abi-noexcept \
+    libcompiler_rt libdlmalloc libsockets libstubs zlib
 
 # LLVM version: 17
 RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain 1.77.0 --target wasm32-unknown-emscripten -y && \

tests/runtests.sh

@@ -6,9 +6,9 @@ if [ ! -f regtest.py ]; then
     wget -q https://github.com/erkyrath/plotex/raw/master/regtest.py
 fi
 
-# echo 'Bocfel'
-# python regtest.py -i "../bin/emglken.js" praxix.z5.regtest -t 10
-# python regtest.py -i "../bin/emglken.js --rem=1" advent.z5.regtest -t 10
+echo 'Bocfel'
+python regtest.py -i "../bin/emglken.js" praxix.z5.regtest -t 10
+python regtest.py -i "../bin/emglken.js --rem=1" advent.z5.regtest -t 10
 echo 'Git'
 python regtest.py -i "../bin/emglken.js --vm=git" glulxercise.ulx.regtest -t 10
 python regtest.py -i "../bin/emglken.js --rem=1 --vm=git" advent.ulx.regtest -t 10

versions.json

@@ -1,5 +1,5 @@
 {
-    "bocfel": "2.1.2",
+    "bocfel": "2.2.1",
     "emglken": "0.6.0",
     "git": "1.3.8",
     "glulxe": "0.6.1",