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

more tweaking...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-01-11 19:58:24 +03:00
parent a443965d71
commit 8e04595035
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ui (gen4)/Makefile
View File

@ -44,6 +44,7 @@
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# ToDo: # ToDo:
# - app icons...
# - might be a good idea to do a no-bin target -- exclude native... # - might be a good idea to do a no-bin target -- exclude native...
# - add a cli-only build # - add a cli-only build
# - installers: # - installers:
@ -166,15 +167,17 @@ CSS_FILES := $(patsubst %.less,%.css,$(wildcard css/*.less))
HTML_FILES := $(wildcard *.html) HTML_FILES := $(wildcard *.html)
JS_FILES := $(wildcard *.js) JS_FILES := $(wildcard *.js)
IG_MODULES = ig-object ig-actions ig-features # XXX do we actually use preact???
INCLUDE_NODE_MODULES = ig-object ig-actions ig-features preact
# dependencies to check... # dependencies to check...
# XXX also add: heat, candle, light...
# XXX might be a good idea to split these to sections and check only what # XXX might be a good idea to split these to sections and check only what
# is needed... # is needed...
# ...like: base, electron, wix, ... # ...like: base, electron, wix, ...
DEPENDENCIES := npm wget zip unzip zipnote \ DEPENDENCIES = npm wget zip unzip zipnote \
lessc electron electron-rebuild asar lessc electron electron-rebuild asar
# WiX dependencies...
#DEPENDENCIES += heat candle light
@ -205,7 +208,6 @@ electron-dist-in-place: $(BUILD_DIR)/$(APP_NAME)-$(TARGET_OS)-$(ARCH).zip electr
electron-inst: $(DIST_DIR)/$(APP_NAME)-$(TARGET_OS)-$(ARCH).msi electron-inst: $(DIST_DIR)/$(APP_NAME)-$(TARGET_OS)-$(ARCH).msi
dist: check electron-dist dist: check electron-dist
dist-in-place: check electron-dist-in-place dist-in-place: check electron-dist-in-place
@ -232,7 +234,7 @@ check: $(foreach dep,$(DEPENDENCIES),require($(dep)))
#********************************************************************** #**********************************************************************
# build rules... # build rules...
NODE_MODULES_MINIMAL = $(foreach m,$(IG_MODULES),$(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/$(m)) NODE_MODULES_MINIMAL = $(foreach m,$(INCLUDE_NODE_MODULES),$(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/$(m))
PACK_MINIMAL = $(BUILD_DIR)/$(APP_NAME) $(NODE_MODULES_MINIMAL) PACK_MINIMAL = $(BUILD_DIR)/$(APP_NAME) $(NODE_MODULES_MINIMAL)
PACK_FULL = $(BUILD_DIR)/$(APP_NAME) $(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR) PACK_FULL = $(BUILD_DIR)/$(APP_NAME) $(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)
@ -277,13 +279,20 @@ $(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR): $(NODE_DIR)
@touch "$@" @touch "$@"
# ig-* $(NODE_DIR) modules... # add ig-* $(NODE_DIR) modules...
$(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/ig-%: $(NODE_DIR) $(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/%: $(NODE_DIR)
$(MD) "$(@D)" $(MD) "$(@D)"
cp -r "$(NODE_DIR)/ig-$*" "$(@D)" cp -r "$(NODE_DIR)/$*" "$(@D)"
@touch "$@" @touch "$@"
# targets for testing...
# NOTE: do not use these phony targets as dependencies...
.PHONY: app-dir-full app-dir-minimal
app-dir-full: $(PACK_FULL)
app-dir-minimal: $(PACK_MINIMAL)
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Electron desktop build... # Electron desktop build...
@ -334,17 +343,20 @@ $(BUILD_DIR)/$(APP_NAME)-%: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \
# modify the archive in place (electron-specific)... # modify the archive in place (electron-specific)...
# XXX need to setup app icons...
# XXX BUILD_DIR is unguarded here -- see cp -r ... # XXX BUILD_DIR is unguarded here -- see cp -r ...
$(BUILD_DIR)/$(APP_NAME)-%.zip: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \ $(BUILD_DIR)/$(APP_NAME)-%.zip: $(TARGET_DIR)/electron-$(ELECTRON_VERSION)-%.zip \
$(BUILD_DIR)/app.asar $(BUILD_DATE) $(BUILD_DIR)/app.asar $(BUILD_DATE)
cp "$<" "$@.tmp" cp "$<" "$@.tmp"
# # setup app icon...
# # XXX
# remove default_app.asar... # remove default_app.asar...
$(call zipdelfrom,"$(BUILD_DIR)",$@.tmp,"$(ASAR_PATH)/default_app.asar") $(call zipdelfrom,"$(BUILD_DIR)",$@.tmp,"$(ASAR_PATH)/default_app.asar")
# add app.asar... # add app.asar...
$(MD) "$(BUILD_DIR)/$(ASAR_PATH)" $(MD) "$(BUILD_DIR)/$(ASAR_PATH)"
cp -r $(BUILD_DIR)/app.asar* "$(BUILD_DIR)/$(ASAR_PATH)/" cp -r $(BUILD_DIR)/app.asar* "$(BUILD_DIR)/$(ASAR_PATH)/"
$(call zipfrom,"$(BUILD_DIR)",$@.tmp,"$(ASAR_PATH)" "$(notdir $(BUILD_DATE))") $(call zipfrom,"$(BUILD_DIR)",$@.tmp,"$(ASAR_PATH)" "$(notdir $(BUILD_DATE))")
# rename app dir in zip... # rename app in zip...
zipnote "$@.tmp" \ zipnote "$@.tmp" \
| sed 's/\(^@ $(ELECTRON_BIN)$(EXT)\)\(.*$$\)/\1\2\n@=$(APP_BIN)$(EXT)\2/' \ | sed 's/\(^@ $(ELECTRON_BIN)$(EXT)\)\(.*$$\)/\1\2\n@=$(APP_BIN)$(EXT)\2/' \
| zipnote -w "$@.tmp" | zipnote -w "$@.tmp"
@ -376,16 +388,19 @@ $(DIST_DIR)/$(APP_NAME)-%.zip: $(BUILD_DIR)/$(APP_NAME)-%.zip
%.wxs: %.wxs:
heat dir $* -gg -o $< heat dir $* -gg -o $<
# XXX provide -arch x64/ia32... # XXX provide -arch x64/ia32...
%.wixobj: %.wsx %.wixobj: %.wsx
candle -o $@ $< candle -o $@ $<
%.msi: %.wixobj %.msi: %.wixobj
light -o $@ $< light -o $@ $<
# installer (WiX)... # installer (WiX)...
$(DIST_DIR)/$(APP_NAME)-%.msi: $(BUILD_DIR)/$(APP_NAME)-% $(BUILD_DIR)/$(APP_NAME).wxs $(DIST_DIR)/$(APP_NAME)-%.msi: $(BUILD_DIR)/$(APP_NAME)-% $(BUILD_DIR)/$(APP_NAME).wxs
@mkdir -p "$(@D)" $(MD) "$(@D)"