X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=71da3ee9725c48468a859bd7e1b68c9b1b86b1cb;hp=6fe1b652be30256d8a90272f9309bc7bbb464c2c;hb=3b37b7798cab326907f2e48223371ff1737b94fb;hpb=bd03de87229af32491ec02a37bd76febeca9a606

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 6fe1b65..71da3ee 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -2,7 +2,7 @@
 
 SRC=   ../../src
 
-HANDLEBARS_FILE = handlebars-v1.1.2.js
+HANDLEBARS_FILE = handlebars-v1.3.0.js
 JQUERY_FILE = jquery-1.10.0.min.js
 JQUERY_JSON_FILE = jquery.json-2.4.js
 PP2_FILE = pz2.js
@@ -14,11 +14,16 @@ 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-templates.js \
+	${SRC}/mkws-popup.js \
 	${SRC}/mkws-widget.js \
 	${SRC}/mkws-widget-main.js \
 	${SRC}/mkws-widget-termlists.js \
@@ -30,13 +35,13 @@ COMPONENTS = ${SRC}/mkws-handlebars.js \
 	${SRC}/mkws-widget-builder.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 "   Licence: GPL, http://www.indexdata.com/licences/gpl"; \
@@ -50,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
@@ -95,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)"