From a4e29b3f3ec34dc58fd696cbbd3a0aa921481754 Mon Sep 17 00:00:00 2001 From: Sebastian Miasojed Date: Thu, 23 Jan 2025 15:32:54 +0100 Subject: [PATCH] Apply revive comments --- Makefile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 077b9c3..df836f5 100644 --- a/Makefile +++ b/Makefile @@ -28,19 +28,17 @@ install-bin: install-npm: npm install && npm fund -TARGET_PATH=target/wasm32-unknown-emscripten/release -WASM_FILE=$(TARGET_PATH)/resolc.wasm -JS_FILE=$(TARGET_PATH)/resolc.js -OUTPUT_FILE=$(TARGET_PATH)/resolc_packed.js +RESOLC_WASM_TARGET_DIR=target/wasm32-unknown-emscripten/release +RESOLC_WASM=$(RESOLC_WASM_TARGET_DIR)/resolc.wasm +RESOLC_JS=$(RESOLC_WASM_TARGET_DIR)/resolc.js +RESOLC_JS_PACKED=$(RESOLC_WASM_TARGET_DIR)/resolc_packed.js install-wasm: install-npm cargo build --target wasm32-unknown-emscripten -p revive-solidity --release --no-default-features - @if [ ! -f $(WASM_FILE) ]; then echo "Error: Missing $(WASM_FILE)"; exit 1; fi - @if [ ! -f $(JS_FILE) ]; then echo "Error: Missing $(JS_FILE)"; exit 1; fi - @echo "let moduleArgs = { wasmBinary: readBinary(\"data:application/octet-stream;base64,$$(base64 -w 0 $(WASM_FILE))\") };" > $(OUTPUT_FILE) - @cat $(JS_FILE) >> $(OUTPUT_FILE) - @echo "createRevive = createRevive.bind(null, moduleArgs);" >> $(OUTPUT_FILE) - @echo "Combined script written to $(OUTPUT_FILE)" + @echo "let moduleArgs = { wasmBinary: readBinary(\"data:application/octet-stream;base64,$$(base64 -w 0 $(RESOLC_WASM))\") };" > $(RESOLC_JS_PACKED) + @cat $(RESOLC_JS) >> $(RESOLC_JS_PACKED) + @echo "createRevive = createRevive.bind(null, moduleArgs);" >> $(RESOLC_JS_PACKED) + @echo "Combined script written to $(RESOLC_JS_PACKED)" install-llvm-builder: cargo install --path crates/llvm-builder