Update install of sdl2 for emscripten in buildRelease workflow.

Fix Issue#1541: IL:LOGOUT does not work running Medley on emscripten maiko

.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: |
@@ -503,6 +503,7 @@ jobs:
       - name: Install SDL2
         run: |
           export DEBIAN_FRONTEND=noninteractive
+          sudo -E apt-get update
           sudo -E apt-get install -y libsdl2-dev libsdl2-2.0-0
 
       # Install Emscripten SDK
@@ -532,8 +533,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

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 =
 

bin/makefile-emscripten.wasm_nl-wasm_nl

@@ -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

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
 		;;

src/timer.c

@@ -118,6 +118,19 @@ void update_miscstats(void) {
   MiscStats->diskiotime = 0; /* ?? not available ?? */
   MiscStats->diskops = 0;
   MiscStats->secondstmp = MiscStats->secondsclock = (time(0) + UNIX_ALTO_TIME_DIFF);
+#elif defined(MAIKO_OS_EMSCRIPTEN)
+  /* Emscripten does not provide getrusage() functionality */
+  struct timeval timev;
+
+  MiscStats->totaltime = gettime(0) - MiscStats->starttime;
+  MiscStats->swapwaittime = 0;
+  MiscStats->pagefaults = 0;
+  MiscStats->swapwrites = 0;
+  MiscStats->diskiotime = 0;
+  MiscStats->diskops = 0;
+
+  gettimeofday(&timev, NULL);
+  MiscStats->secondstmp = MiscStats->secondsclock = (timev.tv_sec + UNIX_ALTO_TIME_DIFF);
 #else
   struct timeval timev;
   struct rusage ru;

src/vmemsave.c

@@ -354,7 +354,7 @@ LispPTR vmem_save(char *sysout_file_name)
   TIMEOUT(sysout = open(sysout_file_name, O_WRONLY, 0666));
   if (sysout == -1) {
     /* No file error skip return. */
-    if (errno != 2) return (FILECANNOTOPEN); /* No such file error.*/
+    if (errno != ENOENT) return (FILECANNOTOPEN); /* No such file error.*/
   } else
     TIMEOUT(rval = close(sysout));
 
@@ -481,7 +481,7 @@ LispPTR vmem_save(char *sysout_file_name)
   TIMEOUT(rval = unlink(sysout_file_name));
   if (rval == -1) {
     /* No file error skip return. */
-    if (errno != 2) /* No such file error.*/
+    if (errno != ENOENT) /* No such file error.*/
       return (FILECANNOTOPEN);
   }