From 69d42f0f9455554a9821e899793bde54d947266f Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 2 Apr 2013 16:16:43 +0200 Subject: [PATCH 1/3] Download Plovr into build directory This means that all build artefacts except for the examples are in build. --- .gitignore | 1 - build.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 89262bf53f..f77b675c7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ *.pyc -/bin/plovr*.jar /build /examples/*.html.png /examples/example-list.js diff --git a/build.py b/build.py index b71fa93f1a..b89ffbc67f 100755 --- a/build.py +++ b/build.py @@ -90,7 +90,7 @@ SRC = [path if path.endswith('.js') if path not in SHADER_SRC] -PLOVR_JAR = 'bin/plovr-eba786b34df9.jar' +PLOVR_JAR = 'build/plovr-eba786b34df9.jar' PLOVR_JAR_MD5 = '20eac8ccc4578676511cf7ccbfc65100' PROJ4JS = 'build/proj4js/lib/proj4js-combined.js' From 15b7bb1cdbbccc361402e31d559ff6acaab2f570 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 2 Apr 2013 16:28:42 +0200 Subject: [PATCH 2/3] Add logging messages to indicate when a download is in progress --- build.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.py b/build.py index b89ffbc67f..97e08f97e8 100755 --- a/build.py +++ b/build.py @@ -410,8 +410,10 @@ virtual('plovr', PLOVR_JAR) @target(PLOVR_JAR, clean=False) def plovr_jar(t): + t.info('downloading %r', t.name) t.download('https://plovr.googlecode.com/files/' + os.path.basename(PLOVR_JAR), md5=PLOVR_JAR_MD5) + t.info('downloaded %r', t.name) @target('gh-pages', 'host-examples', 'doc', phony=True) From fe78b49e28d5a5b5405f5ea1ee357d321a063e2c Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 2 Apr 2013 16:29:11 +0200 Subject: [PATCH 3/3] Add logging messages for downloading proj4js --- build.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.py b/build.py index 97e08f97e8..ed4fa20ef9 100755 --- a/build.py +++ b/build.py @@ -532,8 +532,10 @@ def proj4js(t): @target(PROJ4JS_ZIP, clean=False) def proj4js_zip(t): + t.info('downloading %r', t.name) t.download('http://download.osgeo.org/proj4js/' + os.path.basename(t.name), md5=PROJ4JS_ZIP_MD5) + t.info('downloaded %r', t.name) @target('test', INTERNAL_SRC, PROJ4JS, 'build/test/requireall.js', phony=True)