X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2FMakefile;h=bed0fb14ef58b8e8e7d472d93d99edf3361a941e;hb=1dfb625168e68050741445453bc5f1c84819c040;hp=b61d34cb50056932ef941c3c5ef1850db79a8ec2;hpb=34cead83c94c68092d201b71e281c8e432e81f93;p=mkws-moved-to-github.git

diff --git a/src/Makefile b/src/Makefile
index b61d34c..bed0fb1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -14,7 +14,6 @@ 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)
 
 COMPONENTS = mkws-handlebars.js \
 	mkws-core.js \
@@ -22,7 +21,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,7 +33,7 @@ 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
-AVAILABLE = $(DOWNLOADABLE) $(RELEASABLE) mkws-jquery.js
+AVAILABLE = $(DOWNLOADABLE) $(RELEASABLE) NEWS VERSION
 INSTALLED_DOWNLOADABLE = $(DOWNLOADABLE:%=$(DEST)/%)
 INSTALLED_RELEASABLE = $(RELEASABLE:%=$(DEST)/%)
 INSTALLED = $(AVAILABLE:%=$(DEST)/%)
@@ -59,7 +58,7 @@ $(DEST)/mkws-complete.js: Makefile $(INSTALLED_DOWNLOADABLE) $(DEST)/mkws.js
 	mv -f $@.tmp $@
 
 %.min.js: %.js
-	${YUI_COMPRESSOR} $? > $@.tmp
+	yui-compressor $? > $@.tmp
 	mv -f $@.tmp $@
 
 $(DEST)/${HANDLEBARS_FILE}:
@@ -79,19 +78,28 @@ $(DEST)/${PP2_FILE}:
 	curl -sSf "${PP2_URL}" -o $@.tmp
 	mv -f $@.tmp $@
 
-$(DEST)/%: %
+$(DEST)/NEWS: NEWS
 	rm -f $@
 	cp $? $@
 	chmod 444 $@
 
-release: $(RELEASABLE)
-	@if [ -f ${DEST}/releases/mkws-$(VERSION).js ]; then \
+$(DEST)/VERSION: VERSION
+	rm -f $@
+	cp $? $@
+	chmod 444 $@
+
+release: $(INSTALLED_RELEASABLE)
+	@if ! which yui-compressor >/dev/null; then \
+		echo "*** please install the yui-compressor program"; exit 1; \
+	fi
+	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
 
@@ -100,13 +108,13 @@ $(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
 syntax-check: $(DEST)/mkws.js
-	${YUI_COMPRESSOR} $(DEST)/mkws.js >/dev/null
+	yui-compressor $(DEST)/mkws.js >/dev/null
 
 # Emits a list of <script> elements to include in HTML applications
 html-includes:
@@ -114,5 +122,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 ""