X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2FMakefile;h=bc7ef19521dab9bd1d39d7b0b08aff43064224f8;hp=c1bbdac9925088310c99068d1827d500f8cbd3d0;hb=38681173648abc43ba6861c8a14fa47041a4811e;hpb=8b6beeb5be2b202ed6c0d566964e0ecd35436b49 diff --git a/src/Makefile b/src/Makefile index c1bbdac..bc7ef19 100644 --- a/src/Makefile +++ b/src/Makefile @@ -12,14 +12,16 @@ 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-widgets.js mkws-widget-termlists.js \ - mkws-widget-authname.js mkws-widget-log.js mkws-widget-record.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) -INSTALLABLE = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \ - 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 @@ -39,11 +41,12 @@ mkws-js mkws-complete.js: Makefile mkws.js mkws-jquery.js ${HANDLEBARS_FILE} ${J 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 ',')"; \ 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 ${HANDLEBARS_FILE} ${J 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 $@ @@ -95,6 +98,5 @@ distclean: clean rm -f *.orig *.bak *.rej clean: - rm -f ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} - rm -f mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js + rm -f ${GENERATED}