From eacdd98f4866a762dba4d4e1aa1bf91db898559d Mon Sep 17 00:00:00 2001
From: Frank Halasz <frank@halasz.org>
Date: Fri, 16 Feb 2024 12:32:15 -0800
Subject: [PATCH] 1. Replace wasm build with wasm_nl builds and get rid of
 wasm_nl flag.  Update buildRelease.yml and makeright accordingly.  2. Add
 -lidbfs.js flag to LDFLAGS in makefile-emscripten-wasm.wasm.  3.  Update
 buildRelease.yml docker action versions to accomdate github moving from node
 16 to node 20.

---
 .github/workflows/buildRelease.yml      | 10 +++++-----
 bin/makefile-emscripten.wasm-wasm       | 16 +---------------
 bin/makefile-emscripten.wasm_nl-wasm_nl | 23 -----------------------
 bin/makeright                           |  7 +------
 4 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 bin/makefile-emscripten.wasm_nl-wasm_nl

diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml
index e57c3ad..bfe29bc 100644
--- a/.github/workflows/buildRelease.yml
+++ b/.github/workflows/buildRelease.yml
@@ -185,14 +185,14 @@ jobs:
 
       # Setup the Docker Machine Emulation environment.
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
 
       # Setup the Docker Buildx funtion
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       # Do the Docker Build using the Dockerfile in the repository we
       # checked out.  Save the results in a directory under /tmp to be used
@@ -204,7 +204,7 @@ jobs:
       #       Dockerfile, NOT HERE IN THE WORKFLOW.
       #
       - name: Build Docker Image and Save It Locally
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           build-args: |
@@ -532,8 +532,8 @@ jobs:
       - name: Compile Maiko using Emscripten
         working-directory: ./bin
         run: |
-          ./makeright wasm_nl
-          cd ../emscripten.wasm_nl
+          ./makeright wasm
+          cd ../emscripten.wasm
           tar -c -z -f ../${{ steps.tag.outputs.release_tag }}-emscripten.tgz *
 
       # Push Release to github
diff --git a/bin/makefile-emscripten.wasm-wasm b/bin/makefile-emscripten.wasm-wasm
index 8d88423..6c08239 100644
--- a/bin/makefile-emscripten.wasm-wasm
+++ b/bin/makefile-emscripten.wasm-wasm
@@ -10,22 +10,8 @@ XFLAGS = -DSDL -sUSE_SDL=2
 OPTFLAGS = -O2
 DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
 
-MEDLEY?=../../medley
-SYSOUT?=$(MEDLEY)/loadups/full.sysout
-
 LD = emcc
-LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 \
-	--preload-file $(SYSOUT)@medley/loadups/full.sysout \
-	--preload-file $(MEDLEY)/loadups/whereis.hash@medley/loadups/whereis.hash \
-	--preload-file $(MEDLEY)/greetfiles/MEDLEYDIR-INIT.LCOM@usr/local/lde/site-init.lisp \
-	--preload-file $(MEDLEY)/docs/@medley/docs \
-	--preload-file $(MEDLEY)/doctools/@medley/doctools \
-	--preload-file $(MEDLEY)/greetfiles/@medley/greetfiles \
-	--preload-file $(MEDLEY)/internal/@medley/internal \
-	--preload-file $(MEDLEY)/sources/@medley/sources \
-	--preload-file $(MEDLEY)/library/@medley/library \
-	--preload-file $(MEDLEY)/lispusers/@medley/lispusers \
-	--preload-file $(MEDLEY)/fonts/@medley/fonts
+LDFLAGS = -lidbfs.js -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4
 
 LDELDFLAGS =
 
diff --git a/bin/makefile-emscripten.wasm_nl-wasm_nl b/bin/makefile-emscripten.wasm_nl-wasm_nl
deleted file mode 100644
index b9f5736..0000000
--- a/bin/makefile-emscripten.wasm_nl-wasm_nl
+++ /dev/null
@@ -1,23 +0,0 @@
-# Options for Emscripten, WASM and SDL
-
-CC = emcc $(CLANG_CFLAGS)
-
-XFILES = $(OBJECTDIR)sdl.o
-
-XFLAGS = -DSDL -sUSE_SDL=2
-
-# OPTFLAGS is normally -O2.
-OPTFLAGS = -O2
-DFLAGS = $(XFLAGS) -DRELEASE=351 -DMAIKO_ENABLE_NETHUB
-
-MEDLEY?=../../medley
-SYSOUT?=$(MEDLEY)/loadups/full.sysout
-
-LD = emcc
-LDFLAGS = -sUSE_SDL=2 -sASYNCIFY -sALLOW_MEMORY_GROWTH -sEXIT_RUNTIME=1 -sFORCE_FILESYSTEM -sLZ4
-
-LDELDFLAGS =
-
-OBJECTDIR = ../$(RELEASENAME)/
-
-default	: ../$(OSARCHNAME)/ldesdl.js
diff --git a/bin/makeright b/bin/makeright
index 25f21f1..bff5745 100755
--- a/bin/makeright
+++ b/bin/makeright
@@ -20,7 +20,7 @@
 # Nov 20 2001 JDS:  Convert to use BASH, not CSH, for open-source...
 #
 # usage:  makeright [display-option] [other-option]
-# 
+#
 # example: makeright single	;  make lde for mmaped displayFB
 #	   makeright multi	;  make lde for cg3,cg6
 #	   makeright x		;  make lde for X-windows
@@ -79,11 +79,6 @@ case "$display" in
 		releasename=${osversion}.${architecture}-${display}
 		ldename=ldesdl.js
 		;;
-	wasm_nl) osversion=emscripten
-		architecture=wasm_nl
-		releasename=${osversion}.${architecture}-${display}
-		ldename=ldesdl.js
-		;;
 	*)	echo "display-option: $display is not supported."
 		exit
 		;;