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

refactoring...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-03-29 00:58:27 +03:00
parent ba1d3a803f
commit 1a0c03ee03
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Viewer/Makefile
View File

@ -176,7 +176,7 @@ APP_NAME ?= ImageGrid.Viewer
# - system - global install # - system - global install
INSTALL_PATH ?= INSTALL_PATH ?=
APP_PATH ?= $(INSTALL_PATH)/ig APP_PATH ?= ig
ICON_PATH ?= ICON_PATH ?=
@ -677,21 +677,15 @@ $(BUILD_INFO): $(CSS_FILES) $(NODE_DIR) $(PROJECT_FILES) \
@echo "electron: $(ELECTRON_VERSION)" | tee -a "$@" @echo "electron: $(ELECTRON_VERSION)" | tee -a "$@"
%.js: %.js.tpl package.json # XXX is this too broad???
%: %.tpl package.json
cat $< \ cat $< \
| sed 's/\$$VERSION/$(APP_VERSION)/' \ | sed 's/\$$VERSION/$(APP_VERSION)/' \
| sed 's/\$$BUILD/$(DATE)/' \ | sed 's/\$$BUILD/$(DATE)/' \
| sed 's/\$$COMMIT/$(COMMIT)/' \ | sed 's/\$$COMMIT/$(COMMIT)/' \
> $@
# XXX this should be a generic rule: %.desktop <- %.desktop.tpl
$(APP_NAME).desktop: App.desktop.tpl package.json
cat $< \
| sed 's/\$$VERSION/$(APP_VERSION)/' \
| sed 's/\$$APP_NAME/$(APP_NAME)/' \ | sed 's/\$$APP_NAME/$(APP_NAME)/' \
| sed 's/\$$APP_PATH/$(APP_PATH)/' \ | sed 's/\$$APP_PATH/$(subst /,\/,$(APP_PATH))/' \
| sed 's/\$$ICON_PATH/$(ICON_PATH)/' \ | sed 's/\$$ICON_PATH/$(subst /,\/,$(ICON_PATH))/' \
> $@ > $@
@ -699,6 +693,10 @@ $(APP_NAME).desktop: App.desktop.tpl package.json
$(LESSC) $< > $@ $(LESSC) $< > $@
$(APP_NAME).desktop: App.desktop
mv $< $@
# XXX might be a good idea to install directly to $(BUILD_DIR) so as not # XXX might be a good idea to install directly to $(BUILD_DIR) so as not
# to messup the current dir... # to messup the current dir...
# XXX need to make this arch/os specific for cross compiling... # XXX need to make this arch/os specific for cross compiling...