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 patching of requirejs (HACK)

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-03-18 19:44:48 +03:00
parent 11c91cf0e9
commit fbe7ff0288
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Viewer/Makefile
View File

@ -444,7 +444,7 @@ doc: $(DOC_FILES)
.PHONY: dev .PHONY: dev
dev: ## Build the development environment dev: ## Build the development environment
dev: $(JS_FILES) $(NODE_DIR) css dev: $(JS_FILES) $(NODE_DIR) patched-requirejs css
.PHONY: dist .PHONY: dist
@ -644,10 +644,7 @@ 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)
cp -f $(NODE_DIR)/requirejs/bin/r.js{,.bak} make patched-requirejs
cat $(NODE_DIR)/requirejs/bin/r.js.bak \
| sed 's/^\(#!\/\)/\/\/\1/' \
> $(NODE_DIR)/requirejs/bin/r.js
# 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 "$@"
@ -678,7 +675,7 @@ $(BUILD_DIR)/$(APP_NAME)/: $(PROJECT_FILES) \
# NOTE: making $(NODE_DIR) a link/junction would be quite a bit faster # NOTE: making $(NODE_DIR) a link/junction would be quite a bit faster
# but it will also choke asar... # but it will also choke asar...
# XXX %/$(NODE_DIR): $(NODE_DIR) ??? # XXX %/$(NODE_DIR): $(NODE_DIR) ???
$(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR): $(NODE_DIR) $(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR): $(NODE_DIR) patched-requirejs
$(MD) "$@" $(MD) "$@"
cp -r "$(NODE_DIR)" "$(@D)" cp -r "$(NODE_DIR)" "$(@D)"
@touch "$@" @touch "$@"
@ -691,6 +688,21 @@ $(BUILD_DIR)/$(APP_NAME)/$(NODE_DIR)/%: $(NODE_DIR)
@touch "$@" @touch "$@"
# patch/unpatch requirejs (see: NOTES)
.PHONY: patched-requirejs
patched-requirejs: $(NODE_DIR) $(NODE_DIR)/requirejs/bin/r.js
# HACK: for some reason requirejs breaks if we do not do this (see: NOTES)
cp -f $(NODE_DIR)/requirejs/bin/r.js{,.bak}
cat $(NODE_DIR)/requirejs/bin/r.js.bak \
| sed 's/^\(#!\/\)/\/\/\1/' \
> $(NODE_DIR)/requirejs/bin/r.js
.PHONY: unpatched-requirejs
unpatched-requirejs: $(NODE_DIR) $(NODE_DIR)/requirejs/bin/r.js.bak
mv -f $(NODE_DIR)/requirejs/bin/r.js{.bak,}
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# Web... # Web...