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

reworked the patching process + docs...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-03-19 02:25:17 +03:00
parent fbe7ff0288
commit b4fe7db680
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Viewer/Makefile
View File

@ -296,6 +296,8 @@ FEATURES_DIR = features
IMAGES_DIR = images IMAGES_DIR = images
ASSET_DIR := data ASSET_DIR := data
BACKUP_EXT := .ig-backup
LICENSE = LICENSE LICENSE = LICENSE
BUILD_INFO = $(BUILD_DIR)/INFO BUILD_INFO = $(BUILD_DIR)/INFO
PROJECT_FILES = package.json PROJECT_FILES = package.json
@ -643,8 +645,8 @@ version.js: package.json version.js.tpl
$(NODE_DIR): package.json $(NODE_DIR): package.json
npm install npm install
# patch requirejs (see: NOTES) # # patch requirejs (see: NOTES)
make patched-requirejs # make patched-requirejs
# NOTE: this may break on some systems due to a dependency issue... # NOTE: this may break on some systems due to a dependency issue...
# $(ELECTRON_REBUILD) # $(ELECTRON_REBUILD)
@touch "$@" @touch "$@"
@ -688,18 +690,31 @@ $(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/%: $(NODE_DIR)
@touch "$@" @touch "$@"
##--------------------------------------------------------- Patches ---
# patch/unpatch requirejs (see: NOTES) # patch/unpatch requirejs (see: NOTES)
.PHONY: patched-requirejs # XXX need to find a better way around this...
patched-requirejs: $(NODE_DIR) $(NODE_DIR)/requirejs/bin/r.js REQUREJS := $(NODE_DIR)/requirejs/bin/r.js
$(REQUREJS): $(NODE_DIR) $(REQUREJS)$(BACKUP_EXT)
$(REQUREJS)$(BACKUP_EXT): $(NODE_DIR)
# HACK: for some reason requirejs breaks if we do not do this (see: NOTES) # HACK: for some reason requirejs breaks if we do not do this (see: NOTES)
cp -f $(NODE_DIR)/requirejs/bin/r.js{,.bak} cp -f $(REQUREJS){,$(BACKUP_EXT)}
cat $(NODE_DIR)/requirejs/bin/r.js.bak \ cat $(REQUREJS)$(BACKUP_EXT) \
| sed 's/^\(#!\/\)/\/\/\1/' \ | sed 's/^\(#!\/\)/\/\/\1/' \
> $(NODE_DIR)/requirejs/bin/r.js > $(REQUREJS)
.PHONY: patched-requirejs
patched-requirejs: ## Patch requirejs (see: NOTES)
patched-requirejs: $(REQUREJS)
.PHONY: unpatched-requirejs .PHONY: unpatched-requirejs
unpatched-requirejs: $(NODE_DIR) $(NODE_DIR)/requirejs/bin/r.js.bak unpatched-requirejs: ## Unpatch requirejs
mv -f $(NODE_DIR)/requirejs/bin/r.js{.bak,} unpatched-requirejs:
[ -e $(REQUREJS)$(BACKUP_EXT) ] \
&& mv -f $(REQUREJS){$(BACKUP_EXT),}