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

several fixes to Makefile...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2018-03-22 00:04:24 +03:00
parent 7bdfa7fe62
commit b5e0b03491
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui (gen4)/Makefile
View File

@ -131,11 +131,7 @@
.SECONDEXPANSION: .SECONDEXPANSION:
# basic configuration... # basic configuration...
# This prevents pipe and redirection sequensing difference errors between #SHELL := $(shell which bash)
# Windows and *NIX systmes for commands like:
# cat package.json | sed 's/"index.html"/"e.js"/g' > package.json
# ...which would produce zero-length results under cmp/powershell.
SHELL := $(shell which sh)
@ -573,7 +569,7 @@ $(TARGET_DIR)/$(ELECTRON_DIST):
$(BUILD_DIR)/app.asar: $(PACK_FULL) $(BUILD_DIR)/app.asar: $(PACK_FULL)
# update package.json to start electron... # update package.json to start electron...
cd "$(BUILD_DIR)/$(APP_NAME)/" ; \ cd "$(BUILD_DIR)/$(APP_NAME)/" ; \
cat package.json | sed 's/"index.html"/"e.js"/g' > package.json sed -i 's/"index.html"/"e.js"/g' package.json
cd "$(BUILD_DIR)" ; \ cd "$(BUILD_DIR)" ; \
asar p "$(APP_NAME)" app.asar \ asar p "$(APP_NAME)" app.asar \
--exclude-hidden \ --exclude-hidden \
@ -656,8 +652,6 @@ $(TARGET_DIR)/$(NW_DIST):
# NOTE: this needs a clean app dir... # NOTE: this needs a clean app dir...
# XXX BUG: can't find modules in unpacked node_modules... # XXX BUG: can't find modules in unpacked node_modules...
# XXX for some reason if $(BUILD_DIR)/$(APP_NAME) exists package.josn
# is zero length...
.PRECIOUS: $(BUILD_DIR)/package.nw .PRECIOUS: $(BUILD_DIR)/package.nw
$(BUILD_DIR)/package.nw: INCLUDE_NODE_MODULES += $(INCLUDE_NW_NODE_MODULES) $(BUILD_DIR)/package.nw: INCLUDE_NODE_MODULES += $(INCLUDE_NW_NODE_MODULES)
$(BUILD_DIR)/package.nw: PACK_MINIMAL = $(BUILD_DIR)/$(APP_NAME)/ \ $(BUILD_DIR)/package.nw: PACK_MINIMAL = $(BUILD_DIR)/$(APP_NAME)/ \
@ -665,7 +659,7 @@ $(BUILD_DIR)/package.nw: PACK_MINIMAL = $(BUILD_DIR)/$(APP_NAME)/ \
$(BUILD_DIR)/package.nw: $$(PACK_MINIMAL) $(BUILD_DIR)/package.nw: $$(PACK_MINIMAL)
# update package.json to start nw... # update package.json to start nw...
cd "$<" ; \ cd "$<" ; \
cat package.json | sed 's/"e.js"/"index.html"/g' > package.json sed -i 's/"e.js"/"index.html"/g' package.json
$(call zipFrom,$<,$@,*) $(call zipFrom,$<,$@,*)