diff --git a/.github/workflows/viewer-build.yml b/.github/workflows/viewer-build.yml index be9eeeec..e69333b1 100644 --- a/.github/workflows/viewer-build.yml +++ b/.github/workflows/viewer-build.yml @@ -55,13 +55,8 @@ jobs: run: | ls -la ./build echo "---" - cd targets - zipnote -w electron-*.zip <<<$'@ LICENSE\n@=LICENSE.electron' - echo "---" - cd .. - cd build # XXX this fails for some reason... - zipnote -w Im*.zip.tmp <<<$'@ LICENSE\n@=LICENSE.electron' + #zipnote -w ./build/Im*.zip.tmp <<<$'@ LICENSE\n@=LICENSE.electron' - name: Release env: diff --git a/Viewer/Makefile b/Viewer/Makefile index 6d01345f..0e73110f 100644 --- a/Viewer/Makefile +++ b/Viewer/Makefile @@ -913,14 +913,19 @@ $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \ # rename electron stuff... # # XXX rename "Electron Helper" on mac builds -- this needs Info.plist changes... # | sed 's/\(^@ \(.*\)Electron Helper\(.*\)\)$$/\1\n@=\2$(APP_NAME) Helper\3/' - zipnote -w "$@.tmp" <<<$$'@ LICENSE\n@=LICENSE.electron' + #zipnote -w "$@.tmp" <<<$$'@ LICENSE\n@=LICENSE.electron' + unzip -p "$@.tmp" LICENSE > $(BUILD_DIR)/LICENSE.electron + # rename app... +# # XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes... +# # XXX zipnote seems to not be working on github actions' windows + #zipnote -w "$@.tmp" <<<$$'@ $(ELECTRON_BIN)$(EXT)\n@=$(APP_BIN)$(EXT)' + unzip -d $(BUILD_DIR) "$@.tmp" "$(ELECTRON_BIN)$(EXT)" + zip -d "$@.tmp" "$(ELECTRON_BIN)$(EXT)" + mv "${BUILD_DIR}"/{"$(ELECTRON_BIN)$(EXT)","$(APP_BIN)$(EXT)"} # add app.asar and friends... $(MD) "$(BUILD_DIR)/$(ASAR_PATH)" cp -r $(BUILD_DIR)/app.asar* "$(BUILD_DIR)/$(ASAR_PATH)/" - $(call zipFrom,"$(BUILD_DIR)",$@.tmp,"$(ASAR_PATH)" "$(notdir $(BUILD_INFO))" "$(LICENSE)") - # rename app... -# # XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes... - zipnote -w "$@.tmp" <<<$$'@ $(ELECTRON_BIN)$(EXT)\n@=$(APP_BIN)$(EXT)' + $(call zipFrom,"$(BUILD_DIR)",$@.tmp,"$(ASAR_PATH)" "$(notdir $(BUILD_INFO))" "$(LICENSE)" "$(LICENSE).electron" "$(APP_BIN)$(EXT)") # cleanup... $(RM) $(BUILD_DIR)/$(firstword $(subst /, ,$(ASAR_PATH))) mv "$@.tmp" "$@"