Add rules to fetch and install JSNlog.

[mkws-moved-to-github.git] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index b61d34c..1a1a409 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,16 +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
-YUI_COMPRESSOR = $(shell which yui-compressor ../../test/bin/yui-compressor | head -1)
+UGLIFYJS = ../test/node_modules/.bin/uglifyjs
 
 COMPONENTS = mkws-handlebars.js \
        mkws-core.js \
@@ -22,7 +24,7 @@ COMPONENTS = mkws-handlebars.js \
        mkws-filter.js \
        mkws-widget.js \
        mkws-widget-main.js \
-       mkws-widget-termlists.js \
+       mkws-widget-facets.js \
        mkws-widget-authname.js \
        mkws-widget-categories.js \
        mkws-widget-log.js \
@@ -32,9 +34,9 @@ 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) mkws-jquery.js
+AVAILABLE = $(DOWNLOADABLE) $(RELEASABLE) NEWS VERSION
 INSTALLED_DOWNLOADABLE = $(DOWNLOADABLE:%=$(DEST)/%)
 INSTALLED_RELEASABLE = $(RELEASABLE:%=$(DEST)/%)
 INSTALLED = $(AVAILABLE:%=$(DEST)/%)
@@ -51,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}; \
@@ -59,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}:
@@ -75,23 +78,33 @@ $(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 $@
 
-$(DEST)/%: %
+$(DEST)/NEWS: NEWS
+       rm -f $@
+       cp $? $@
+       chmod 444 $@
+
+$(DEST)/VERSION: VERSION
        rm -f $@
        cp $? $@
        chmod 444 $@
 
-release: $(RELEASABLE)
-       @if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \
+release: $(INSTALLED_RELEASABLE)
+       if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \
                echo "*** There is already a release $(VERSION)"; \
        else \
                cp -p $(DEST)/mkws.js ${DEST}/releases/mkws-$(VERSION).js; \
                cp -p $(DEST)/mkws.min.js ${DEST}/releases/mkws-$(VERSION).min.js; \
                cp -p $(DEST)/mkws-complete.js ${DEST}/releases/mkws-complete-$(VERSION).js; \
                cp -p $(DEST)/mkws-complete.min.js ${DEST}/releases/mkws-complete-$(VERSION).min.js; \
+               cp -p $(DEST)/mkws.css ${DEST}/releases/mkws-$(VERSION).css; \
                echo "Made release $(VERSION)"; \
        fi
 
@@ -100,13 +113,13 @@ $(DEST)/mkws.js: $(COMPONENTS) Makefile
        mv -f $@.tmp $@
        chmod 444 $@
 
-mkws-templates.js: *.templates/*.handlebars
-       ${HANDLEBARS} -n mkws.defaultTemplates *.templates/*.handlebars -f $@.tmp
+mkws-templates.js: templates/*.handlebars
+       ${HANDLEBARS} -n mkws.defaultTemplates templates/*.handlebars -f $@.tmp
        mv -f $@.tmp $@
 
 # 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:
@@ -114,5 +127,10 @@ html-includes:
          perl -n0e 'chomp(); print qq{    <script type="text/javascript" src="src/$$_"></script>\n}'
 
 clean distclean:
-       rm -f ${INSTALLED}
+       rm -f ${INSTALLED} mkws-templates.js
 
+help:
+       @echo "make [ all | clean | release ]"
+       @echo "     [ syntax-check | html-includes ]"
+       @echo "     [ mkws-templates.js | $(DEST)/mkws-complete.min.js ]"
+       @echo ""