From c5fe87b13ffb4811a4aa04f5c3f9051a4fe06b26 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Wed, 12 Dec 2018 16:53:20 +0000 Subject: [PATCH] js.mk: Try in-tree closure compiler first as JS_MINIFY_EXE Signed-off-by: Jan Lindemann --- make/js.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/make/js.mk b/make/js.mk index 028ccad4..d3712281 100644 --- a/make/js.mk +++ b/make/js.mk @@ -7,7 +7,10 @@ JS_EXTERNS_DIRS ?= /opt/closure-compiler/share/externs JS_EXTERNS ?= $(sort $(JS_EXTRA_EXTERNS) jquery-3.3.js) 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_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) # This is not nice. It requires install-files to be included from elsewhere,