Switch to dat3 and native sslc

Author: burner1024

.github/workflows/build.yml

@@ -6,7 +6,6 @@ on:
 
 env:
   sfall_version: 4.5
-  mpack_version: 4.5
 
 jobs:
   build:
@@ -18,9 +17,6 @@ jobs:
       - name: ShellCheck
         uses: ludeeus/action-shellcheck@master
 
-      - name: Install wine
-        uses: devopsx/gha-ubuntu-i386-fix@master
-
       - name: Install packages
         run: sudo DEBIAN_FRONTEND=noninteractive eatmydata apt-get install -o=Dpkg::Use-Pty=0 -y crudini dos2unix gcc p7zip
 

.gitignore

@@ -3,8 +3,11 @@
 *.int
 external
 extra/bin/*
-!extra/bin/dat2.exe
 *.rar
 *.7z
 data/*
 !data/text
+# fetched by buildall.sh
+source/headers/rp
+source/headers/sfall
+source/headers/fo2tweaks

extra/bin/dat2.exe

@@ -2,10 +2,8 @@
 
 set -xeu -o pipefail
 
-extra_dir="${extra_dir:-extra}"
-extra_dir="$(realpath "$extra_dir")"
-bin_dir="$extra_dir/bin"
-compile="$bin_dir/compile.exe"
+src="$(realpath source)"
+headers_dir="$src/headers"
 dst="data/scripts"
 mkdir -p "$dst"
 dst="$(realpath $dst)"
@@ -39,11 +37,14 @@ fi
 
 cd ..
 
-files=$(cat "$extra_dir"/build.list)
-mkdir -p "$dst"
-cd source
-for f in $files; do
-    # shellcheck disable=SC2001  # sed is more readable
-    int_name="$(echo "$f" | sed 's|\.ssl$|.int|')"
-    wine "$compile" -l -O2 -p -s -q -n "$f" -o "$dst/$int_name"
-done
+# The dependency headers include each other by relative path ("../sfall/sfall.h"), which POSIX resolves
+# through a symlink into the clone tree instead of lexically. So these have to be real sibling
+# directories - symlinks only ever worked because wine normalized ".." the Windows way.
+rm -rf "$headers_dir/rp" "$headers_dir/sfall" "$headers_dir/fo2tweaks"
+cp -r external/rp/scripts_src/headers "$headers_dir/rp"
+cp -r external/sfall/artifacts/scripting/headers "$headers_dir/sfall"
+cp -r external/fo2tweaks/source/headers/fo2tweaks "$headers_dir/fo2tweaks"
+
+cd "$src"
+# shellcheck disable=SC2154  # from env.sh
+"$COMPILE" -l -O2 -p -s -q -n gl_p_party_orders.ssl -o "$dst/gl_p_party_orders.int"

extra/build.list

@@ -6,13 +6,17 @@ extra_dir="$(realpath extra)"
 export extra_dir
 export bin_dir="$extra_dir/bin"
 export mods_dir="mods"
-export mpack_version=${mpack_version:-4.5}
-export mpack_7z="mpack.7z"
 export sfall_version=${sfall_version:-4.5}
-export WINEARCH=win32
-export WINEDEBUG=-all
 export mod_name=party_orders
 
+SSLC_VERSION="2026-05-23-12-48-08"
+export SSLC_URL="https://github.com/sfall-team/sslc/releases/download/${SSLC_VERSION}/sslc-linux"
+export COMPILE="$bin_dir/sslc"
+
+DAT3_VERSION="v0.8.0"
+export DAT3_URL="https://github.com/BGforgeNet/dat3/releases/download/${DAT3_VERSION}/dat3"
+export DAT3="$bin_dir/dat3"
+
 set +xeu +o pipefail
 
 # git magic to clone a subdirectory, for faster build

extra/buildall.sh

@@ -3,10 +3,6 @@
 set -xeu -o pipefail
 
 export comp_dir="components"
-# shellcheck disable=SC2154  # from env.sh
-export dat2="wine $bin_dir/dat2.exe"
-export dat2a="wine $bin_dir/dat2.exe a -1"
-export file_list="file.list"
 
 short_sha="$(git rev-parse --short HEAD)"
 # defaults, local build or github non-tagged
@@ -27,13 +23,9 @@ dat="$mod_name.dat"
 # shellcheck disable=SC2154  # from env.sh
 mkdir -p "$mods_dir"
 
-cd data
-rm -rf text/po # gettext translations
-# I don't know how to pack recursively
-find . -type f | sed -e 's|^\.\/||' -e 's|\/|\\|g' | sort >../file.list # replace slashes with backslashes
-wine "$bin_dir/dat2.exe" a "$dat" @../file.list
-cd ..
-mv "data/$dat" "$mods_dir/"
+rm -rf data/text/po # gettext translations
+# shellcheck disable=SC2154  # from env.sh
+"$DAT3" a -c 9 -C data "$mods_dir/$dat" '*'
 
 # sfall
 # shellcheck disable=SC2154  # from workflow yml

extra/env.sh

@@ -2,22 +2,19 @@
 
 set -xeu -o pipefail
 
-extra_dir=${extra_dir:-extra}
-mpack_version=${mpack_version:-4.5}
+# shellcheck disable=SC2154  # from env.sh
+mkdir -p "$bin_dir"
 
-mpack_file="modderspack_$mpack_version.7z"
-mpack_url="https://sourceforge.net/projects/sfall/files/Modders%20pack/$mpack_file/download"
-compile_exe="compile.exe"
-mpack_compile="ScriptEditor/resources/$compile_exe"
+# sslc compiler
+# shellcheck disable=SC2154  # from env.sh
+if [[ ! -f "$COMPILE" ]]; then
+    wget -q "$SSLC_URL" -O "$COMPILE"
+    chmod +x "$COMPILE"
+fi
 
-# directories
-cache_dir="$HOME/.cache/build"
-bin_dir="$(realpath extra/bin)"
-mkdir -p "$cache_dir" "$bin_dir"
-
-# compile.exe, check cache
-wget -q "$mpack_url" -O mpack.7z
-7zr e mpack.7z "$mpack_compile"
-mv -f "$compile_exe" "$cache_dir/"
-# copy
-cp -f "$cache_dir/$compile_exe" "$bin_dir/"
+# dat3 packer
+# shellcheck disable=SC2154  # from env.sh
+if [[ ! -f "$DAT3" ]]; then
+    wget -q "$DAT3_URL" -O "$DAT3"
+    chmod +x "$DAT3"
+fi