added version info to makefile...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-01-12 20:43:16 +03:00
parent 9ad1a3d3a7
commit fb75df00d1
2 changed files with 46 additions and 10 deletions

View File

@ -69,6 +69,7 @@ APP_NAME ?= ImageGrid.Viewer
# XXX get version...
VERSION ?= 4.0.0a
# Electron stuff...
@ -213,15 +214,18 @@ cleanall: clean
$(RM) $(DIST_DIR) $(TARGET_DIR) $(NODE_DIR)
electron-dist: $(DIST_DIR)/$(APP_NAME)-$(TARGET_OS)-$(ARCH).zip
electron-dist: $(DIST_DIR)/$(APP_NAME)-$(VERSION)-$(TARGET_OS)-$(ARCH).zip
#electron-inst: $(DIST_DIR)/$(APP_NAME)-$(TARGET_OS)-$(ARCH).msi
#electron-inst: $(DIST_DIR)/$(APP_NAME)-$(VERSION)-$(TARGET_OS)-$(ARCH).msi
dist: electron-dist
.PHONY: all css dev clean cleanall dist dist-in-place \
web: $(DIST_DIR)/$(APP_NAME)-$(VERSION)-web.zip
.PHONY: all css dev clean cleanall dist web dist-in-place \
electron-dist electron-inst electron-dist-in-place
@ -302,6 +306,15 @@ app-dir-minimal: $(PACK_MINIMAL)
#----------------------------------------------------------------------
# Web...
$(DIST_DIR)/$(APP_NAME)-$(VERSION)-web.zip: $(PACK_MINIMAL)
$(MD) "$(@D)"
$(call zipfrom,$<,$@,*)
#----------------------------------------------------------------------
# Electron desktop build...
@ -336,7 +349,7 @@ $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip:
# build the app dir (electron-specific)...
# XXX need to setup app icons...
.PRECIOUS: $(BUILD_DIR)/$(APP_NAME)-%
$(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \
$(BUILD_DIR)/$(APP_NAME)-$(VERSION)-%: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \
$(BUILD_DIR)/app.asar $(BUILD_DATE)
unzip -u "$<" -d "$@"
cp -r $(BUILD_DIR)/app.asar* "$@/$(ASAR_PATH)/"
@ -354,7 +367,7 @@ $(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \
# modify the archive in place (electron-specific)...
# XXX need to setup app icons...
$(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \
$(BUILD_DIR)/$(APP_NAME)-$(VERSION)-%.in-place.zip: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \
$(BUILD_DIR)/app.asar $(BUILD_DATE)
cp "$<" "$@.tmp"
# # setup app icon...
@ -375,7 +388,7 @@ $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/electron-$(ELECTRON_VERSI
# package the app dir (unpack - update - repack)...
$(BUILD_DIR)/$(APP_NAME)-%.repack.zip: $(BUILD_DIR)/$(APP_NAME)-%
$(BUILD_DIR)/$(APP_NAME)-$(VERSION)-%.repack.zip: $(BUILD_DIR)/$(APP_NAME)-%
$(MD) "$(@D)"
$(call zipfrom,$<,$@,*)
@ -387,7 +400,6 @@ $(DIST_DIR)/$(APP_NAME)-%.zip: $(BUILD_DIR)/$(APP_NAME)-%.$(BUILD_MODE).zip
#----------------------------------------------------------------------
# Desktop installer...

View File

@ -1,3 +1,21 @@
Basic build
-----------
Default desktop app build:
make
Build desktop app with full repack:
(export BUILD_MODE=repack && make)
Build list of files for web:
make web
Chromium flicker issue
----------------------
@ -24,13 +42,19 @@ Then open http://localhost:9222 in chrome.
Sharp
-----
Sharp and other native modules for nw/electron
----------------------------------------------
To build sharp for a specific version of node and nwjs:
To build sharp for a specific version of node:
cd ./node_modules/sharp/
nw-gyp rebuild --target=0.17.4 --arch=x64
And for electron:
electron-rebuild
Speedup loading of app
----------------------