X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile;h=ab04fc72dd8ec159bd77890a3dc8413d99c4de9a;hp=6b0cfafc96c2865e05b51fd8052eb8b657b62384;hb=b99a8c62ed342809871bdad8ec8890809ee0b726;hpb=6449cfc2f6394765a842554d10498186806caf08

diff --git a/src/Makefile b/src/Makefile
index 6b0cfaf..ab04fc7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,7 +14,7 @@ PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};
 
 VERSION = $(shell tr -d '\012' < VERSION)
 HANDLEBARS = ../test/node_modules/.bin/handlebars
-YUI_COMPRESSOR = $(shell which yui-compressor ../../test/bin/yui-compressor | head -1)
+YUI_COMPRESSOR = $(shell which yui-compressor ../test/bin/yui-compressor | head -1)
 
 COMPONENTS = mkws-handlebars.js \
 	mkws-core.js \
@@ -22,7 +22,7 @@ COMPONENTS = mkws-handlebars.js \
 	mkws-filter.js \
 	mkws-widget.js \
 	mkws-widget-main.js \
-	mkws-widget-termlists.js \
+	mkws-widget-facets.js \
 	mkws-widget-authname.js \
 	mkws-widget-categories.js \
 	mkws-widget-log.js \
@@ -34,17 +34,17 @@ COMPONENTS = mkws-handlebars.js \
 
 DOWNLOADABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE}
 RELEASABLE = mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
-GENERATED = $(DOWNLOADABLE) $(RELEASABLE)
+AVAILABLE = $(DOWNLOADABLE) $(RELEASABLE) NEWS VERSION
 INSTALLED_DOWNLOADABLE = $(DOWNLOADABLE:%=$(DEST)/%)
 INSTALLED_RELEASABLE = $(RELEASABLE:%=$(DEST)/%)
-INSTALLED = $(GENERATED:%=$(DEST)/%)
+INSTALLED = $(AVAILABLE:%=$(DEST)/%)
 
 all: $(INSTALLED)
 
 $(DEST)/mkws-complete.js: Makefile $(INSTALLED_DOWNLOADABLE) $(DEST)/mkws.js
 	( set -e; \
 	  echo "/*! Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com"; \
-	  echo "   Licence: GPL, http://www.indexdata.com/licences/gpl"; \
+	  echo "   Licence: LGPL, http://www.indexdata.com/licences/lgpl"; \
 	  echo "   created at: $$(date)"; \
 	  echo "   MKWS GIT id: $$(git show | head -n 1 | perl -npe 's,\S+\s+,,')"; \
 	  echo "   pz2.js GIT id: $$(curl -sSf 'http://git.indexdata.com/?p=pazpar2.git;a=rss' | egrep '<guid' | head -1 | perl -ne 'print "$$1\n" if m,.*=([0-9a-f]+)</guid>,')"; \
@@ -79,14 +79,25 @@ $(DEST)/${PP2_FILE}:
 	curl -sSf "${PP2_URL}" -o $@.tmp
 	mv -f $@.tmp $@
 
-release: $(RELEASABLE)
-	@if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \
+$(DEST)/NEWS: NEWS
+	rm -f $@
+	cp $? $@
+	chmod 444 $@
+
+$(DEST)/VERSION: VERSION
+	rm -f $@
+	cp $? $@
+	chmod 444 $@
+
+release: $(INSTALLED_RELEASABLE)
+	if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \
 		echo "*** There is already a release $(VERSION)"; \
 	else \
 		cp -p $(DEST)/mkws.js ${DEST}/releases/mkws-$(VERSION).js; \
 		cp -p $(DEST)/mkws.min.js ${DEST}/releases/mkws-$(VERSION).min.js; \
 		cp -p $(DEST)/mkws-complete.js ${DEST}/releases/mkws-complete-$(VERSION).js; \
 		cp -p $(DEST)/mkws-complete.min.js ${DEST}/releases/mkws-complete-$(VERSION).min.js; \
+		cp -p $(DEST)/mkws.css ${DEST}/releases/mkws-$(VERSION).css; \
 		echo "Made release $(VERSION)"; \
 	fi
 
@@ -95,8 +106,8 @@ $(DEST)/mkws.js: $(COMPONENTS) Makefile
 	mv -f $@.tmp $@
 	chmod 444 $@
 
-mkws-templates.js: *.templates/*.handlebars
-	${HANDLEBARS} -n mkws.defaultTemplates *.templates/*.handlebars -f $@.tmp
+mkws-templates.js: templates/*.handlebars
+	${HANDLEBARS} -n mkws.defaultTemplates templates/*.handlebars -f $@.tmp
 	mv -f $@.tmp $@
 
 # Checks that the JavaScript can be parsed
@@ -109,5 +120,10 @@ html-includes:
 	  perl -n0e 'chomp(); print qq{    <script type="text/javascript" src="src/$$_"></script>\n}'
 
 clean distclean:
-	rm -f ${INSTALLED}
+	rm -f ${INSTALLED} mkws-templates.js
 
+help:
+	@echo "make [ all | clean | release ]"
+	@echo "     [ syntax-check | html-includes ]"
+	@echo "     [ mkws-templates.js | $(DEST)/mkws-complete.min.js ]"
+	@echo ""