diff --git a/.gitignore b/.gitignore index 2f70f4f045..7c37802ad3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,7 @@ /build/gh-pages /build/check-requires-timestamp /build/jsdoc-*-timestamp -/build/lint-spec-timestamp -/build/lint-src-timestamp +/build/lint-timestamp /build/ol.css /build/ol.js /build/ol-all.js diff --git a/build.py b/build.py index 97cf6e50f8..c0e7e7c1b8 100755 --- a/build.py +++ b/build.py @@ -229,15 +229,15 @@ def serve_precommit(t): t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'build/ol-all.json', 'test/test.json') -virtual('lint', 'build/lint-src-timestamp', 'build/lint-spec-timestamp', 'build/check-requires-timestamp') +virtual('lint', 'build/lint-timestamp', 'build/check-requires-timestamp') -@target('build/lint-src-timestamp', SRC, INTERNAL_SRC, EXTERNAL_SRC, EXAMPLES_SRC, precious=True) +@target('build/lint-timestamp', SRC, INTERNAL_SRC, EXTERNAL_SRC, EXAMPLES_SRC, SPEC, precious=True) def build_lint_src_timestamp(t): limited_doc_files = [path for path in ifind('externs', 'build/src/external/externs') if path.endswith('.js')] - t.run('%(GJSLINT)s', '--strict', '--limited_doc_files=%s' % (','.join(limited_doc_files),), t.newer(SRC, INTERNAL_SRC, EXTERNAL_SRC, EXAMPLES_SRC)) + t.run('%(GJSLINT)s', '--strict', '--limited_doc_files=%s' % (','.join(limited_doc_files),), t.newer(t.dependencies)) t.touch() @@ -331,12 +331,6 @@ def build_check_requires_timestamp(t): t.touch() -@target('build/lint-spec-timestamp', SPEC, precious=True) -def build_lint_spec_timestamp(t): - t.run('%(GJSLINT)s', '--strict', t.newer(SPEC)) - t.touch() - - virtual('plovr', PLOVR_JAR)