use make variables whenever possible for external JS libs

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

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 1c63a7c..de82dcb 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -13,12 +13,19 @@ JQUERY_URL= http://code.jquery.com/jquery-1.10.0.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.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 $@
 
 MKWS_JS=       mkws-complete.js
-PZ2API_JS=     ../../../libjs-pz2/pz2api.1.js
-PZ2API_GIT=    ssh://git.indexdata.com:222/home/git/pub/libjs-pz2
+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})
+##############################
 
 DOCS = README.html README.odt README.pdf \
        whitepaper.html whitepaper.odt whitepaper.pdf
@@ -29,34 +36,43 @@ all: ${MKWS_JS} $(DOCS)
 
 docs: $(DOCS)
 
-pz2api-git-checkout: 
+pz2api-git-checkout:
        @if ! test -e ${PZ2API_JS}; then \
-           ( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \
+           ( cd ../../.. && git clone ${PZ2API_GIT} ); \
        fi
 
-mkws-js ${MKWS_JS}: ${PZ2API_JS} mkws.js
+mkws-js ${MKWS_JS}: 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 "Please run: make pz2api-git-checkout"; \
+           echo ""; \
+           echo "Please run:"; \
+           echo "$$ make pz2api-git-checkout"; \
+           echo ""; \
            exit 1; \
        fi
        ( echo "/* created at: $$(date)"; \
-         echo "   mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,') */"; \
-         curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \
-         cat ${PZ2API_JS} mkws.js ) > ${MKWS_JS}.new 
+         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 "*/"; \
+         cat ${JQUERY_FILE}; \
+         cat ${JQUERY_JSON_FILE}; \
+         cat ${HANDLEBARS_FILE}; \
+         cat ${PZ2API_JS}; \
+         cat  mkws.js; \
+       ) > ${MKWS_JS}.new
        mv -f ${MKWS_JS}.new ${MKWS_JS}
 
-distclean: clean
-clean:
-       rm -f ${MKWS_JS} $(DOCS)
+${JQUERY_JSON_FILE}:
+       curl -sSf ${JQUERY_JSON_URL} -o $@
 
-help:
-       @echo "make [ help | mkws-js | docs | clean ]"
-       @echo ""
-       @echo "make JQUERY_URL=http://code.jquery.com/jquery-2.0.3.min.js clean mkws-js"
-       @echo ""
-       @echo "Please check ./README file too!"
+${JQUERY_FILE}:
+       curl -sSf ${JQUERY_URL} -o $@.new
+       perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
+       rm -f $@.new
+
+${HANDLEBARS_FILE}:
+       curl -sSf ${HANDLEBARS_URL} -o $@
 
 
 # For a description of pandoc's markdown format, see:
@@ -75,8 +91,25 @@ help:
        pandoc --standalone $< -o $@
        chmod ugo-w $@
 
+# ### In order to compile the whitepaper, which has tables, to PDF,
+# you will need to install the Debian package
+#      texlive-latex-recommended
 %.pdf: %.markdown
        rm -f $@
        pandoc --standalone $< -o $@
        chmod ugo-w $@
 
+##############################
+# helper targets
+#
+distclean: clean
+clean:
+       rm -f ${MKWS_JS} ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
+       rm -f $(DOCS)
+
+help:
+       @echo "make [ help | mkws-js | docs | clean ]"
+       @echo ""
+       @echo "make JQUERY_URL=http://code.jquery.com/jquery-2.0.3.min.js clean mkws-js"
+       @echo ""
+       @echo "Please check ./README file too!"