From 6e1edd743e5693aa1596b413dcc26ba21441dd4f Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Mon, 19 Aug 2013 14:31:02 +0200 Subject: [PATCH] new target pz2api-git-checkout for automated testing --- Makefile | 4 ++-- tools/htdocs/Makefile | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0c08188..1b1fe3b 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ **default**: (cd tools/htdocs; $(MAKE)) -clean distclean all: +clean distclean all pz2api-git-checkout: ${MAKE} -C./tools/htdocs $@ check: distclean all help: - @echo "make [ all | clean ]" + @echo "make [ all | clean | pz2api-git-checkout ]" diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile index e73a87a..b0cfa24 100644 --- a/tools/htdocs/Makefile +++ b/tools/htdocs/Makefile @@ -33,10 +33,15 @@ pz2api-check: @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?"; \ - echo "( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} )"; \ + echo "Please run: make pz2api-git-checkout"; \ exit 1; \ fi +pz2api-git-checkout: + @if ! test -e ${PZ2API_JS}; then \ + ( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \ + fi + mkws-js ${MKWS_JS}: pz2api-check ${PZ2API_JS} mkws.js ( echo "/* created at: $$(date)"; \ echo " mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,') */"; \ -- 1.7.10.4