X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile;h=1a1a4098d9065825bb2269f7280c2764c06da2ed;hp=bed0fb14ef58b8e8e7d472d93d99edf3361a941e;hb=347c7604b5dc3270ee6ba7b47f982384dc9b7297;hpb=1dfb625168e68050741445453bc5f1c84819c040

diff --git a/src/Makefile b/src/Makefile
index bed0fb1..1a1a409 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,15 +5,18 @@ DEST = ../tools/htdocs
 HANDLEBARS_FILE = handlebars-v2.0.0.js
 JQUERY_FILE = jquery-1.10.0.min.js
 JQUERY_JSON_FILE = jquery.json-2.4.js
+JSNLOG_FILE = jsnlog.min.js
 PP2_FILE = pz2.js
 
 HANDLEBARS_URL = http://builds.handlebarsjs.com.s3.amazonaws.com/${HANDLEBARS_FILE}
 JQUERY_URL = http://code.jquery.com/${JQUERY_FILE}
 JQUERY_JSON_URL = https://jquery-json.googlecode.com/files/${JQUERY_JSON_FILE}
+JSNLOG_URL = https://raw.githubusercontent.com/mperdeck/jsnlog.js/2.7.5/${JSNLOG_FILE}
 PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};hb=HEAD
 
 VERSION = $(shell tr -d '\012' < VERSION)
 HANDLEBARS = ../test/node_modules/.bin/handlebars
+UGLIFYJS = ../test/node_modules/.bin/uglifyjs
 
 COMPONENTS = mkws-handlebars.js \
 	mkws-core.js \
@@ -31,7 +34,7 @@ COMPONENTS = mkws-handlebars.js \
 	mkws-templates.js \
 	mkws-popup.js
 
-DOWNLOADABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
+DOWNLOADABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${JSNLOG_FILE} ${PP2_FILE}
 RELEASABLE = mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
 AVAILABLE = $(DOWNLOADABLE) $(RELEASABLE) NEWS VERSION
 INSTALLED_DOWNLOADABLE = $(DOWNLOADABLE:%=$(DEST)/%)
@@ -50,6 +53,7 @@ $(DEST)/mkws-complete.js: Makefile $(INSTALLED_DOWNLOADABLE) $(DEST)/mkws.js
 	  echo "*/"; \
 	  cat $(DEST)/${JQUERY_FILE}; \
 	  cat $(DEST)/${JQUERY_JSON_FILE}; \
+	  cat $(DEST)/${JSNLOG_FILE}; \
 	  echo 'mkws_jQuery = jQuery.noConflict(true);'; \
 	  cat $(DEST)/${HANDLEBARS_FILE}; \
 	  cat $(DEST)/${PP2_FILE}; \
@@ -58,7 +62,7 @@ $(DEST)/mkws-complete.js: Makefile $(INSTALLED_DOWNLOADABLE) $(DEST)/mkws.js
 	mv -f $@.tmp $@
 
 %.min.js: %.js
-	yui-compressor $? > $@.tmp
+	${UGLIFYJS} $? > $@.tmp
 	mv -f $@.tmp $@
 
 $(DEST)/${HANDLEBARS_FILE}:
@@ -74,6 +78,10 @@ $(DEST)/${JQUERY_JSON_FILE}:
 	curl -sSf ${JQUERY_JSON_URL} -o $@.tmp
 	mv -f $@.tmp $@
 
+$(DEST)/${JSNLOG_FILE}:
+	curl -sSf ${JSNLOG_URL} -o $@.tmp
+	mv -f $@.tmp $@
+
 $(DEST)/${PP2_FILE}:
 	curl -sSf "${PP2_URL}" -o $@.tmp
 	mv -f $@.tmp $@
@@ -89,9 +97,6 @@ $(DEST)/VERSION: VERSION
 	chmod 444 $@
 
 release: $(INSTALLED_RELEASABLE)
-	@if ! which yui-compressor >/dev/null; then \
-		echo "*** please install the yui-compressor program"; exit 1; \
-	fi
 	if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \
 		echo "*** There is already a release $(VERSION)"; \
 	else \
@@ -114,7 +119,7 @@ mkws-templates.js: templates/*.handlebars
 
 # Checks that the JavaScript can be parsed
 syntax-check: $(DEST)/mkws.js
-	yui-compressor $(DEST)/mkws.js >/dev/null
+	${UGLIFYJS} $(DEST)/mkws.js >/dev/null
 
 # Emits a list of <script> elements to include in HTML applications
 html-includes: