From: Wolfram Schneider Date: Tue, 23 Jun 2015 20:44:39 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=711622c40c16ed8305a0fe1125121a7076466c27;hp=79107f202c91da40bf541e05284449d5c5caf89e Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws --- diff --git a/test/widgets/Makefile b/test/widgets/Makefile index 695f237..6433265 100644 --- a/test/widgets/Makefile +++ b/test/widgets/Makefile @@ -39,11 +39,11 @@ screenshots: clean estimate-time iframe done; wait; \ ${MAKE} PREFIX=$$t index; \ done - ${MAKE} tidy help-url + ${MAKE} index-widgets tidy help-url help-url: @echo "" - @echo "Please check now: http://localhost/test/widgets/" + @echo "Please check now: http://localhost/test/widgets/index.html" estimate-time: @wc -l url.* | tail -n1 | awk '{print "Estimeate run time: " $$1 * (1 + '${TIMEOUT}') * 0.5, "seconds" }' @@ -52,13 +52,16 @@ estimate-time: index: ( cd ${IMAGES}; ls -tr ${PREFIX}.*.png | perl -ne 'chomp; print qq{

$$_



\n}' ) > index-${PREFIX}.html +index-widgets: + ls -t index-*html iframe-*.html | perl -ne 'chomp; print qq{$$_
\n}' > index.html + iframe: index-iframe-demo index-iframe-demo: ( egrep example.indexdata.com url.demos | perl -ne 'chomp; print qq{

$$_

\n}' ) > iframe-demos-example.html ( egrep -v example.indexdata.com url.demos | perl -ne 'chomp; print qq{

$$_

\n}' ) > iframe-demos-other.html tidy: - for i in iframe-demos.html index-*.html; do \ + for i in iframe-demos*.html index*.html; do \ tidy -i -m $$i >/dev/null 2>&1; \ perl -i -npe 's,(^\s*), $$1,' $$i; \ done