X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile;h=ed3d0dbd799de4f1e406872c0c862bb44a7d4f00;hp=6524a0f4787980a4846a815143018cca02de742b;hb=9329e89d889f9e5c0a2a9b1ea3262c42bd54721a;hpb=6c7da57c7a831e783965f51bf850996274ce76ed diff --git a/src/Makefile b/src/Makefile index 6524a0f..ed3d0db 100644 --- a/src/Makefile +++ b/src/Makefile @@ -5,11 +5,13 @@ DEST = ../tools/htdocs HANDLEBARS_FILE = handlebars-v2.0.0.js JQUERY_FILE = jquery-1.10.0.min.js JQUERY_JSON_FILE = jquery.json-2.4.js +JSNLOG_FILE = jsnlog.min.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} +JSNLOG_URL = https://raw.githubusercontent.com/mperdeck/jsnlog.js/2.7.5/${JSNLOG_FILE} PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};hb=HEAD VERSION = $(shell tr -d '\012' < VERSION) @@ -27,12 +29,12 @@ COMPONENTS = mkws-handlebars.js \ mkws-widget-categories.js \ mkws-widget-log.js \ mkws-widget-record.js \ - mkws-widget-reference.js \ + mkws-widget-wikipedia.js \ mkws-widget-builder.js \ mkws-templates.js \ mkws-popup.js -DOWNLOADABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} +DOWNLOADABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${JSNLOG_FILE} ${PP2_FILE} RELEASABLE = mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js AVAILABLE = $(DOWNLOADABLE) $(RELEASABLE) NEWS VERSION INSTALLED_DOWNLOADABLE = $(DOWNLOADABLE:%=$(DEST)/%) @@ -51,6 +53,7 @@ $(DEST)/mkws-complete.js: Makefile $(INSTALLED_DOWNLOADABLE) $(DEST)/mkws.js echo "*/"; \ cat $(DEST)/${JQUERY_FILE}; \ cat $(DEST)/${JQUERY_JSON_FILE}; \ + cat $(DEST)/${JSNLOG_FILE}; \ echo 'mkws_jQuery = jQuery.noConflict(true);'; \ cat $(DEST)/${HANDLEBARS_FILE}; \ cat $(DEST)/${PP2_FILE}; \ @@ -75,6 +78,10 @@ $(DEST)/${JQUERY_JSON_FILE}: curl -sSf ${JQUERY_JSON_URL} -o $@.tmp mv -f $@.tmp $@ +$(DEST)/${JSNLOG_FILE}: + curl -sSf ${JSNLOG_URL} -o $@.tmp + mv -f $@.tmp $@ + $(DEST)/${PP2_FILE}: curl -sSf "${PP2_URL}" -o $@.tmp mv -f $@.tmp $@