X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=a50c05fbc40f4726cb69a5d9dfbf32741d86a58e;hb=300831588b9d63572ea780444f3d38a455255302;hp=e4f8d8daf06a6538b1bb969194b188f8c94686e7;hpb=9a8d2d32dbcc26da7e7a3054ff9801d22ccba51c;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index e4f8d8d..a50c05f 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -17,8 +17,11 @@ 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
+MKWS_JS_MIN=	mkws-complete.min.js
+JSMIN=		yui-compressor
 PZ2API_JS=	../../../pazpar2/js/pz2.js
 PZ2API_GIT=	ssh://git.indexdata.com:222/home/git/pub/pazpar2
 
@@ -41,7 +44,7 @@ pz2api-git-checkout:
 	    ( cd ../../.. && git clone ${PZ2API_GIT} ); \
 	fi
 
-mkws-js ${MKWS_JS}: mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
+mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_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?"; \
@@ -64,6 +67,10 @@ mkws-js ${MKWS_JS}: mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE
 	) > ${MKWS_JS}.new
 	mv -f ${MKWS_JS}.new ${MKWS_JS}
 
+mkws-js-min ${MKWS_JS_MIN}: ${MKWS_JS}
+	${JSMIN} ${MKWS_JS} > ${MKWS_JS_MIN} > ${MKWS_JS_MIN}.new
+	mv -f ${MKWS_JS_MIN}.new ${MKWS_JS_MIN}
+
 ${JQUERY_JSON_FILE}:
 	curl -sSf ${JQUERY_JSON_URL} -o $@
 
@@ -75,6 +82,15 @@ ${JQUERY_FILE}:
 ${HANDLEBARS_FILE}:
 	curl -sSf ${HANDLEBARS_URL} -o $@
 
+release: mkws.js mkws-complete.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-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 -->
@@ -104,12 +120,16 @@ ${HANDLEBARS_FILE}:
 # helper targets
 #
 distclean: clean
+	rm -f *.orig *.bak *.rej
+
 clean:
-	rm -f ${MKWS_JS} ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
+	rm -f ${MKWS_JS} ${MKWS_JS_MIN}
+	rm -f ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
 	rm -f $(DOCS)
 
 help:
-	@echo "make [ help | mkws-js | docs | clean ]"
+	@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 ""