flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-29 10:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

odd things happening with Makefile...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-01-08 07:46:38 +03:00
parent fa0df0c5d9
commit fcf64c8f3e
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui (gen4)/Makefile
View File

@ -15,21 +15,16 @@ APP_NAME=ImageGrid.Viewer
ELECTRON_DOWNOAD_URL=https://github.com/electron/electron/releases/download ELECTRON_DOWNOAD_URL=https://github.com/electron/electron/releases/download
# XXX autodetect this.... # XXX get these automatically...
TARGET_OS=win32
# XXX get this automatically...
# ...also might be good to make this flexible and use these as parameters... # ...also might be good to make this flexible and use these as parameters...
ELECTRON_VERSION=1.7.10 TARGET_OS=win32
# XXX for some reson these break the rules below...
#ELECTRON_VERSION=`electron -v`
#ELECTRON_VERSION=$(shell electron -v)
ELECTRON_VERSION=v1.8.1
NODE_VERSION=`node --version` NODE_VERSION=`node --version`
UNAME := $(shell uname)
#********************************************************************** #**********************************************************************
@ -143,11 +138,11 @@ $(BUILD_DIR)/app.asar: $(BUILD_DIR)/$(APP_NAME)
# get the electron binary... # get the electron binary...
# XXX for some odd reason this is deleted adter extraction... # XXX for some odd reason this is deleted adter extraction...
.PRECIOUS: $(TARGET_DIR)/electron-v$(ELECTRON_VERSION)-%.zip .PRECIOUS: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip
$(TARGET_DIR)/electron-v$(ELECTRON_VERSION)-%.zip: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip:
@mkdir -p $(@D) @mkdir -p $(@D)
wget \ wget \
-nc "$(ELECTRON_DOWNOAD_URL)/v$(ELECTRON_VERSION)/$(@F)" \ -nc "$(ELECTRON_DOWNOAD_URL)/$(ELECTRON_VERSION)/$(@F)" \
-O "$@" -O "$@"
@ -157,7 +152,7 @@ $(TARGET_DIR)/electron-v$(ELECTRON_VERSION)-%.zip:
# build the app dir... # build the app dir...
# XXX this is electron-specific... # XXX this is electron-specific...
.PRECIOUS: $(BUILD_DIR)/$(APP_NAME)-% .PRECIOUS: $(BUILD_DIR)/$(APP_NAME)-%
$(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-v$(ELECTRON_VERSION)-%.zip $(BUILD_DIR)/app.asar $(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip $(BUILD_DIR)/app.asar
unzip -u "$<" -d "$@" unzip -u "$<" -d "$@"
chmod +x "$@/"*dll "$@/"*exe chmod +x "$@/"*dll "$@/"*exe
cp "$(BUILD_DIR)/app.asar" "$@/resources/" cp "$(BUILD_DIR)/app.asar" "$@/resources/"