release depends on mkws.min.js

[mkws-moved-to-github.git] / tools / htdocs / Makefile

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 0276b27..7b4fbe2 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -20,7 +20,6 @@ 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
 
@@ -32,9 +31,10 @@ 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)
 
@@ -43,7 +43,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}
        @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?"; \
@@ -53,7 +53,7 @@ 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"; \
+       ( 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+,,')"; \
@@ -69,25 +69,26 @@ 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 $@
-
 ${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
+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)"; \
@@ -124,8 +125,8 @@ distclean: clean
        rm -f *.orig *.bak *.rej
 
 clean:
-       rm -f ${MKWS_JS} mkws-complete.min.js
-       rm -f ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
+       rm -f ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE}
+       rm -f mkws.min.js ${MKWS_JS} mkws-complete.min.js
        rm -f $(DOCS)
 
 help: