From c5b25b566fdf1c4c93769fae7b19ebfae6601d15 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 11 Jan 2018 04:04:22 +0300 Subject: [PATCH] now sharp works in built app Signed-off-by: Alex A. Naanou --- ui (gen4)/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile index 2b5c85ea..6204d947 100755 --- a/ui (gen4)/Makefile +++ b/ui (gen4)/Makefile @@ -271,7 +271,8 @@ $(BUILD_DIR)/$(APP_NAME): $(CSS_FILES) $(NODE_DIR) $(PROJECT_FILES) \ # XXX need to do $(BUILD_DIR)/$(APP_NAME) iff app.asar does not exist... $(BUILD_DIR)/app.asar: $(BUILD_DIR)/$(APP_NAME) cd $(BUILD_DIR) ; \ - asar p "$(APP_NAME)" app.asar + asar p "$(APP_NAME)" app.asar \ + --unpack-dir node_modules/sharp # get the electron binary (keep this cached)... @@ -288,7 +289,7 @@ $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip: $(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \ $(BUILD_DIR)/app.asar $(BUILD_DATE) unzip -u "$<" -d "$@" - cp "$(BUILD_DIR)/app.asar" "$@/$(ASAR_PATH)/" + cp $(wildcard $(BUILD_DIR)/app.asar*) "$@/$(ASAR_PATH)/" cp -f "$(BUILD_DATE)" "$@/" # remove default_app.asar... $(RM) "$@/$(ASAR_PATH)/default_app.asar" @@ -309,10 +310,10 @@ $(BUILD_DIR)/$(APP_NAME)-%.zip: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip zip -d "../$@.tmp" "$(ASAR_PATH)/default_app.asar" # add app.asar... $(MD) "$(BUILD_DIR)/$(ASAR_PATH)" - cp "$(BUILD_DIR)/app.asar" "$(BUILD_DIR)/$(ASAR_PATH)/" + cp -r $(wildcard $(BUILD_DIR)/app.asar*) "$(BUILD_DIR)/$(ASAR_PATH)/" cd "$(BUILD_DIR)" ; \ zip -r "../$@.tmp" \ - "$(ASAR_PATH)/app.asar" \ + "$(ASAR_PATH)" \ "$(notdir $(BUILD_DATE))" # rename app dir in zip... zipnote "$@.tmp" \