Merge pull request sysprog21#488 from ChinYikMing/fix-wasm-service

CI: Fix missing file in WebAssembly deployment

Author: jserv

.github/workflows/deploy-wasm.yml

@@ -46,6 +46,7 @@ jobs:
             mkdir /tmp/rv32emu-demo
             mv assets/html/index.html /tmp/rv32emu-demo
             mv assets/js/coi-serviceworker.min.js /tmp/rv32emu-demo
+            mv build/elf_list.js /tmp/rv32emu-demo
             mv build/rv32emu.js /tmp/rv32emu-demo
             mv build/rv32emu.wasm /tmp/rv32emu-demo
             mv build/rv32emu.worker.js /tmp/rv32emu-demo
@@ -63,6 +64,7 @@ jobs:
         run: |
             mv /tmp/rv32emu-demo/index.html .
             mv /tmp/rv32emu-demo/coi-serviceworker.min.js .
+            mv /tmp/rv32emu-demo/elf_list.js .
             mv /tmp/rv32emu-demo/rv32emu.js .
             mv /tmp/rv32emu-demo/rv32emu.wasm .
             mv /tmp/rv32emu-demo/rv32emu.worker.js .

mk/wasm.mk

@@ -7,7 +7,8 @@ EXPORTED_FUNCS := _main,_indirect_rv_halt
 DEMO_DIR := demo
 WEB_FILES := $(BIN).js \
 	     $(BIN).wasm \
-	     $(BIN).worker.js
+	     $(BIN).worker.js \
+             $(OUT)/elf_list.js
 
 ifeq ("$(CC_IS_EMCC)", "1")
 BIN := $(BIN).js
@@ -37,11 +38,11 @@ CFLAGS_emcc += -sINITIAL_MEMORY=2GB \
 	       -O3 \
 	       -w
 
-$(DEMO_DIR)/elf_list.js: tools/gen-elf-list-js.py
+$(OUT)/elf_list.js: tools/gen-elf-list-js.py
 	$(Q)tools/gen-elf-list-js.py > $@
 
 # used to download all dependencies of elf executable and bundle into single wasm
-deps_emcc += $(DEMO_DIR)/elf_list.js $(DOOM_DATA) $(QUAKE_DATA) $(TIMIDITY_DATA)
+deps_emcc += $(OUT)/elf_list.js $(DOOM_DATA) $(QUAKE_DATA) $(TIMIDITY_DATA)
 
 # check browser MAJOR version if supports TCO
 CHROME_MAJOR :=