X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=c08f23c909749fa3c03bc44bf6900c05484982b9;hp=22e4d7cb14ba2bd0c7191265b8f971d1f1ae18b2;hb=7ba0c87bfd4a2ccf30fec0562b8ceeb1b2aaeaf9;hpb=62d9f6628a30dc7540071108473b0ea94e58a39e

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 22e4d7c..c08f23c 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -1,9 +1,8 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
 SRC=   ../../src
-VPATH= ${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
@@ -15,35 +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)
-
-COMPONENTS = mkws-handlebars.js \
-	mkws-core.js mkws-team.js mkws-filter.js \
-	mkws-widget.js mkws-widget-main.js mkws-widget-termlists.js \
-	mkws-widget-authname.js mkws-widget-categories.js mkws-widget-log.js \
-	mkws-widget-record.js mkws-widget-reference.js mkws-widget-builder.js
+#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-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
-
-INSTALLABLE = mkws-jquery.js VERSION NEWS $(GENERATED)
-
-INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
-
-**make-default**: mkws.js
-
-install: $(INSTALLED)
-
-uninstall:
-	rm -f $(INSTALLED)
+	mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js ${SRC}/mkws-templates.js
 
-../tools/htdocs/%: %
-	rm -f $@ && cp -p $? $@ && chmod 444 $@
+**make-default**: all
 
 all: mkws.min.js mkws-complete.min.js
 
-mkws-js mkws-complete.js: Makefile mkws.js 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+,,')"; \
@@ -55,25 +55,24 @@ mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${HANDLEBARS_FILE} ${J
 	  cat ${HANDLEBARS_FILE}; \
 	  cat ${PP2_FILE}; \
 	  cat  mkws.js; \
-	  cat  ${SRC}/mkws-jquery.js; \
-	) > mkws-complete.js.new
-	mv -f mkws-complete.js.new mkws-complete.js
+	) > mkws-complete.js.tmp
+	mv -f mkws-complete.js.tmp mkws-complete.js
 
 %.min.js: %.js
-	yui-compressor $? > $@.new
-	mv -f $@.new $@
+	${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
 	mv -f $@.tmp $@
 
 ${JQUERY_FILE}:
-	curl -sSf ${JQUERY_URL} -o $@.new
-	perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
-	rm -f $@.new
+	curl -sSf ${JQUERY_URL} -o $@.tmp
+	perl -npe 's,sourceMappingURL=jquery.*map,,' $@.tmp > $@
+	rm -f $@.tmp
 
 ${JQUERY_JSON_FILE}:
 	curl -sSf ${JQUERY_JSON_URL} -o $@.tmp
@@ -96,11 +95,20 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
 
 mkws.js: $(COMPONENTS) Makefile
 	rm -f $@
-	( cd ${SRC}; cat ${COMPONENTS} ) > $@
+	cat ${COMPONENTS} > $@.tmp
+	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 'chomp(); print qq{    <script type="text/javascript" src="src$$_"></script>\n}'
+
 distclean: clean
-	rm -f *.orig *.bak *.rej
+	@echo "(No need for distclean, 'make clean' is fine)"
 
 clean:
 	rm -f ${GENERATED}