janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

js.mk: Try in-tree closure compiler first as JS_MINIFY_EXE

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-12-12 16:53:20 +00:00
commit c5fe87b13f
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/js.mk
View file

@ -7,7 +7,10 @@ JS_EXTERNS_DIRS ?= /opt/closure-compiler/share/externs
JS_EXTERNS ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js) JS_EXTERNS ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js)
JS_EXTERN_PATHS ?= $(wildcard $(foreach d,$(JS_EXTERNS_DIRS),$(addprefix $d/,$(JS_EXTERNS)))) JS_EXTERN_PATHS ?= $(wildcard $(foreach d,$(JS_EXTERNS_DIRS),$(addprefix $d/,$(JS_EXTERNS))))
JS_MINIFY_OPTS ?= $(addprefix --externs ,$(JS_EXTERN_PATHS)) --compilation_level ADVANCED --strict_mode_input JS_MINIFY_OPTS ?= $(addprefix --externs ,$(JS_EXTERN_PATHS)) --compilation_level ADVANCED --strict_mode_input
JS_MINIFY_EXE ?= $(JAVA) -jar /usr/share/java/closure-compiler.jar JS_MINIFY_EXE ?= $(JAVA) -jar $(firstword $(wildcard \
$(CVS_PROJ_DIR)/closure-compiler/contrib/closure-compiler/install-root/usr/share/java/closure-compiler.jar \
/usr/share/java/closure-compiler.jar \
))
JS_MINIFY ?= $(JS_MINIFY_EXE) $(JS_MINIFY_OPTS) JS_MINIFY ?= $(JS_MINIFY_EXE) $(JS_MINIFY_OPTS)
# This is not nice. It requires install-files to be included from elsewhere, # This is not nice. It requires install-files to be included from elsewhere,