diff --git a/.gitignore b/.gitignore index aecd72563..94d2a6324 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,6 @@ /*_product_key.txt .vscode/settings.json deploy_web.sh -libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin -libs/js_engine/src/artifacts/JS_SNAPSHOT.bin deploy_web.sh secrets.db .vscode/ diff --git a/Makefile b/Makefile index b09adaca7..3a9666039 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ EMBASSY_BINS := backend/target/aarch64-unknown-linux-gnu/release/embassyd backend/target/aarch64-unknown-linux-gnu/release/embassy-init backend/target/aarch64-unknown-linux-gnu/release/embassy-cli backend/target/aarch64-unknown-linux-gnu/release/embassy-sdk EMBASSY_UIS := frontend/dist/ui frontend/dist/setup-wizard frontend/dist/diagnostic-ui EMBASSY_SRC := raspios.img product_key.txt $(EMBASSY_BINS) backend/embassyd.service backend/embassy-init.service $(EMBASSY_UIS) $(shell find build) -EMBASSY_V8_SNAPSHOTS := libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin libs/js_engine/src/artifacts/JS_SNAPSHOT.bin COMPAT_SRC := $(shell find system-images/compat/src) UTILS_SRC := $(shell find system-images/utils/Dockerfile) BACKEND_SRC := $(shell find backend/src) $(shell find patch-db/*/src) $(shell find rpc-toolkit/*/src) backend/Cargo.toml backend/Cargo.lock @@ -29,14 +28,10 @@ clean: rm -rf patch-db/client/node_modules rm -rf patch-db/client/dist - rm -f libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin - rm -f libs/js_engine/src/artifacts/JS_SNAPSHOT.bin - touch libs/snapshot-creator/Cargo.toml - -sdk: $(EMBASSY_V8_SNAPSHOTS) +sdk: cd backend/ && ./install-sdk.sh -eos.img: $(EMBASSY_SRC) system-images/compat/compat.tar system-images/utils/utils.tar $(EMBASSY_V8_SNAPSHOTS) +eos.img: $(EMBASSY_SRC) system-images/compat/compat.tar system-images/utils/utils.tar ! test -f eos.img || rm eos.img if [ "$(NO_KEY)" = "1" ]; then NO_KEY=1 ./build/make-image.sh; else ./build/make-image.sh; fi @@ -58,11 +53,11 @@ product_key.txt: if [ "$(KEY)" != "" ]; then $(shell which echo) -n "$(KEY)" > product_key.txt; fi echo >> product_key.txt -$(EMBASSY_V8_SNAPSHOTS): libs/snapshot-creator/Cargo.toml +snapshots: libs/snapshot-creator/Cargo.toml cd libs/ && ./build-v8-snapshot.sh cd libs/ && ./build-arm-v8-snapshot.sh -$(EMBASSY_BINS): $(BACKEND_SRC) $(EMBASSY_V8_SNAPSHOTS) +$(EMBASSY_BINS): $(BACKEND_SRC) cd backend && ./build-prod.sh frontend/node_modules: frontend/package.json diff --git a/libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin b/libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin new file mode 100644 index 000000000..7b6059a90 Binary files /dev/null and b/libs/js_engine/src/artifacts/ARM_JS_SNAPSHOT.bin differ diff --git a/libs/js_engine/src/artifacts/JS_SNAPSHOT.bin b/libs/js_engine/src/artifacts/JS_SNAPSHOT.bin new file mode 100644 index 000000000..9b86d3596 Binary files /dev/null and b/libs/js_engine/src/artifacts/JS_SNAPSHOT.bin differ