X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=bcb753d2ec1d485160726ad780d4b53f317b53d4;hp=8ad95ce0fa800ed0c274b9e913c62ad57f5827c3;hb=2681321da7a6c02655b92fc46832c5d80f90e6c1;hpb=89ec0e8996953b33b1c5bd879f2c6d33a696c179

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 8ad95ce..bcb753d 100644
--- 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,54 +10,86 @@ 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.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
+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
-PZ2API_JS=	../../../libjs-pz2/pz2api.1.js
-PZ2API_GIT=	ssh://git.indexdata.com:222/home/git/pub/libjs-pz2
+
+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**: ${MKWS_JS} README.html whitepaper.html
+# Default rule when "make" is invoked without a target
+**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 $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \
-	fi
-
-mkws-js ${MKWS_JS}: mkws.js
-	@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"; \
-	    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 
+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 "   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 ${PP2_FILE}; \
+	  cat  mkws.js; \
+	) > ${MKWS_JS}.new
 	mv -f ${MKWS_JS}.new ${MKWS_JS}
 
-distclean: clean
-clean:
-	rm -f ${MKWS_JS} $(DOCS)
+mkws-js-min: mkws.min.js mkws-complete.min.js
 
-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!"
+%.min.js: %.js
+	yui-compressor $? > $@.new
+	mv -f $@.new $@
+
+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 $@.tmp
+	mv -f $@.tmp $@
+
+${PP2_FILE}:
+	curl -sSf "${PP2_URL}" -o $@.tmp
+	mv -f $@.tmp $@
+
+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 \
+		cp -p mkws.js releases/mkws-$(VERSION).js; \
+		cp -p mkws.min.js releases/mkws-$(VERSION).min.js; \
+		cp -p mkws-complete.js releases/mkws-complete-$(VERSION).js; \
+		cp -p mkws-complete.min.js releases/mkws-complete-$(VERSION).min.js; \
+		echo "Made release $(VERSION)"; \
+	fi
 
 # For a description of pandoc's markdown format, see:
 # http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html -->
@@ -83,3 +115,22 @@ help:
 	pandoc --standalone $< -o $@
 	chmod ugo-w $@
 
+##############################
+# helper targets
+#
+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 $(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 ""
+	@echo "Please check ./README file too!"