mirror of
				https://github.com/flynx/ImageGrid.git
				synced 2025-10-30 19:00:09 +00:00 
			
		
		
		
	refactoring...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
		
							parent
							
								
									ba1d3a803f
								
							
						
					
					
						commit
						1a0c03ee03
					
				| @ -176,7 +176,7 @@ APP_NAME ?= ImageGrid.Viewer | ||||
| # 	- system	- global install
 | ||||
| INSTALL_PATH ?= | ||||
| 
 | ||||
| APP_PATH ?= $(INSTALL_PATH)/ig | ||||
| APP_PATH ?= ig | ||||
| ICON_PATH ?= | ||||
| 
 | ||||
| 
 | ||||
| @ -677,21 +677,15 @@ $(BUILD_INFO): $(CSS_FILES) $(NODE_DIR) $(PROJECT_FILES) \ | ||||
| 	@echo "electron: $(ELECTRON_VERSION)" | tee -a "$@" | ||||
| 
 | ||||
| 
 | ||||
| %.js: %.js.tpl package.json | ||||
| # XXX is this too broad???
 | ||||
| %: %.tpl package.json | ||||
| 	cat $< \
 | ||||
| 		| sed 's/\$$VERSION/$(APP_VERSION)/' \
 | ||||
| 		| sed 's/\$$BUILD/$(DATE)/' \
 | ||||
| 		| 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_PATH/$(APP_PATH)/' \
 | ||||
| 		| sed 's/\$$ICON_PATH/$(ICON_PATH)/' \
 | ||||
| 		| sed 's/\$$APP_PATH/$(subst /,\/,$(APP_PATH))/' \
 | ||||
| 		| sed 's/\$$ICON_PATH/$(subst /,\/,$(ICON_PATH))/' \
 | ||||
| 		> $@ | ||||
| 
 | ||||
| 
 | ||||
| @ -699,6 +693,10 @@ $(APP_NAME).desktop: App.desktop.tpl package.json | ||||
| 	$(LESSC) $< > $@ | ||||
| 
 | ||||
| 
 | ||||
| $(APP_NAME).desktop: App.desktop | ||||
| 	mv $< $@ | ||||
| 
 | ||||
| 
 | ||||
| # XXX might be a good idea to install directly to $(BUILD_DIR) so as not 
 | ||||
| # 	to messup the current dir...
 | ||||
| # XXX need to make this arch/os specific for cross compiling...
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user