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"