UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion/simulator/web] Name the target "epsilon.zip" to match other targets

Browse Source 
This way it's consistent with epsilon.ipa on TARGET=ios and epsilon.apk
on TARGET=android
This commit is contained in:
Romain Goyet
2020-03-21 21:33:40 -04:00
committed by EmilieNumworks
parent edbd879b4b
commit eadfe4aa56
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-workflow.yml vendored
View File

@@ -71,7 +71,7 @@ jobs:
- uses: actions/upload-artifact@master
with:
name: epsilon-simulator-web.zip
path: output/release/simulator/web/simulator.zip
path: output/release/simulator/web/epsilon.zip
- run: make -j2 PLATFORM=simulator TARGET=web test.headless.js
- run: node output/release/simulator/web/test.headless.js
build-simulator-linux:

4
build/targets.all.mak
View File

@@ -41,8 +41,8 @@ all_official:
$(Q) cp output/release/device/n0100/epsilon.official.onboarding.dfu output/all_official/epsilon.device.n0100.dfu
$(Q) echo "BUILD_FIRMWARE SIMULATOR WEB ZIP"
$(Q) $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web clean
$(Q) $(call source_emsdk); $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web output/release/simulator/web/simulator.official.zip
$(Q) cp output/release/simulator/web/simulator.official.zip output/all_official/simulator.web.zip
$(Q) $(call source_emsdk); $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web output/release/simulator/web/epsilon.official.zip
$(Q) cp output/release/simulator/web/epsilon.official.zip output/all_official/simulator.web.zip
$(Q) echo "BUILD_FIRMWARE SIMULATOR WEB JS"
$(Q) $(call source_emsdk); $(MAKE) DEBUG=0 PLATFORM=simulator TARGET=web epsilon.official.js
$(Q) cp output/release/simulator/web/epsilon.official.js output/all_official/epsilon.js

2
build/targets.simulator.web.mak
View File

@@ -1,3 +1,5 @@
HANDY_TARGETS_EXTENSIONS += zip
$(BUILD_DIR)/epsilon%packed.js: EMSCRIPTEN_INIT_FILE = 0
$(BUILD_DIR)/test.headless.js: EMSCRIPTEN_MODULARIZE = 0

4
ion/src/simulator/web/Makefile
View File

@@ -24,9 +24,9 @@ ion_src += ion/src/simulator/shared/dummy/telemetry_init.cpp
ion_src += ion/src/shared/telemetry_console.cpp
endif
DEFAULT = $(BUILD_DIR)/simulator.zip
DEFAULT = epsilon.zip
$(BUILD_DIR)/simulator%zip: $(BUILD_DIR)/epsilon%packed.js $(BUILD_DIR)/ion/src/simulator/web/simulator.html
$(BUILD_DIR)/epsilon%zip: $(BUILD_DIR)/epsilon%packed.js $(BUILD_DIR)/ion/src/simulator/web/simulator.html
@rm -rf $(basename $@)
@mkdir -p $(basename $@)
@cp $< $(basename $@)/epsilon.js