Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ C_MODULES_SRC_PATH = $(abspath ./src)

ifeq ($(PORT),unix)
MANIFEST_PATH=$(abspath ./src/manifest_unix.py)
else
MANIFEST_PATH=$(abspath ./src/manifest.py)
endif

WEBASSEMBLY_MANIFEST_PATH=$(abspath ./src/manifest_webassembly.py)

MODULES_PATH = ./dist/$(ARCH)_$(MPY_ABI_VERSION)
PORT_DIR = ./dist/ports/$(PORT)
Expand Down Expand Up @@ -75,9 +74,9 @@ unix: $(UNIX_MICROPYTHON)
$(WEBASSEMBLY_MICROPYTHON): $(PORT_DIR)
emcc --version
mkdir -p $(PORT_DIR)/../webassembly
make -C $(MPY_DIR)/ports/webassembly VARIANT=standard V=1 USER_C_MODULES=$(C_MODULES_SRC_PATH) FROZEN_MANIFEST=$(MANIFEST_PATH) CFLAGS_EXTRA="-Wno-unused-function -Wno-unused-function ${CFLAGS_EXTRA}" -j4
cp $(MPY_DIR)/ports/webassembly/build-standard/micropython.mjs $@
cp $(MPY_DIR)/ports/webassembly/build-standard/micropython.wasm dist/ports/webassembly/
make -C $(MPY_DIR)/ports/webassembly VARIANT=pyscript V=1 USER_C_MODULES=$(C_MODULES_SRC_PATH) FROZEN_MANIFEST=$(WEBASSEMBLY_MANIFEST_PATH) CFLAGS_EXTRA="-Wno-unused-function -Wno-unused-function ${CFLAGS_EXTRA}" -j4
cp $(MPY_DIR)/ports/webassembly/build-pyscript/micropython.mjs $@
cp $(MPY_DIR)/ports/webassembly/build-pyscript/micropython.wasm dist/ports/webassembly/


webassembly: $(WEBASSEMBLY_MICROPYTHON)
Expand Down
36 changes: 36 additions & 0 deletions src/manifest_webassembly.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@

include("$(PORT_DIR)/variants/manifest.py")

# emlearn .py modules
module("emlearn_trees.py", base_path='./emlearn_trees')
module("emlearn_fft.py", base_path='./emlearn_fft')

# The following are expected by pyscript
# Ref https://github.com/micropython/micropython/blob/master/ports/webassembly/variants/pyscript/manifest.py
require("abc")
require("base64")
require("collections")
require("collections-defaultdict")
require("copy")
require("datetime")
require("fnmatch")
require("functools")
require("gzip")
require("hmac")
require("html")
require("inspect")
require("io")
require("itertools")
require("locale")
require("logging")
require("operator")
require("os")
require("os-path")
require("pathlib")
require("stat")
require("tarfile")
require("tarfile-write")
require("time")
require("unittest")
require("uu")
require("zlib")
Loading