projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2a3dfa3
)
Add rules to fetch and install JSNlog.
author
Mike Taylor
<mike@indexdata.com>
Wed, 19 Nov 2014 12:22:01 +0000
(12:22 +0000)
committer
Mike Taylor
<mike@indexdata.com>
Wed, 19 Nov 2014 12:22:01 +0000
(12:22 +0000)
src/Makefile
patch
|
blob
|
history
diff --git
a/src/Makefile
b/src/Makefile
index
6524a0f
..
1a1a409
100644
(file)
--- 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
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}
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)
PP2_URL = http://git.indexdata.com/?p=pazpar2.git;a=blob_plain;f=js/${PP2_FILE};hb=HEAD
VERSION = $(shell tr -d '\012' < VERSION)
@@
-32,7
+34,7
@@
COMPONENTS = mkws-handlebars.js \
mkws-templates.js \
mkws-popup.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)/%)
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}; \
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}; \
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 $@
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 $@
$(DEST)/${PP2_FILE}:
curl -sSf "${PP2_URL}" -o $@.tmp
mv -f $@.tmp $@