projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Heading.
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
Makefile
diff --git
a/tools/htdocs/Makefile
b/tools/htdocs/Makefile
index
e0a5498
..
89e543e
100644
(file)
--- a/
tools/htdocs/Makefile
+++ b/
tools/htdocs/Makefile
@@
-13,12
+13,18
@@
JQUERY_URL= http://code.jquery.com/jquery-1.10.0.min.js
#JQUERY_URL= http://code.jquery.com/jquery-1.6.4.min.js
#JQUERY_URL= http://code.jquery.com/jquery-1.4.4.min.js
#JQUERY_URL= http://code.jquery.com/jquery-1.6.4.min.js
#JQUERY_URL= http://code.jquery.com/jquery-1.4.4.min.js
-JQUERY_UI_URL= http://code.jquery.com/ui/1.10.3/jquery-ui.js
+JQUERY_UI_URL= http://code.jquery.com/ui/1.10.3/jquery-ui.js
#JQUERY_UI_URL= http://code.jquery.com/ui/1.8.0/jquery-ui.min.js
#JQUERY_UI_URL= http://code.jquery.com/ui/1.8.0/jquery-ui.min.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 -o $@
MKWS_JS= mkws-complete.js
PZ2API_JS= ../../../pazpar2/js/pz2.js
PZ2API_GIT= ssh://git.indexdata.com:222/home/git/pub/pazpar2
MKWS_JS= mkws-complete.js
PZ2API_JS= ../../../pazpar2/js/pz2.js
PZ2API_GIT= ssh://git.indexdata.com:222/home/git/pub/pazpar2
+
+JQUERY_FILE := $(shell basename ${JQUERY_URL})
+JQUERY_JSON_FILE := $(shell basename ${JQUERY_JSON_URL})
+HANDLEBARS_FILE := $(shell basename ${HANDLEBARS_URL})
##############################
DOCS = README.html README.odt README.pdf \
##############################
DOCS = README.html README.odt README.pdf \
@@
-30,12
+36,12
@@
all: ${MKWS_JS} $(DOCS)
docs: $(DOCS)
docs: $(DOCS)
-pz2api-git-checkout:
+pz2api-git-checkout:
@if ! test -e ${PZ2API_JS}; then \
( cd ../../.. && git clone ${PZ2API_GIT} ); \
fi
@if ! test -e ${PZ2API_JS}; then \
( cd ../../.. && git clone ${PZ2API_GIT} ); \
fi
-mkws-js ${MKWS_JS}: mkws.js handlebars-v1.1.2.js
+mkws-js ${MKWS_JS}: Makefile mkws.js ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
@if ! test -e ${PZ2API_JS}; then \
echo "The pazpar2 JS file ${PZ2API_JS} does not exists."; \
echo "Did you checked out the source from the git repo?"; \
@if ! test -e ${PZ2API_JS}; then \
echo "The pazpar2 JS file ${PZ2API_JS} does not exists."; \
echo "Did you checked out the source from the git repo?"; \
@@
-45,17
+51,29
@@
mkws-js ${MKWS_JS}: mkws.js handlebars-v1.1.2.js
echo ""; \
exit 1; \
fi
echo ""; \
exit 1; \
fi
- ( echo "/* created at: $$(date)"; \
+ ( echo "/* Copyright (c) 2013 IndexData ApS. http://indexdata.com"; \
+ echo " created at: $$(date)"; \
echo " mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,')"; \
echo " $$(basename ${PZ2API_JS}) GIT id: $$(cd $$(dirname ${PZ2API_JS}) && git log $$(basename ${PZ2API_JS}) | head -n 1 | perl -npe 's,\S+\s+,,')"; \
echo "*/"; \
echo " mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,')"; \
echo " $$(basename ${PZ2API_JS}) GIT id: $$(cd $$(dirname ${PZ2API_JS}) && git log $$(basename ${PZ2API_JS}) | head -n 1 | perl -npe 's,\S+\s+,,')"; \
echo "*/"; \
- curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \
- cat handlebars-v1.1.2.js; \
- cat ${PZ2API_JS} mkws.js ) > ${MKWS_JS}.new
+ cat ${JQUERY_FILE}; \
+ cat ${JQUERY_JSON_FILE}; \
+ cat ${HANDLEBARS_FILE}; \
+ cat ${PZ2API_JS}; \
+ cat mkws.js; \
+ ) > ${MKWS_JS}.new
mv -f ${MKWS_JS}.new ${MKWS_JS}
mv -f ${MKWS_JS}.new ${MKWS_JS}
-handlebars-v1.1.2.js:
- curl -sSf http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js -o $@
+${JQUERY_JSON_FILE}:
+ curl -sSf ${JQUERY_JSON_URL} -o $@
+
+${JQUERY_FILE}:
+ curl -sSf ${JQUERY_URL} -o $@.new
+ perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
+ rm -f $@.new
+
+${HANDLEBARS_FILE}:
+ curl -sSf ${HANDLEBARS_URL} -o $@
# For a description of pandoc's markdown format, see:
# For a description of pandoc's markdown format, see:
@@
-83,11
+101,12
@@
handlebars-v1.1.2.js:
chmod ugo-w $@
##############################
chmod ugo-w $@
##############################
-# helper targets
+# helper targets
#
distclean: clean
clean:
#
distclean: clean
clean:
- rm -f ${MKWS_JS} $(DOCS)
+ rm -f ${MKWS_JS} ${JQUERY_JSON_FILE} ${JQUERY_FILE} ${HANDLEBARS_FILE}
+ rm -f $(DOCS)
help:
@echo "make [ help | mkws-js | docs | clean ]"
help:
@echo "make [ help | mkws-js | docs | clean ]"