ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Configure Travis to build shaders with glsl-unit

Browse Source
This commit is contained in:
Tom Payne
2013-03-23 18:15:55 +01:00
parent 711e4be19e
commit 4ec8bf2360
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,6 +2,7 @@
/bin/plovr*.jar /bin/plovr*.jar
/build/gh-pages /build/gh-pages
/build/check-requires-timestamp /build/check-requires-timestamp
/build/glsl-unit
/build/jsdoc-*-timestamp /build/jsdoc-*-timestamp
/build/lint-timestamp /build/lint-timestamp
/build/ol.css /build/ol.css

2
.travis.yml
View File

@@ -1,10 +1,12 @@
before_install: before_install:
- "sudo pip install http://closure-linter.googlecode.com/files/closure_linter-latest.tar.gz" - "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 && (cd jsdoc && git checkout master)"
- "git clone https://code.google.com/p/glsl-unit/ build/glsl-unit"
before_script: before_script:
- "./build.py plovr" - "./build.py plovr"
- "./build.py serve-integration-test &" - "./build.py serve-integration-test &"
- "rm src/ol/renderer/webgl/webgl*shader.js"
- "sleep 3" - "sleep 3"
script: "./build.py JSDOC=jsdoc/jsdoc integration-test" script: "./build.py JSDOC=jsdoc/jsdoc integration-test"

2
build.py
View File

@@ -39,7 +39,7 @@ else:
variables.PYTHON = 'python' variables.PYTHON = 'python'
variables.PHANTOMJS = 'phantomjs' 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( variables.BRANCH = output(
'%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip() '%(GIT)s', 'rev-parse', '--abbrev-ref', 'HEAD').strip()