From: Mike Taylor <mike@indexdata.com>
Date: Wed, 2 Jul 2014 10:46:07 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
X-Git-Tag: 1.0.0~461
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=5e836d7074964d2823b770037162c044ce6d6966;hp=991c48afd84b8a7c788f2b3861b0beaacbe08468;p=mkws-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
---

diff --git a/Makefile b/Makefile
index 9504c36..dcd5995 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 # Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
 
 all:
-	${MAKE} -C./src $@
+	${MAKE} -C./tools/htdocs $@
 	${MAKE} -C./doc $@
 
 clean distclean:
-	${MAKE} -C./src $@
+	${MAKE} -C./tools/htdocs $@
 	${MAKE} -C./doc $@
 	${MAKE} -C./examples/htdocs $@
 	${MAKE} -C./test $@
@@ -18,12 +18,9 @@ phantomjs p:
 
 # must be called once after GIT checkout
 setup:	
-#why?	${MAKE} -C./tools/htdocs mkws-js-min
 	${MAKE} -C./test node-modules
 
-check: setup check-js
-	@echo ""
-	@echo "To run jasmine regression tests, type: make phantomjs"
+check: setup check-js phantomjs
 
 help:
 	@echo "make [ all | setup | clean | distclean ]"
diff --git a/examples/htdocs/jasmine-local-popup.html b/examples/htdocs/jasmine-local-popup.html
index b743d23..8ef34d6 100644
--- a/examples/htdocs/jasmine-local-popup.html
+++ b/examples/htdocs/jasmine-local-popup.html
@@ -6,11 +6,11 @@
     <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
 
-    <script type="text/javascript" src="src/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="src/pz2.js"></script>
-    <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
     <script type="text/javascript" src="src/mkws-handlebars.js"></script>
     <script type="text/javascript" src="src/mkws-core.js"></script>
     <script type="text/javascript" src="src/mkws-team.js"></script>
diff --git a/examples/htdocs/jasmine-popup.html b/examples/htdocs/jasmine-popup.html
index 5556ad1..c27e0f4 100644
--- a/examples/htdocs/jasmine-popup.html
+++ b/examples/htdocs/jasmine-popup.html
@@ -6,11 +6,11 @@
     <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
 
-    <script type="text/javascript" src="src/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.min.js"></script>
-    <script type="text/javascript" src="src/pz2.js"></script>
-    <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
     <script type="text/javascript" src="src/mkws-handlebars.js"></script>
     <script type="text/javascript" src="src/mkws-core.js"></script>
     <script type="text/javascript" src="src/mkws-team.js"></script>
diff --git a/examples/htdocs/jasmine-pp2.html b/examples/htdocs/jasmine-pp2.html
index 60aa55f..0e106bb 100644
--- a/examples/htdocs/jasmine-pp2.html
+++ b/examples/htdocs/jasmine-pp2.html
@@ -15,10 +15,10 @@
       };
     </script>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.7.2.min.js"></script>
-    <script type="text/javascript" src="src/pz2.js"></script>
-    <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="src/mkws.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
 
     <link rel="stylesheet" type="text/css" href="tools/htdocs/mkws.css" />
     <style type="text/css">
diff --git a/examples/htdocs/jasmine.html b/examples/htdocs/jasmine.html
index 66183f1..e47e374 100644
--- a/examples/htdocs/jasmine.html
+++ b/examples/htdocs/jasmine.html
@@ -11,10 +11,10 @@
       };
     </script>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.7.2.min.js"></script> 
-    <script type="text/javascript" src="src/pz2.js"></script>
-    <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="src/mkws.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/mkws.js"></script>
     <style type="text/css">
       .mkwsTermlists div.facet {
       float:left;
diff --git a/examples/htdocs/mike.html b/examples/htdocs/mike.html
index 4795d09..655766e 100644
--- a/examples/htdocs/mike.html
+++ b/examples/htdocs/mike.html
@@ -7,9 +7,9 @@
       var mkws_config = { service_proxy_auth: "//mkws.indexdata.com/service-proxy-orexauth" };
     </script>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="src/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
     <script type="text/javascript" src="src/mkws-handlebars.js"></script>
     <script type="text/javascript" src="src/mkws-core.js"></script>
     <script type="text/javascript" src="src/mkws-team.js"></script>
diff --git a/examples/htdocs/mike2.html b/examples/htdocs/mike2.html
index ffac156..188cbc2 100644
--- a/examples/htdocs/mike2.html
+++ b/examples/htdocs/mike2.html
@@ -9,9 +9,9 @@
       };
     </script>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
-    <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="src/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
     <script type="text/javascript" src="src/mkws-handlebars.js"></script>
     <script type="text/javascript" src="src/mkws-core.js"></script>
     <script type="text/javascript" src="src/mkws-team.js"></script>
diff --git a/examples/htdocs/wolfram.html b/examples/htdocs/wolfram.html
index 6ac1edd..a15f554 100644
--- a/examples/htdocs/wolfram.html
+++ b/examples/htdocs/wolfram.html
@@ -16,12 +16,12 @@
 	  service_proxy_auth : "/service-proxy-testauth"
       };
     </script>
-    <script type="text/javascript" src="src/jquery-1.10.0.min.js"></script>
-    <script type="text/javascript" src="src/pz2.js"></script>
-    <script type="text/javascript" src="src/handlebars-v1.1.2.js"></script>
-    <script type="text/javascript" src="src/jquery.json-2.4.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery-1.10.0.min.js"></script>
+    <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
+    <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>
    
-    <!-- <script type="text/javascript" src="src/mkws.js"></script> -->
+    <!-- <script type="text/javascript" src="tools/htdocs/mkws.js"></script> -->
     <script type="text/javascript" src="src/mkws-handlebars.js"></script>
     <script type="text/javascript" src="src/mkws-core.js"></script>
     <script type="text/javascript" src="src/mkws-team.js"></script>
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index bc7ef19..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-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-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
-
-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**: ../tools/htdocs/mkws.js
-
-install: $(INSTALLED)
-
-uninstall:
-	rm -f $(INSTALLED)
-
-../tools/htdocs/%: %
-	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 ${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 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; \
-	  cat  mkws-jquery.js; \
-	) > mkws-complete.js.new
-	mv -f mkws-complete.js.new mkws-complete.js
-
-%.min.js: %.js
-	yui-compressor $? > $@.new
-	mv -f $@.new $@
-
-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 > $@
-	rm -f $@.new
-
-${JQUERY_JSON_FILE}:
-	curl -sSf ${JQUERY_JSON_URL} -o $@.tmp
-	mv -f $@.tmp $@
-
-${PP2_FILE}:
-	curl -sSf "${PP2_URL}" -o $@.tmp
-	mv -f $@.tmp $@
-
-release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
-	@if [ -f releases/mkws-$(VERSION).js ]; then \
-		echo "*** There is already a release $(VERSION)"; \
-	else \
-		cp -p mkws.js releases/mkws-$(VERSION).js; \
-		cp -p mkws.min.js releases/mkws-$(VERSION).min.js; \
-		cp -p mkws-complete.js releases/mkws-complete-$(VERSION).js; \
-		cp -p mkws-complete.min.js releases/mkws-complete-$(VERSION).min.js; \
-		echo "Made release $(VERSION)"; \
-	fi
-
-mkws.js: $(COMPONENTS) Makefile
-	rm -f $@
-	cat $(COMPONENTS) > $@
-	chmod 444 $@
-
-distclean: clean
-	rm -f *.orig *.bak *.rej
-
-clean:
-	rm -f ${GENERATED}
-
diff --git a/src/releases/.gitkeep b/src/releases/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test/Makefile b/test/Makefile
index 95a3c7b..e808d55 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,8 +3,10 @@
 # For running on Mike's local install of node.js
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
 
+APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
+
 #PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html	
-PHANTOMJS_URL=http://localhost:4040/jasmine-local-popup.html
+PHANTOMJS_URL=http://localhost:${APACHE_PORT}/jasmine-local-popup.html
 PHANTOMJS_TIMEOUT=16
 
 NPM_INSTALL_FLAGS=-q
@@ -35,7 +37,7 @@ clean-tmp:
 	touch ${TMP_DIR}/.gitkeep
 
 mkws-complete-syntax-check:
-	${MAKE} -C../src mkws-complete.min.js
+	${MAKE} -C../tools/htdocs mkws-complete.min.js
 
 check: mkws-complete-syntax-check
 	@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi 
diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update
index 4f37a41..bf14cbd 100755
--- a/test/bin/apache-template-update
+++ b/test/bin/apache-template-update
@@ -12,7 +12,7 @@ export APACHE_RUN_GROUP=$(groups | awk '{ print $1 }')
 export APACHE_LOG_DIR=$APACHE_SERVER_ROOT/logs
 export APACHE_PID_FILE=$APACHE_LOG_DIR/mkws-jasmine.pid
 export APACHE_LOCK_FILE=$APACHE_LOG_DIR/accept.lock
-export APACHE_PORT=4040
+: ${APACHE_PORT=4040}; export APACHE_PORT
 
 export MKWS_ROOT=$(pwd)/..
 
diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
new file mode 100644
index 0000000..82d4e7e
--- /dev/null
+++ b/tools/htdocs/Makefile
@@ -0,0 +1,109 @@
+# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+
+SRC=   ../../src
+
+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' < ${SRC}/VERSION)
+
+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
+
+GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
+	mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
+
+INSTALLABLE = ${SRC}/mkws-jquery.js VERSION NEWS $(GENERATED)
+
+INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
+
+**make-default**: mkws.js
+
+install: $(INSTALLED)
+
+uninstall:
+	rm -f $(INSTALLED)
+
+../tools/htdocs/%: %
+	rm -f $@ && cp -p $? $@ && chmod 444 $@
+
+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}
+	( 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 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; \
+	  cat  ${SRC}/mkws-jquery.js; \
+	) > mkws-complete.js.new
+	mv -f mkws-complete.js.new mkws-complete.js
+
+%.min.js: %.js
+	yui-compressor $? > $@.new
+	mv -f $@.new $@
+
+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 > $@
+	rm -f $@.new
+
+${JQUERY_JSON_FILE}:
+	curl -sSf ${JQUERY_JSON_URL} -o $@.tmp
+	mv -f $@.tmp $@
+
+${PP2_FILE}:
+	curl -sSf "${PP2_URL}" -o $@.tmp
+	mv -f $@.tmp $@
+
+release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
+	@if [ -f ${SRC}/releases/mkws-$(VERSION).js ]; then \
+		echo "*** There is already a release $(VERSION)"; \
+	else \
+		cp -p mkws.js ${SRC}/releases/mkws-$(VERSION).js; \
+		cp -p mkws.min.js ${SRC}/releases/mkws-$(VERSION).min.js; \
+		cp -p mkws-complete.js ${SRC}/releases/mkws-complete-$(VERSION).js; \
+		cp -p mkws-complete.min.js ${SRC}/releases/mkws-complete-$(VERSION).min.js; \
+		echo "Made release $(VERSION)"; \
+	fi
+
+mkws.js: $(COMPONENTS) Makefile
+	rm -f $@
+	cat ${COMPONENTS} > $@
+	chmod 444 $@
+
+distclean: clean
+	rm -f *.orig *.bak *.rej
+
+clean:
+	rm -f ${GENERATED}
+
+help:
+	@echo "make [ all | release | clean | distclean ]"
+	@echo "     [ mkws-syntax-check ]"