redrawNavi was a one-line function invoked in only one place.

[mkws-moved-to-github.git] / tools / htdocs / Makefile

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 15e96b6..bcb753d 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -1,5 +1,5 @@
 ######################################################################
-# Copyright (c) 2013 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
 #
 
 ##############################
@@ -10,59 +10,44 @@ JQUERY_URL= http://code.jquery.com/jquery-1.10.0.min.js
 #JQUERY_URL=   http://code.jquery.com/jquery-1.9.1.min.js
 #JQUERY_URL=   http://code.jquery.com/jquery-1.8.3.min.js
 #JQUERY_URL=   http://code.jquery.com/jquery-1.7.2.min.js
-#JQUERY_URL=   http://code.jquery.com/jquery-1.6.4.min.js
-#JQUERY_URL=   http://code.jquery.com/jquery-1.4.4.min.js
 
 JQUERY_UI_URL= http://code.jquery.com/ui/1.10.3/jquery-ui.js
 #JQUERY_UI_URL=        http://code.jquery.com/ui/1.8.0/jquery-ui.min.js
 JQUERY_JSON_URL= https://jquery-json.googlecode.com/files/jquery.json-2.4.js
-HANDLEBARS_URL=        http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js -o $@
+HANDLEBARS_URL=        http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js
+PP2_URL=       http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/pz2.js;hb=HEAD
 VERSION = $(shell tr -d '\012' < VERSION)
 
 MKWS_JS=       mkws-complete.js
-JSMIN=         yui-compressor
-PZ2API_JS=     ../../../pazpar2/js/pz2.js
-PZ2API_GIT=    ssh://git.indexdata.com:222/home/git/pub/pazpar2
 
 JQUERY_FILE := $(shell basename ${JQUERY_URL})
 JQUERY_JSON_FILE := $(shell basename ${JQUERY_JSON_URL})
 HANDLEBARS_FILE := $(shell basename ${HANDLEBARS_URL})
+PP2_FILE = pz2.js
 ##############################
 
 DOCS = README.html README.odt README.pdf \
        whitepaper.html whitepaper.odt whitepaper.pdf
 
 # Default rule when "make" is invoked without a target
-**default**: ${MKWS_JS} README.html whitepaper.html
+**default**: ${MKWS_JS} mkws-js-min README.html whitepaper.html
 
-all: ${MKWS_JS} $(DOCS)
+all: ${MKWS_JS} mkws-js-min $(DOCS)
 
 docs: $(DOCS)
 
-pz2api-git-checkout:
-       @if ! test -e ${PZ2API_JS}; then \
-           ( cd ../../.. && git clone ${PZ2API_GIT} ); \
-       fi
-
-mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
-       @if ! test -e ${PZ2API_JS}; then \
-           echo "The pazpar2 JS file ${PZ2API_JS} does not exists."; \
-           echo "Did you checked out the source from the git repo?"; \
-           echo ""; \
-           echo "Please run:"; \
-           echo "$$ make pz2api-git-checkout"; \
-           echo ""; \
-           exit 1; \
-       fi
-       ( echo "/* Copyright (c) 2013 IndexData ApS. http://indexdata.com"; \
+mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE}
+       ( set -e; \
+         echo "/*! Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com"; \
+         echo "   Licence: GPL, http://www.indexdata.com/licences/gpl"; \
          echo "   created at: $$(date)"; \
          echo "   mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,')"; \
-         echo "   $$(basename ${PZ2API_JS}) GIT id: $$(cd $$(dirname ${PZ2API_JS}) && git log $$(basename ${PZ2API_JS}) | head -n 1 | perl -npe 's,\S+\s+,,')"; \
+         echo "   pz2.js GIT id: $$(curl -sSf 'http://git.indexdata.com/?p=pazpar2.git;a=rss' | egrep '<guid' | head -1 | perl -ne 'print "$$1\n" if m,.*=([0-9a-f]+)</guid>,')"; \
          echo "*/"; \
          cat ${JQUERY_FILE}; \
          cat ${JQUERY_JSON_FILE}; \
          cat ${HANDLEBARS_FILE}; \
-         cat ${PZ2API_JS}; \
+         cat ${PP2_FILE}; \
          cat  mkws.js; \
        ) > ${MKWS_JS}.new
        mv -f ${MKWS_JS}.new ${MKWS_JS}
@@ -70,21 +55,32 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLE
 mkws-js-min: mkws.min.js mkws-complete.min.js
 
 %.min.js: %.js
-       ${JSMIN} $? > $@.new
+       yui-compressor $? > $@.new
        mv -f $@.new $@
 
-${JQUERY_JSON_FILE}:
-       curl -sSf ${JQUERY_JSON_URL} -o $@
+mkws-syntax-check:
+       yui-compressor mkws.js >/dev/null
+
+mkws-complete-syntax-check: mkws-js-min
 
 ${JQUERY_FILE}:
        curl -sSf ${JQUERY_URL} -o $@.new
        perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
        rm -f $@.new
 
+${JQUERY_JSON_FILE}:
+       curl -sSf ${JQUERY_JSON_URL} -o $@.tmp
+       mv -f $@.tmp $@
+
 ${HANDLEBARS_FILE}:
-       curl -sSf ${HANDLEBARS_URL} -o $@
+       curl -sSf ${HANDLEBARS_URL} -o $@.tmp
+       mv -f $@.tmp $@
+
+${PP2_FILE}:
+       curl -sSf "${PP2_URL}" -o $@.tmp
+       mv -f $@.tmp $@
 
-release: mkws.js mkws-complete.js mkws-complete.min.js
+release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
        @if [ -f releases/mkws-$(VERSION).js ]; then \
                echo "*** There is already a release $(VERSION)"; \
        else \
@@ -126,13 +122,14 @@ distclean: clean
        rm -f *.orig *.bak *.rej
 
 clean:
+       rm -f ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE}
        rm -f mkws.min.js ${MKWS_JS} mkws-complete.min.js
-       rm -f ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
        rm -f $(DOCS)
 
 help:
        @echo "make [ help | docs | clean ]"
        @echo "     [ mkws-js | mkws-js-min ]"
+       @echo "     [ mkws-syntax-check | mkws-complete-syntax-check ]"
        @echo ""
        @echo "make JQUERY_URL=http://code.jquery.com/jquery-2.0.3.min.js clean mkws-js"
        @echo ""