X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=13a0e5c0b07fb5ed23c668a55d7c9c28065d82f4;hb=c1c29a901cf03544229fbfa299b638af65097654;hp=b0cfa2476018822b113de6667685a3042f5074aa;hpb=6e1edd743e5693aa1596b413dcc26ba21441dd4f;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index b0cfa24..13a0e5c 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -17,8 +17,9 @@ 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
+PZ2API_JS=	../../../pazpar2/js/pz2.js
+PZ2API_GIT=	ssh://git.indexdata.com:222/home/git/pub/pazpar2
+##############################
 
 DOCS = README.html README.odt README.pdf \
        whitepaper.html whitepaper.odt whitepaper.pdf
@@ -29,44 +30,44 @@ all: ${MKWS_JS} $(DOCS)
 
 docs: $(DOCS)
 
-pz2api-check: 
+pz2api-git-checkout: 
 	@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; \
+	    ( cd ../../.. && git clone ${PZ2API_GIT} ); \
 	fi
 
-pz2api-git-checkout: 
+mkws-js ${MKWS_JS}: mkws.js handlebars-v1.1.2.js
 	@if ! test -e ${PZ2API_JS}; then \
-	    ( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \
+	    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
-
-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}; \
-	  cat ../../../libjs-pz2/pz2api.1.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 "*/"; \
+	  curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \
+	  cat handlebars-v1.1.2.js; \
+	  cat ${PZ2API_JS}; \
+	  cat  mkws.js ) > ${MKWS_JS}.new 
 	mv -f ${MKWS_JS}.new ${MKWS_JS}
 
-distclean: clean
-clean:
-	rm -f ${MKWS_JS} $(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!"
+handlebars-v1.1.2.js:
+	curl -sSf http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js -o $@
 
 
 # For a description of pandoc's markdown format, see:
 # http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html -->
 
+# for older pandoc (<1.9) run first:
+# perl -i.bak -npe 's/"(Authors|Subjects)": "(.*?)"/"$1": "test"/' tools/htdocs/whitepaper.markdown
+#
 %.html: %.markdown
 	rm -f $@
-	pandoc --standalone -c mkws-doc.css $< -o $@
+	pandoc --standalone --toc -c mkws-doc.css $< | sed '/^<col width="[0-9]*%" \/>$//d' > $@
 	chmod ugo-w $@
 
 %.odt: %.markdown
@@ -74,8 +75,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} $(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!"
+