From 4ec8bf2360fdb98b0cf54cb51a7ee8b30344186a Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Sat, 23 Mar 2013 18:15:55 +0100 Subject: [PATCH] Configure Travis to build shaders with glsl-unit --- .gitignore | 1 + .travis.yml | 2 ++ build.py | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ae9e23ecc0..d458fc1282 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /bin/plovr*.jar /build/gh-pages /build/check-requires-timestamp +/build/glsl-unit /build/jsdoc-*-timestamp /build/lint-timestamp /build/ol.css diff --git a/.travis.yml b/.travis.yml index fcb325ca2c..29e2a17663 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,12 @@ 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://code.google.com/p/glsl-unit/ build/glsl-unit" before_script: - "./build.py plovr" - "./build.py serve-integration-test &" + - "rm src/ol/renderer/webgl/webgl*shader.js" - "sleep 3" script: "./build.py JSDOC=jsdoc/jsdoc integration-test" diff --git a/build.py b/build.py index 645126d6c5..9e03cf6466 100755 --- a/build.py +++ b/build.py @@ -39,7 +39,7 @@ else: variables.PYTHON = 'python' variables.PHANTOMJS = 'phantomjs' -TEMPLATE_GLSL_COMPILER_JS = '../glsl-unit/bin/template_glsl_compiler.js' +TEMPLATE_GLSL_COMPILER_JS = 'build/glsl-unit/bin/template_glsl_compiler.js' variables.BRANCH = output( '%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip()