X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile;h=bc7ef19521dab9bd1d39d7b0b08aff43064224f8;hp=390245ec325c94ba8760cf470c0f8dbef5ca7c82;hb=38681173648abc43ba6861c8a14fa47041a4811e;hpb=e09dcf134aa652df8c4b10c61c46a6a3c7141635

diff --git a/src/Makefile b/src/Makefile
index 390245e..bc7ef19 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,49 +1,52 @@
-# select a jquery version
-#JQUERY_URL=	http://code.jquery.com/jquery-2.0.3.min.js
-JQUERY_URL=	http://code.jquery.com/jquery-1.10.0.min.js
-#JQUERY_URL=	http://code.jquery.com/jquery-1.9.1.min.js
-
-JQUERY_UI_URL=	http://code.jquery.com/ui/1.10.3/jquery-ui.js
-JQUERY_JSON_URL= https://jquery-json.googlecode.com/files/jquery.json-2.4.js
-HANDLEBARS_URL=	http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js
-PP2_URL= 	http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/pz2.js;hb=HEAD
+HANDLEBARS_FILE = handlebars-v1.1.2.js
+JQUERY_FILE = jquery-1.10.0.min.js
+JQUERY_JSON_FILE = jquery.json-2.4.js
+PP2_FILE = pz2.js
+
+HANDLEBARS_URL = http://builds.handlebarsjs.com.s3.amazonaws.com/${HANDLEBARS_FILE}
+JQUERY_URL = http://code.jquery.com/${JQUERY_FILE}
+JQUERY_JSON_URL = https://jquery-json.googlecode.com/files/${JQUERY_JSON_FILE}
+PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};hb=HEAD
+
+JQUERY_UI_URL =	http://code.jquery.com/ui/1.10.3/jquery-ui.js
 VERSION = $(shell tr -d '\012' < VERSION)
 
-COMPONENTS = mkws-core.js mkws-team.js mkws-widgets.js mkws-widget-authname.js mkws-handlebars.js 
+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
 
-JQUERY_FILE := $(shell basename ${JQUERY_URL})
-JQUERY_JSON_FILE := $(shell basename ${JQUERY_JSON_URL})
-HANDLEBARS_FILE := $(shell basename ${HANDLEBARS_URL})
-PP2_FILE = pz2.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)
 
-INSTALLABLE = handlebars-v1.1.2.js \
-	jquery-1.10.0.min.js jquery.json-2.4.js \
-	pz2.js mkws.js mkws-jquery.js mkws-complete.js \
-	mkws.min.js mkws-complete.min.js VERSION NEWS
 INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
 
+**make-default**: ../tools/htdocs/mkws.js
+
 install: $(INSTALLED)
 
 uninstall:
 	rm -f $(INSTALLED)
 
 ../tools/htdocs/%: %
-	rm -f $@
-	cp -p $? $@
-	chmod -w $@
+	rm -f $@ && cp -p $? $@ && chmod 444 $@
 
 all: mkws.min.js mkws-complete.min.js
 
-mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE}
+mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.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"; \
 	  echo "   created at: $$(date)"; \
-	  echo "   mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,')"; \
+	  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>,')"; \
 	  echo "*/"; \
 	  cat ${JQUERY_FILE}; \
 	  cat ${JQUERY_JSON_FILE}; \
+	  echo 'mkws_jQuery = jQuery.noConflict(true);'; \
 	  cat ${HANDLEBARS_FILE}; \
 	  cat ${PP2_FILE}; \
 	  cat  mkws.js; \
@@ -58,6 +61,10 @@ mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${JQUERY_FILE} ${JQUER
 mkws-syntax-check:
 	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 > $@
@@ -67,10 +74,6 @@ ${JQUERY_JSON_FILE}:
 	curl -sSf ${JQUERY_JSON_URL} -o $@.tmp
 	mv -f $@.tmp $@
 
-${HANDLEBARS_FILE}:
-	curl -sSf ${HANDLEBARS_URL} -o $@.tmp
-	mv -f $@.tmp $@
-
 ${PP2_FILE}:
 	curl -sSf "${PP2_URL}" -o $@.tmp
 	mv -f $@.tmp $@
@@ -89,15 +92,11 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
 mkws.js: $(COMPONENTS) Makefile
 	rm -f $@
 	cat $(COMPONENTS) > $@
-	chmod -w $@
+	chmod 444 $@
 
 distclean: clean
 	rm -f *.orig *.bak *.rej
 
 clean:
-	rm -f ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${HANDLEBARS_FILE} ${PP2_FILE} ${PP2_FILE}
-	rm -f mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
+	rm -f ${GENERATED}
 
-help:
-	@echo "make [ help | clean | mkws-js ]"
-	@echo "make JQUERY_URL=http://code.jquery.com/jquery-2.0.3.min.js clean mkws-js"