From 59f5484cde454ffef8a1b0dceaf199aa5ce6d7bd Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 25 Mar 2013 12:25:37 +0100 Subject: [PATCH 1/4] Rename hostexamples to host-examples --- build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.py b/build.py index bed89464e3..113eba6668 100755 --- a/build.py +++ b/build.py @@ -415,7 +415,7 @@ def plovr_jar(t): os.path.basename(PLOVR_JAR), md5=PLOVR_JAR_MD5) -@target('gh-pages', 'hostexamples', 'doc', phony=True) +@target('gh-pages', 'host-examples', 'doc', phony=True) def gh_pages(t): with t.tempdir() as tempdir: t.run('%(GIT)s', 'clone', '--branch', 'gh-pages', @@ -472,8 +472,8 @@ def split_example_file(example, dst_dir): target_require.close() -@target('hostexamples', 'build', 'examples', phony=True) -def hostexamples(t): +@target('host-examples', 'build', 'examples', phony=True) +def host_examples(t): examples_dir = 'build/gh-pages/%(BRANCH)s/examples' build_dir = 'build/gh-pages/%(BRANCH)s/build' t.rm_rf(examples_dir) @@ -508,7 +508,7 @@ def hostexamples(t): '--output_file', 'build/gh-pages/%(BRANCH)s/build/ol-deps.js') -@target('check-examples', 'hostexamples', phony=True) +@target('check-examples', 'host-examples', phony=True) def check_examples(t): examples = ['build/gh-pages/%(BRANCH)s/' + e for e in EXAMPLES] all_examples = \ From e196a9e68ed2e1b62f61aac9a2b8aab61d613353 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 25 Mar 2013 12:28:04 +0100 Subject: [PATCH 2/4] Clone jsdoc into build/jsdoc --- .gitignore | 1 + .travis.yml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d458fc1282..8e09cb42c6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /build/gh-pages /build/check-requires-timestamp /build/glsl-unit +/build/jsdoc /build/jsdoc-*-timestamp /build/lint-timestamp /build/ol.css diff --git a/.travis.yml b/.travis.yml index 12b0ddc923..f96b6dc908 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ before_install: - "sudo pip install http://closure-linter.googlecode.com/files/closure_linter-latest.tar.gz" - - "git clone https://github.com/jsdoc3/jsdoc && (cd jsdoc && git checkout master)" + - "git clone https://github.com/jsdoc3/jsdoc build/jsdoc" - "git clone https://code.google.com/p/glsl-unit/ build/glsl-unit" before_script: @@ -9,4 +9,4 @@ before_script: - "rm src/ol/renderer/webgl/*shader.js" - "sleep 3" -script: "./build.py JSDOC=jsdoc/jsdoc integration-test" +script: "./build.py JSDOC=build/jsdoc/jsdoc integration-test" From 116370f7f1d4b5647e5e6b3d393ebccbdd026ccf Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 25 Mar 2013 12:28:44 +0100 Subject: [PATCH 3/4] Only shallow clone jsdoc glsl-unit is not shallow cloned because code.google.com returns a 500 Internal Server Error. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f96b6dc908..bf1afcc310 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ before_install: - "sudo pip install http://closure-linter.googlecode.com/files/closure_linter-latest.tar.gz" - - "git clone https://github.com/jsdoc3/jsdoc build/jsdoc" + - "git clone --depth=50 https://github.com/jsdoc3/jsdoc build/jsdoc" - "git clone https://code.google.com/p/glsl-unit/ build/glsl-unit" before_script: From c22b971b450ac165d3952a9b15c91504049fbd2a Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Mon, 25 Mar 2013 12:29:22 +0100 Subject: [PATCH 4/4] Sort .gitignore --- .gitignore | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8e09cb42c6..55131480fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,24 @@ *.pyc /bin/plovr*.jar -/build/gh-pages /build/check-requires-timestamp +/build/gh-pages /build/glsl-unit /build/jsdoc /build/jsdoc-*-timestamp /build/lint-timestamp -/build/ol.css -/build/ol.js /build/ol-all.js /build/ol-simple.js /build/ol-whitespace.js -/build/src +/build/ol.css +/build/ol.js /build/phantomjs-*-windows /build/phantomjs-*-windows.zip -/build/proj4js-*.zip /build/proj4js -/examples/*.json +/build/proj4js-*.zip +/build/src /examples/*.combined.js /examples/*.html.png +/examples/*.json /examples/example-list.js /examples/example-list.xml /test/requireall.js