diff --git a/ui (gen4)/Makefile b/ui (gen4)/Makefile index 9abdb59e..e416fb56 100755 --- a/ui (gen4)/Makefile +++ b/ui (gen4)/Makefile @@ -644,7 +644,7 @@ $(TARGET_DIR)/$(ELECTRON_DIST): -O "$@" -# pack app.asar (electron-specific)... +# pack app.asar... # XXX should this update package.json -> set "main" to "e.js"... .PRECIOUS: $(BUILD_DIR)/app.asar # XXX do we need to track changes to pack-full or to build it only if @@ -664,7 +664,7 @@ $(BUILD_DIR)/app.asar: $(PACK_FULL) --unpack-dir node_modules/sharp -# build the app dir (electron-specific)... +# build the app dir... # NOTE: the "/" here is significant -- it prevents conflicts with other # rules... # XXX need to take nw/el version part into account... @@ -686,18 +686,24 @@ $(BUILD_DIR)/$(APP_NAME)-%/: $(TARGET_DIR)/$(ELECTRON_DIST) \ @touch "$@" -# modify the archive in place (electron-specific)... +# modify the archive in place... # XXX need to take nw/el version part into account... +# XXX update macos package settings... # XXX need to setup app icons... +# XXX either keep in sync with the repack version or abstract the actions... $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \ $(BUILD_DIR)/app.asar $(BUILD_INFO) cp "$<" "$@.tmp" +# # setup macos Info.plist config files... +# # XXX # # setup app icon... # # XXX # remove default_app.asar and misc stuff... $(call zipDelFrom,"$(BUILD_DIR)",$@.tmp,"$(ASAR_PATH)/default_app.asar") $(call zipDelFrom,"$(BUILD_DIR)",$@.tmp,"version") # rename electron stuff... +# # XXX rename "Electron Helper" on mac builds... +# | sed 's/\(^@ \(.*\)Electron Helper\(.*\)\)$$/\1\n@=\2$(APP_NAME) Helper\3/' \ zipnote "$@.tmp" \ | sed 's/\(^@ LICENSE\)$$/\1\n@=LICENSE.electron/' \ | zipnote -w "$@.tmp" @@ -716,6 +722,7 @@ $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \ # package the app dir (unpack - update - repack)... # XXX need to take nw/el version part into account (???) +# XXX either keep in sync with the in-place version or abstract the actions... $(BUILD_DIR)/$(APP_NAME)-%.repack.zip: $(BUILD_DIR)/$(APP_NAME)-%/ $(MD) "$(@D)" $(call zipFrom,$<,$@,*)