X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=68278ad6ece744225548559c4365dff7b96609c9;hb=fd6e798f994723a1c9abd84a374fb6a6d29e06d0;hp=15e96b6a9a367bd476f31f513224a142f8d9e9e8;hpb=610a9fba99c37f220a5ba1d2c0147c5e02d3f08a;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 15e96b6..68278ad 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
 #
 
 ##############################
@@ -20,22 +20,22 @@ HANDLEBARS_URL=	http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.
 VERSION = $(shell tr -d '\012' < VERSION)
 
 MKWS_JS=	mkws-complete.js
-JSMIN=		yui-compressor
 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})
+PP2_FILE := $(shell basename ${PZ2API_JS})
 ##############################
 
 DOCS = README.html README.odt README.pdf \
        whitepaper.html whitepaper.odt whitepaper.pdf
 
 # Default rule when "make" is invoked without a target
-**default**: ${MKWS_JS} README.html whitepaper.html
+**default**: ${MKWS_JS} mkws-js-min README.html whitepaper.html
 
-all: ${MKWS_JS} $(DOCS)
+all: ${MKWS_JS} mkws-js-min $(DOCS)
 
 docs: $(DOCS)
 
@@ -44,7 +44,7 @@ pz2api-git-checkout:
 	    ( cd ../../.. && git clone ${PZ2API_GIT} ); \
 	fi
 
-mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
+mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_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?"; \
@@ -54,7 +54,9 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLE
 	    echo ""; \
 	    exit 1; \
 	fi
-	( echo "/* Copyright (c) 2013 IndexData ApS. http://indexdata.com"; \
+	( 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 "   $$(basename ${PZ2API_JS}) GIT id: $$(cd $$(dirname ${PZ2API_JS}) && git log $$(basename ${PZ2API_JS}) | head -n 1 | perl -npe 's,\S+\s+,,')"; \
@@ -62,7 +64,7 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLE
 	  cat ${JQUERY_FILE}; \
 	  cat ${JQUERY_JSON_FILE}; \
 	  cat ${HANDLEBARS_FILE}; \
-	  cat ${PZ2API_JS}; \
+	  cat ${PP2_FILE}; \
 	  cat  mkws.js; \
 	) > ${MKWS_JS}.new
 	mv -f ${MKWS_JS}.new ${MKWS_JS}
@@ -70,21 +72,29 @@ mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLE
 mkws-js-min: mkws.min.js mkws-complete.min.js
 
 %.min.js: %.js
-	${JSMIN} $? > $@.new
+	yui-compressor $? > $@.new
 	mv -f $@.new $@
 
-${JQUERY_JSON_FILE}:
-	curl -sSf ${JQUERY_JSON_URL} -o $@
+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 $@
+
 ${HANDLEBARS_FILE}:
 	curl -sSf ${HANDLEBARS_URL} -o $@
 
-release: mkws.js mkws-complete.js mkws-complete.min.js
+${PP2_FILE}: ${PZ2API_JS}
+	cp -pf ${PZ2API_JS} $@ 	
+
+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 \
@@ -126,13 +136,14 @@ 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 ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
 	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 ""