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

Makefile cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2020-09-05 07:11:24 +03:00
parent 8658298936
commit 16e4cb681b
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Viewer/Makefile
View File

@ -11,9 +11,9 @@
# - printf # - printf
# - General # - General
# - git # - git
# - nodejs / npm # - nodejs / npm / npx
# also nodejs-legacy seems to be required by some code... # also nodejs-legacy seems to be required in some
# - npm i -g electron electron-rebuild asar less (optional) # contexts...
# - wget # - wget
# - zip / unzip / zipnote # - zip / unzip / zipnote
# if zipnote fails this is likely due to a bug in # if zipnote fails this is likely due to a bug in
@ -21,6 +21,10 @@
# a patched version of 3.0... # a patched version of 3.0...
# for more info and patch see: # for more info and patch see:
# https://goo.gl/csQmQo # https://goo.gl/csQmQo
# Optional
# - npm i -g electron electron-rebuild asar less
# needed only if running global versions
# of cli's...
# - Windows # - Windows
# - MSVS -- to build native node modules (sharp) # - MSVS -- to build native node modules (sharp)
# - Linux # - Linux
@ -126,8 +130,9 @@
SHELL := $(shell which bash) SHELL := $(shell which bash)
# set path to use local tools... # set path to use local tools...
# XXX this does not affect where make is seraching for commands... # NOTE this does not affect where make is seraching for commands...
export PATH := $(shell pwd)/node_modules/.bin/:$(PATH) # XXX this breaks which when looking for egrep/fgrep...
#export PATH := $(shell pwd)/node_modules/.bin/:$(PATH)
@ -147,7 +152,7 @@ COMMIT := $(strip $(shell git rev-parse HEAD))
# less... # less...
# #
LESSC := $(shell which lessc) LESSC := npx lessc
# Electron... # Electron...
@ -162,9 +167,9 @@ LESSC := $(shell which lessc)
# procs to access their paths (as is done below) # procs to access their paths (as is done below)
# 2) set path and launch a child make -- not sure how to # 2) set path and launch a child make -- not sure how to
# do this... # do this...
ELECTRON := $(shell which electron) ELECTRON := npx electron
ELECTRON_REBUILD := $(shell which electron-rebuild) ELECTRON_REBUILD := npx electron-rebuild
ASAR := $(shell which asar) ASAR := npx asar
ELECTRON_VERSION_FALLBACK ?= v1.8.1 ELECTRON_VERSION_FALLBACK ?= v1.8.1
ELECTRON_VERSION := $(strip $(shell \ ELECTRON_VERSION := $(strip $(shell \
$(ELECTRON) -v 2> /dev/null \ $(ELECTRON) -v 2> /dev/null \
@ -301,16 +306,14 @@ INCLUDE_NW_NODE_MODULES = app-module-path
#********************************************************************** #**********************************************************************
# dependencies to check... # dependencies to check...
# #
# XXX would be nice to either auto-check for these or move them to the DEPENDENCIES_WEB = node npm npx
# respective section... DEPENDENCIES_HELP = sed grep egrep fgrep printf
#DEPENDENCIES_WEB = node npm $(LESSC)
DEPENDENCIES_WEB = node npm lessc
DEPENDENCIES_HELP = sed fgrep printf
DEPENDENCIES = $(DEPENDENCIES_WEB) \ DEPENDENCIES = $(DEPENDENCIES_WEB) \
$(DEPENDENCIES_HELP) \ $(DEPENDENCIES_HELP) \
wget zip unzip zipnote git \ wget zip unzip zipnote git
electron electron-rebuild asar # # XXX not needed with npx...
# electron electron-rebuild asar
# $(ELECTRON) $(ELECTRON_REBUILD) $(ASAR) # $(ELECTRON) $(ELECTRON_REBUILD) $(ASAR)