From: Mike Taylor <mike@indexdata.com>
Date: Thu, 22 Aug 2013 09:54:04 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 0.9.1~236
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=746e8f14d495650b28247fbb31c23e2b7306dba3;hp=b663e846cb3abf9bdc18bdfe5c9485c23b55ac55;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

diff --git a/Makefile b/Makefile
index 1be877d..1b1fe3b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,12 @@
+# Copyright (c) 2013 IndexData ApS. http://indexdata.com
+
 **default**:
 	(cd tools/htdocs; $(MAKE))
+
+clean distclean all pz2api-git-checkout:
+	${MAKE} -C./tools/htdocs $@
+
+check: distclean all
+
+help:
+	@echo "make [ all | clean | pz2api-git-checkout ]"
diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index e425e55..bf8af85 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -2,6 +2,9 @@
 # Copyright (c) 2013 IndexData ApS. http://indexdata.com
 #
 
+##############################
+# select a jquery version
+#
 #JQUERY_URL=	http://code.jquery.com/jquery-2.0.3.min.js
 JQUERY_URL=	http://code.jquery.com/jquery-1.10.0.min.js
 #JQUERY_URL=	http://code.jquery.com/jquery-1.9.1.min.js
@@ -14,17 +17,35 @@ 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
 
 MKWS_JS=	mkws-complete.js
+PZ2API_JS=	../../../libjs-pz2/pz2api.1.js
+PZ2API_GIT=	ssh://git.indexdata.com:222/home/git/pub/libjs-pz2
+
 DOCS = README.html README.odt README.pdf \
        whitepaper.html whitepaper.odt whitepaper.pdf
+
 **default**: ${MKWS_JS} README.html whitepaper.html
+
 all: ${MKWS_JS} $(DOCS)
 
 docs: $(DOCS)
 
-mkws-js ${MKWS_JS}: ../../../libjs-pz2/pz2api.1.js mkws.js
+pz2api-check: 
+	@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
+
+pz2api-git-checkout: 
+	@if ! test -e ${PZ2API_JS}; then \
+	    ( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \
+	fi
+
+mkws-js ${MKWS_JS}: pz2api-check ${PZ2API_JS} mkws.js
 	( 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}; \
+	  curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \
 	  cat ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new 
 	mv -f ${MKWS_JS}.new ${MKWS_JS}