From e53c6d0c0d069e02f72cbc71d961bf4e2aee216f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Heusipp?= Date: Sat, 2 Mar 2024 20:22:13 +0000 Subject: [PATCH] Merged revision(s) 20178 from trunk/OpenMPT: [Fix] build: Emscripten 3.1.55 does not produce separate .mem files any more. Do not try to copy them for distribution. ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@20179 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- Makefile | 2 -- build/auto/dist-js.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/Makefile b/Makefile index c32572e82e..d998c2694f 100644 --- a/Makefile +++ b/Makefile @@ -1854,7 +1854,6 @@ bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION).dev.js.tar: mkdir -p bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin mkdir -p bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.js bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.js - cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.js.mem bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.js.mem cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.wasm bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.wasm cp bin/$(FLAVOUR_DIR)stage/all/libopenmpt.wasm.js bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)all/libopenmpt.wasm.js mkdir -p bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm @@ -1862,7 +1861,6 @@ bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION).dev.js.tar: cp bin/$(FLAVOUR_DIR)stage/wasm/libopenmpt.wasm bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)wasm/libopenmpt.wasm mkdir -p bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js cp bin/$(FLAVOUR_DIR)stage/js/libopenmpt.js bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js/libopenmpt.js - cp bin/$(FLAVOUR_DIR)stage/js/libopenmpt.js.mem bin/$(FLAVOUR_DIR)dist-js/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/bin/$(FLAVOUR_DIR)js/libopenmpt.js.mem cd bin/$(FLAVOUR_DIR)dist-js/ && tar cv --numeric-owner --owner=0 --group=0 libopenmpt-$(DIST_LIBOPENMPT_VERSION) > libopenmpt-$(DIST_LIBOPENMPT_VERSION).dev.js.tar .PHONY: bin/$(FLAVOUR_DIR)dist-dos/libopenmpt-$(DIST_LIBOPENMPT_VERSION).bin.dos.zip diff --git a/build/auto/dist-js.sh b/build/auto/dist-js.sh index 6b8bcc8719..31af293425 100755 --- a/build/auto/dist-js.sh +++ b/build/auto/dist-js.sh @@ -16,7 +16,6 @@ make CONFIG=emscripten TEST=1 ONLY_TEST=1 EMSCRIPTEN_TARGET=all VERBOSE=1 make CONFIG=emscripten TEST=1 ONLY_TEST=1 EMSCRIPTEN_TARGET=all VERBOSE=1 check make CONFIG=emscripten TEST=0 EMSCRIPTEN_TARGET=all VERBOSE=1 cp bin/libopenmpt.js bin/stage/all/ -cp bin/libopenmpt.js.mem bin/stage/all/ cp bin/libopenmpt.wasm bin/stage/all/ cp bin/libopenmpt.wasm.js bin/stage/all/ make CONFIG=emscripten EMSCRIPTEN_TARGET=all VERBOSE=1 clean @@ -36,7 +35,6 @@ make CONFIG=emscripten TEST=1 ONLY_TEST=1 EMSCRIPTEN_TARGET=js VERBOSE=1 make CONFIG=emscripten TEST=1 ONLY_TEST=1 EMSCRIPTEN_TARGET=js VERBOSE=1 check make CONFIG=emscripten TEST=0 EMSCRIPTEN_TARGET=js VERBOSE=1 cp bin/libopenmpt.js bin/stage/js/ -cp bin/libopenmpt.js.mem bin/stage/js/ make CONFIG=emscripten EMSCRIPTEN_TARGET=js VERBOSE=1 clean make CONFIG=emscripten VERBOSE=1 dist-js