Reorder the files that make up mkws.js

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

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 7ce2626..c08f23c 100644 (file)
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -1,8 +1,8 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
 SRC=   ../../src
 
-HANDLEBARS_FILE = handlebars-v1.1.2.js
+HANDLEBARS_FILE = handlebars-v2.0.0.js
 JQUERY_FILE = jquery-1.10.0.min.js
 JQUERY_JSON_FILE = jquery.json-2.4.js
 PP2_FILE = pz2.js
@@ -14,23 +14,36 @@ PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};
 
 JQUERY_UI_URL =        http://code.jquery.com/ui/1.10.3/jquery-ui.js
 VERSION = $(shell tr -d '\012' < ${SRC}/VERSION)
+#HANDLEBARS=handlebars 
+HANDLEBARS=../../test/node_modules/.bin/handlebars 
+YUI_COMPRESSOR= $(shell which yui-compressor ../../test/bin/yui-compressor | head -1)
 
 COMPONENTS = ${SRC}/mkws-handlebars.js \
-       ${SRC}/mkws-core.js ${SRC}/mkws-team.js ${SRC}/mkws-filter.js \
-       ${SRC}/mkws-widget.js ${SRC}/mkws-widget-main.js ${SRC}/mkws-widget-termlists.js \
-       ${SRC}/mkws-widget-authname.js ${SRC}/mkws-widget-categories.js ${SRC}/mkws-widget-log.js \
-       ${SRC}/mkws-widget-record.js ${SRC}/mkws-widget-reference.js ${SRC}/mkws-widget-builder.js
+       ${SRC}/mkws-core.js \
+       ${SRC}/mkws-team.js \
+       ${SRC}/mkws-filter.js \
+       ${SRC}/mkws-widget.js \
+       ${SRC}/mkws-widget-main.js \
+       ${SRC}/mkws-widget-termlists.js \
+       ${SRC}/mkws-widget-authname.js \
+       ${SRC}/mkws-widget-categories.js \
+       ${SRC}/mkws-widget-log.js \
+       ${SRC}/mkws-widget-record.js \
+       ${SRC}/mkws-widget-reference.js \
+       ${SRC}/mkws-widget-builder.js \
+       ${SRC}/mkws-templates.js \
+       ${SRC}/mkws-popup.js
 
 GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
-       mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
+       mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js ${SRC}/mkws-templates.js
 
 **make-default**: all
 
 all: mkws.min.js mkws-complete.min.js
 
-mkws-js mkws-complete.js: Makefile mkws.js ${SRC}/mkws-jquery.js ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
+mkws-js mkws-complete.js: Makefile mkws.js ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
        ( set -e; \
-         echo "/*! Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com"; \
+         echo "/*! Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com"; \
          echo "   Licence: GPL, http://www.indexdata.com/licences/gpl"; \
          echo "   created at: $$(date)"; \
          echo "   MKWS GIT id: $$(git show | head -n 1 | perl -npe 's,\S+\s+,,')"; \
@@ -42,16 +55,15 @@ mkws-js mkws-complete.js: Makefile mkws.js ${SRC}/mkws-jquery.js ${HANDLEBARS_FI
          cat ${HANDLEBARS_FILE}; \
          cat ${PP2_FILE}; \
          cat  mkws.js; \
-         cat  ${SRC}/mkws-jquery.js; \
        ) > mkws-complete.js.tmp
        mv -f mkws-complete.js.tmp mkws-complete.js
 
 %.min.js: %.js
-       yui-compressor $? > $@.tmp
+       ${YUI_COMPRESSOR} $? > $@.tmp
        mv -f $@.tmp $@
 
 mkws-syntax-check:
-       yui-compressor mkws.js >/dev/null
+       ${YUI_COMPRESSOR} mkws.js >/dev/null
 
 ${HANDLEBARS_FILE}:
        curl -sSf ${HANDLEBARS_URL} -o $@.tmp
@@ -87,9 +99,13 @@ mkws.js: $(COMPONENTS) Makefile
        mv -f $@.tmp $@
        chmod 444 $@
 
+${SRC}/mkws-templates.js: ${SRC}/*.templates/*.handlebars
+       ${HANDLEBARS} -n mkws.defaultTemplates ${SRC}/*.templates/*.handlebars -f $@.tmp
+       mv -f $@.tmp $@
+
 mkws-html-includes: 
        echo $(COMPONENTS) | perl -npe "s,${SRC},,g; s/\s+/\0/g" | \
-         perl -n0e 'print qq{    <script type="text/javascript" src="src$$_"></script>\n}'
+         perl -n0e 'chomp(); print qq{    <script type="text/javascript" src="src$$_"></script>\n}'
 
 distclean: clean
        @echo "(No need for distclean, 'make clean' is fine)"