X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=7b4fbe2129aeb5de4149be9747ac557244ed2790;hb=53319f6a7c43dd4291c3b80fed561060d35e6f72;hp=ef73fd955e1c7486d8ee4b00c02aa99fce727885;hpb=8bf17991772771d7ae007d18bb4075f197b86585;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index ef73fd9..7b4fbe2 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -13,55 +13,93 @@ 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 $@
+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
+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
 
-**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: 
+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}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_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 ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new 
+	( echo "/*! Copyright (c) 2013 IndexData ApS. http://indexdata.com"; \
+	  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 "*/"; \
+	  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)
+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 $@
+
+${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 $@
+
+${HANDLEBARS_FILE}:
+	curl -sSf ${HANDLEBARS_URL} -o $@
+
+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 -->
 
+# 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 --toc -c mkws-doc.css $< | sed '/^<col width="[0-9]*%" \/>$//d' > $@
@@ -72,8 +110,29 @@ 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
+	rm -f *.orig *.bak *.rej
+
+clean:
+	rm -f ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_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 ""
+	@echo "make JQUERY_URL=http://code.jquery.com/jquery-2.0.3.min.js clean mkws-js"
+	@echo ""
+	@echo "Please check ./README file too!"