javascript: Rename this port to 'webassembly'.

picoscratch · Aug 22, 2022 · af54d2c · af54d2c
1 parent c616721
commit af54d2c
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 18 deletions.
diff --git a/.github/workflows/ports_javascript.yml → .github/workflows/ports_webassembly.yml b/.github/workflows/ports_javascript.yml → .github/workflows/ports_webassembly.yml
@@ -1,4 +1,4 @@
-name: javascript port
+name: webassembly port
 
 on:
   push:
@@ -9,16 +9,16 @@ on:
       - 'py/**'
       - 'extmod/**'
       - 'lib/**'
-      - 'ports/javascript/**'
+      - 'ports/webassembly/**'
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_javascript_setup
+      run: source tools/ci.sh && ci_webassembly_setup
     - name: Build
-      run: source tools/ci.sh && ci_javascript_build
+      run: source tools/ci.sh && ci_webassembly_build
     - name: Run tests
-      run: source tools/ci.sh && ci_javascript_run_tests
+      run: source tools/ci.sh && ci_webassembly_run_tests
diff --git a/ports/javascript/Makefile → ports/webassembly/Makefile b/ports/javascript/Makefile → ports/webassembly/Makefile
@@ -51,6 +51,6 @@ min: $(BUILD)/micropython.js
 
 test: $(BUILD)/micropython.js $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py -j1
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/webassembly/node_run.sh ./run-tests.py -j1
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/javascript/README.md → ports/webassembly/README.md b/ports/javascript/README.md → ports/webassembly/README.md
@@ -1,13 +1,18 @@
-MicroPython.js
-==============
+MicroPython WebAssembly
+=======================
 
-MicroPython transmuted into Javascript by Emscripten.
+MicroPython for [WebAssembly](https://webassembly.org/).
 
 Dependencies
 ------------
 
-Building micropython.js bears the same requirements as the standard MicroPython
-ports with the addition of Emscripten (and uglify-js for the minified file).
+Building webassembly port bears the same requirements as the standard
+MicroPython ports with the addition of Emscripten (and uglify-js for the
+minified file).
+
+The output includes `micropython.js` (a JavaScript wrapper for the
+MicroPython runtime) and `firmware.wasm` (actual MicroPython compiled to
+WASM).
 
 Build instructions
 ------------------

diff --git a/ports/javascript/library.h → ports/webassembly/library.h b/ports/javascript/library.h → ports/webassembly/library.h
diff --git a/ports/javascript/library.js → ports/webassembly/library.js b/ports/javascript/library.js → ports/webassembly/library.js
diff --git a/ports/javascript/main.c → ports/webassembly/main.c b/ports/javascript/main.c → ports/webassembly/main.c
diff --git a/ports/javascript/modutime.c → ports/webassembly/modutime.c b/ports/javascript/modutime.c → ports/webassembly/modutime.c
diff --git a/ports/javascript/mpconfigport.h → ports/webassembly/mpconfigport.h b/ports/javascript/mpconfigport.h → ports/webassembly/mpconfigport.h
@@ -105,7 +105,7 @@
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#define MICROPY_PY_SYS_PLATFORM     "javascript"
+#define MICROPY_PY_SYS_PLATFORM     "webassembly"
 #define MICROPY_PY_UERRNO           (1)
 #define MICROPY_PY_UCTYPES          (1)
 #define MICROPY_PY_UZLIB            (1)

diff --git a/ports/javascript/mphalport.c → ports/webassembly/mphalport.c b/ports/javascript/mphalport.c → ports/webassembly/mphalport.c
diff --git a/ports/javascript/mphalport.h → ports/webassembly/mphalport.h b/ports/javascript/mphalport.h → ports/webassembly/mphalport.h
diff --git a/ports/javascript/node_run.sh → ports/webassembly/node_run.sh b/ports/javascript/node_run.sh → ports/webassembly/node_run.sh
diff --git a/ports/javascript/qstrdefsport.h → ports/webassembly/qstrdefsport.h b/ports/javascript/qstrdefsport.h → ports/webassembly/qstrdefsport.h
diff --git a/ports/javascript/wrapper.js → ports/webassembly/wrapper.js b/ports/javascript/wrapper.js → ports/webassembly/wrapper.js
diff --git a/tools/ci.sh b/tools/ci.sh
@@ -172,21 +172,21 @@ function ci_esp8266_build {
 }
 
 ########################################################################################
-# ports/javascript
+# ports/webassembly
 
-function ci_javascript_setup {
+function ci_webassembly_setup {
     git clone https://github.com/emscripten-core/emsdk.git
     (cd emsdk && ./emsdk install latest && ./emsdk activate latest)
 }
 
-function ci_javascript_build {
+function ci_webassembly_build {
     source emsdk/emsdk_env.sh
-    make ${MAKEOPTS} -C ports/javascript
+    make ${MAKEOPTS} -C ports/webassembly
 }
 
-function ci_javascript_run_tests {
+function ci_webassembly_run_tests {
     # This port is very slow at running, so only run a few of the tests.
-    (cd tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py -j1 basics/builtin_*.py)
+    (cd tests && MICROPY_MICROPYTHON=../ports/webassembly/node_run.sh ./run-tests.py -j1 basics/builtin_*.py)
 }
 
 ########################################################################################