From 9ff716455ea887f4df6fa2e998b2bced870834e4 Mon Sep 17 00:00:00 2001 From: mesheets <16882600+mesheets@users.noreply.github.com> Date: Thu, 4 Jul 2024 22:22:29 -0400 Subject: [PATCH] Update nomenclature in Makefile and CI YAML The generated WebAssembly is embedded in the JavaScript file --- .github/workflows/nqc_ci.yml | 6 +++--- Makefile | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nqc_ci.yml b/.github/workflows/nqc_ci.yml index bf65e4c..7d1b3f5 100644 --- a/.github/workflows/nqc_ci.yml +++ b/.github/workflows/nqc_ci.yml @@ -28,8 +28,8 @@ jobs: with: name: nqc-native-${{ matrix.os }} path: build/bin/ - - name: Archive WebAssembly build artifacts + - name: Archive JavaScript-WebAssembly build artifacts uses: actions/upload-artifact@v4 with: - name: nqc-WebAssembly-${{ matrix.os }} - path: build/wasm/ + name: nqc-JS-WebAssembly-${{ matrix.os }} + path: build/js-wasm/ diff --git a/Makefile b/Makefile index 17e9cff..14c8b44 100755 --- a/Makefile +++ b/Makefile @@ -89,11 +89,11 @@ TCPOBJ ?= RCX_TcpPipe_none # OSTYPE := $(strip $(shell uname -s)) -ifneq (,$(strip $(findstring $(TARGETTYPE), WebAssembly))) - # WebAssembly +ifneq (,$(strip $(findstring $(TARGETTYPE), JS-WebAssembly))) + # WebAssembly embedded in JavaScript CXX = emcc OBJ_SUBDIR_NAME = wobj - EXEC_SUBDIR_NAME = wasm + EXEC_SUBDIR_NAME = js-wasm EXEC_EXT = .js # Emscripten optimization flags documentation @@ -216,7 +216,7 @@ $(EXEC_DIR)/nqc$(EXEC_EXT): compiler/parse.cpp $(OBJ) # Emscripten build for WebAssembly # emscripten-emmake: - emmake make exec TARGETTYPE=WebAssembly + emmake make exec TARGETTYPE=JS-WebAssembly # # general rule for compiling