From 4428fe0f5a5edfc995db8837c41711b4ab60a0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Fri, 29 Mar 2013 11:33:28 +0100 Subject: [PATCH 1/7] Examples json and combined.js files in build dir --- .gitignore | 4 ++-- build.py | 25 +++++++++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 55131480fe..caa5d63250 100644 --- a/.gitignore +++ b/.gitignore @@ -16,9 +16,9 @@ /build/proj4js /build/proj4js-*.zip /build/src -/examples/*.combined.js +/build/examples/*.combined.js /examples/*.html.png -/examples/*.json +/build/examples/*.json /examples/example-list.js /examples/example-list.xml /test/requireall.js diff --git a/build.py b/build.py index 87a64948e3..85d3704a2a 100755 --- a/build.py +++ b/build.py @@ -55,9 +55,6 @@ EXAMPLES = [path if path.endswith('.html') if path != 'examples/index.html'] -EXAMPLES_JSON = [example.replace('.html', '.json') - for example in EXAMPLES] - EXAMPLES_SRC = [path for path in ifind('examples') if path.endswith('.js') @@ -68,6 +65,12 @@ EXAMPLES_SRC = [path if path != 'examples/jquery.min.js' if path != 'examples/example-list.js'] +EXAMPLES_JSON = ['build/' + example.replace('.html', '.json') + for example in EXAMPLES] + +EXAMPLES_COMBINED = ['build/' + example.replace('.html', '.combined.js') + for example in EXAMPLES] + INTERNAL_SRC = [ 'build/src/internal/src/requireall.js', 'build/src/internal/src/types.js'] @@ -222,12 +225,10 @@ def build_src_internal_types_js(t): '--typedef', 'src/objectliterals.exports') -virtual('build-examples', 'examples', (path.replace( - '.html', '.combined.js') for path in EXAMPLES)) +virtual('build-examples', 'examples', EXAMPLES_COMBINED) -virtual('examples', 'examples/example-list.xml', ( - path.replace('.html', '.json') for path in EXAMPLES)) +virtual('examples', 'examples/example-list.xml', EXAMPLES_JSON) @target('examples/example-list.xml', 'examples/example-list.js') @@ -240,12 +241,12 @@ def examples_examples_list_js(t): t.run('%(PYTHON)s', 'bin/exampleparser.py', 'examples', 'examples') -@rule(r'\Aexamples/(?P.*).json\Z') +@rule(r'\Abuild/examples/(?P.*).json\Z') def examples_star_json(name, match): def action(t): content = json.dumps({ 'id': match.group('id'), - 'inherits': '../base.json', + 'inherits': '../../base.json', 'inputs': [ 'examples/%(id)s.js' % match.groupdict(), 'build/src/internal/src/types.js', @@ -266,15 +267,15 @@ def examples_star_json(name, match): return Target(name, action=action, dependencies=dependencies) -@rule(r'\Aexamples/(?P.*).combined.js\Z') +@rule(r'\Abuild/examples/(?P.*).combined.js\Z') def examples_star_combined_js(name, match): def action(t): t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', - 'examples/%(id)s.json' % match.groupdict()) + 'build/examples/%(id)s.json' % match.groupdict()) report_sizes(t) dependencies = [PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, 'base.json', 'examples/%(id)s.js' % match.groupdict(), - 'examples/%(id)s.json' % match.groupdict()] + 'build/examples/%(id)s.json' % match.groupdict()] return Target(name, action=action, dependencies=dependencies) From 15ae6832d422a453d88c08c3821f1922c2e4daaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Fri, 29 Mar 2013 11:34:39 +0100 Subject: [PATCH 2/7] Remove unneeded test in build.py --- build.py | 1 - 1 file changed, 1 deletion(-) diff --git a/build.py b/build.py index 85d3704a2a..66c16b5ad1 100755 --- a/build.py +++ b/build.py @@ -51,7 +51,6 @@ EXTERNAL_SRC = [ EXAMPLES = [path for path in ifind('examples') - if not path.startswith('examples/standalone/') if path.endswith('.html') if path != 'examples/index.html'] From 5019f9378c96d808d077c93193abecf0a3f03769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Fri, 29 Mar 2013 15:51:21 +0100 Subject: [PATCH 3/7] Move Plovr json files in specific dir --- build.py | 44 ++++++++++++++------------ build/ol-all.json | 12 ------- build/ol.json | 37 ---------------------- base.json => buildcfg/base.json | 12 +++---- buildcfg/ol-all.json | 12 +++++++ {build => buildcfg}/ol-simple.json | 12 +++---- {build => buildcfg}/ol-whitespace.json | 12 +++---- buildcfg/ol.json | 37 ++++++++++++++++++++++ buildcfg/test.json | 16 ++++++++++ test/test.json | 16 ---------- 10 files changed, 106 insertions(+), 104 deletions(-) delete mode 100644 build/ol-all.json delete mode 100644 build/ol.json rename base.json => buildcfg/base.json (87%) create mode 100644 buildcfg/ol-all.json rename {build => buildcfg}/ol-simple.json (78%) rename {build => buildcfg}/ol-whitespace.json (80%) create mode 100644 buildcfg/ol.json create mode 100644 buildcfg/test.json delete mode 100644 test/test.json diff --git a/build.py b/build.py index 66c16b5ad1..e493cebdf6 100755 --- a/build.py +++ b/build.py @@ -131,24 +131,25 @@ def build_ol_css(t): @target('build/ol.js', PLOVR_JAR, SRC, EXTERNAL_SRC, SHADER_SRC, - 'base.json', 'build/ol.json') + 'buildcfg/base.json', 'buildcfg/ol.json') def build_ol_js(t): - t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'build/ol.json') + t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'buildcfg/ol.json') report_sizes(t) @target('build/ol-simple.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, - 'base.json', 'build/ol.json', 'build/ol-simple.json') + 'buildcfg/base.json', 'buildcfg/ol.json', 'buildcfg/ol-simple.json') def build_ol_simple_js(t): - t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'build/ol-simple.json') + t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'buildcfg/ol-simple.json') report_sizes(t) @target('build/ol-whitespace.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, - 'base.json', 'build/ol.json', 'build/ol-whitespace.json') + 'buildcfg/base.json', 'buildcfg/ol.json', + 'buildcfg/ol-whitespace.json') def build_ol_whitespace_js(t): t.output('%(JAVA)s', '-jar', PLOVR_JAR, - 'build', 'build/ol-whitespace.json') + 'build', 'buildcfg/ol-whitespace.json') report_sizes(t) @@ -156,9 +157,9 @@ virtual('build-all', 'build/ol-all.js') @target('build/ol-all.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, - 'base.json', 'build/ol-all.json') + 'buildcfg/base.json', 'buildcfg/ol-all.json') def build_ol_all_js(t): - t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'build/ol-all.json') + t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'buildcfg/ol-all.json') @target('build/src/external/externs/types.js', 'bin/generate-exports.py', @@ -245,24 +246,24 @@ def examples_star_json(name, match): def action(t): content = json.dumps({ 'id': match.group('id'), - 'inherits': '../../base.json', + 'inherits': '../../buildcfg/base.json', 'inputs': [ - 'examples/%(id)s.js' % match.groupdict(), - 'build/src/internal/src/types.js', + '../examples/%(id)s.js' % match.groupdict(), + '../build/src/internal/src/types.js', ], 'externs': [ '//json.js', '//jquery-1.7.js', - 'externs/bingmaps.js', - 'externs/bootstrap.js', - 'externs/geojson.js', - 'externs/proj4js.js', - 'externs/tilejson.js', + '../externs/bingmaps.js', + '../externs/bootstrap.js', + '../externs/geojson.js', + '../externs/proj4js.js', + '../externs/tilejson.js', ], }) with open(t.name, 'w') as f: f.write(content) - dependencies = [__file__, 'base.json'] + dependencies = [__file__, 'buildcfg/base.json'] return Target(name, action=action, dependencies=dependencies) @@ -272,7 +273,8 @@ def examples_star_combined_js(name, match): t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'build/examples/%(id)s.json' % match.groupdict()) report_sizes(t) - dependencies = [PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, 'base.json', + dependencies = [PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, + 'buildcfg/base.json', 'examples/%(id)s.js' % match.groupdict(), 'build/examples/%(id)s.json' % match.groupdict()] return Target(name, action=action, dependencies=dependencies) @@ -280,14 +282,14 @@ def examples_star_combined_js(name, match): @target('serve', PLOVR_JAR, INTERNAL_SRC, 'test/requireall.js', 'examples') def serve(t): - t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'build/ol.json', - 'build/ol-all.json', EXAMPLES_JSON, 'test/test.json') + t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'buildcfg/ol.json', + 'buildcfg/ol-all.json', EXAMPLES_JSON, 'buildcfg/test.json') @target('serve-integration-test', PLOVR_JAR, INTERNAL_SRC) def serve_precommit(t): t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', - 'build/ol-all.json', 'test/test.json') + 'buildcfg/ol-all.json', 'buildcfg/test.json') virtual('lint', 'build/lint-timestamp', 'build/check-requires-timestamp') diff --git a/build/ol-all.json b/build/ol-all.json deleted file mode 100644 index c0d94fd4e6..0000000000 --- a/build/ol-all.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - - "id": "ol-all", - - "inherits": "../base.json", - - "inputs": [ - "build/src/internal/src/requireall.js", - "build/src/internal/src/types.js" - ] - -} diff --git a/build/ol.json b/build/ol.json deleted file mode 100644 index 7a44e1cba6..0000000000 --- a/build/ol.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - - "id": "ol", - - "css-allowed-unrecognized-properties": [ - "user-select" - ], - - "css-inputs": [ - "css/ol.css" - ], - - "css-output-file": "build/ol.css", - - "externs": [ - "//json.js", - "build/src/external/externs/types.js", - "externs/bingmaps.js", - "externs/geojson.js", - "externs/proj4js.js", - "externs/tilejson.js" - ], - - "inherits": "../base.json", - - "inputs": [ - "build/src/external/src/exports.js", - "build/src/external/src/types.js" - ], - - "output-wrapper": "(function(){%output%})();", - - "paths": [ - "src" - ] - -} diff --git a/base.json b/buildcfg/base.json similarity index 87% rename from base.json rename to buildcfg/base.json index 7862da8233..f6c8eee60f 100644 --- a/base.json +++ b/buildcfg/base.json @@ -40,10 +40,10 @@ "externs": [ "//json.js", - "externs/bingmaps.js", - "externs/geojson.js", - "externs/proj4js.js", - "externs/tilejson.js" + "../externs/bingmaps.js", + "../externs/geojson.js", + "../externs/proj4js.js", + "../externs/tilejson.js" ], "level": "VERBOSE", @@ -51,8 +51,8 @@ "mode": "ADVANCED", "paths": [ - "build/src/internal/src", - "src" + "../build/src/internal/src", + "../src" ], "treat-warnings-as-errors": false diff --git a/buildcfg/ol-all.json b/buildcfg/ol-all.json new file mode 100644 index 0000000000..f73cc58f3b --- /dev/null +++ b/buildcfg/ol-all.json @@ -0,0 +1,12 @@ +{ + + "id": "ol-all", + + "inherits": "base.json", + + "inputs": [ + "../build/src/internal/src/requireall.js", + "../build/src/internal/src/types.js" + ] + +} diff --git a/build/ol-simple.json b/buildcfg/ol-simple.json similarity index 78% rename from build/ol-simple.json rename to buildcfg/ol-simple.json index f6163a713b..3f2b82544e 100644 --- a/build/ol-simple.json +++ b/buildcfg/ol-simple.json @@ -14,17 +14,17 @@ "externs": [ "//json.js", - "externs/bingmaps.js", - "externs/geojson.js", - "externs/proj4js.js", - "externs/tilejson.js" + "../externs/bingmaps.js", + "../externs/geojson.js", + "../externs/proj4js.js", + "../externs/tilejson.js" ], "inherits": "ol.json", "inputs": [ - "build/src/internal/src/requireall.js", - "build/src/internal/src/types.js" + "../build/src/internal/src/requireall.js", + "../build/src/internal/src/types.js" ], "mode": "SIMPLE", diff --git a/build/ol-whitespace.json b/buildcfg/ol-whitespace.json similarity index 80% rename from build/ol-whitespace.json rename to buildcfg/ol-whitespace.json index 77cdb397c2..94089465b6 100644 --- a/build/ol-whitespace.json +++ b/buildcfg/ol-whitespace.json @@ -15,17 +15,17 @@ "externs": [ "//json.js", - "externs/bingmaps.js", - "externs/geojson.js", - "externs/proj4js.js", - "externs/tilejson.js" + "../externs/bingmaps.js", + "../externs/geojson.js", + "../externs/proj4js.js", + "../externs/tilejson.js" ], "inherits": "ol.json", "inputs": [ - "build/src/internal/src/requireall.js", - "build/src/internal/src/types.js" + "../build/src/internal/src/requireall.js", + "../build/src/internal/src/types.js" ], "mode": "WHITESPACE", diff --git a/buildcfg/ol.json b/buildcfg/ol.json new file mode 100644 index 0000000000..28f8d9c4ec --- /dev/null +++ b/buildcfg/ol.json @@ -0,0 +1,37 @@ +{ + + "id": "ol", + + "css-allowed-unrecognized-properties": [ + "user-select" + ], + + "css-inputs": [ + "../css/ol.css" + ], + + "css-output-file": "../build/ol.css", + + "externs": [ + "//json.js", + "../build/src/external/externs/types.js", + "../externs/bingmaps.js", + "../externs/geojson.js", + "../externs/proj4js.js", + "../externs/tilejson.js" + ], + + "inherits": "base.json", + + "inputs": [ + "../build/src/external/src/exports.js", + "../build/src/external/src/types.js" + ], + + "output-wrapper": "(function(){%output%})();", + + "paths": [ + "../src" + ] + +} diff --git a/buildcfg/test.json b/buildcfg/test.json new file mode 100644 index 0000000000..24d0b01af5 --- /dev/null +++ b/buildcfg/test.json @@ -0,0 +1,16 @@ +{ + + "id": "test", + + "inherits": "base.json", + + "inputs": [ + "../test/requireall.js" + ], + + "paths": [ + "../src", + "../test" + ] + +} diff --git a/test/test.json b/test/test.json deleted file mode 100644 index 1cc6a9995a..0000000000 --- a/test/test.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - - "id": "test", - - "inherits": "../base.json", - - "inputs": [ - "test/requireall.js" - ], - - "paths": [ - "src", - "test" - ] - -} From b40aafc696836c881fb7a8f6f74c260d72659c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Fri, 29 Mar 2013 16:05:56 +0100 Subject: [PATCH 4/7] Tests requireall.js generated in build dir --- .gitignore | 2 +- build.py | 7 ++++--- buildcfg/test.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index caa5d63250..6865fd705e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,9 +16,9 @@ /build/proj4js /build/proj4js-*.zip /build/src +/build/test/requireall.js /build/examples/*.combined.js /examples/*.html.png /build/examples/*.json /examples/example-list.js /examples/example-list.xml -/test/requireall.js diff --git a/build.py b/build.py index e493cebdf6..91bc071f21 100755 --- a/build.py +++ b/build.py @@ -213,7 +213,7 @@ def build_src_internal_src_requireall_js(t): _build_require_list(t.dependencies, t.name) -@target('test/requireall.js', SPEC) +@target('build/test/requireall.js', SPEC) def build_test_requireall_js(t): _build_require_list(t.dependencies, t.name) @@ -280,7 +280,8 @@ def examples_star_combined_js(name, match): return Target(name, action=action, dependencies=dependencies) -@target('serve', PLOVR_JAR, INTERNAL_SRC, 'test/requireall.js', 'examples') +@target('serve', PLOVR_JAR, INTERNAL_SRC, 'build/test/requireall.js', + 'examples') def serve(t): t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'buildcfg/ol.json', 'buildcfg/ol-all.json', EXAMPLES_JSON, 'buildcfg/test.json') @@ -533,7 +534,7 @@ def proj4js_zip(t): os.path.basename(t.name), md5=PROJ4JS_ZIP_MD5) -@target('test', INTERNAL_SRC, PROJ4JS, 'test/requireall.js', phony=True) +@target('test', INTERNAL_SRC, PROJ4JS, 'build/test/requireall.js', phony=True) def test(t): t.run('%(PHANTOMJS)s', 'test/mocha-phantomjs.coffee', 'test/ol.html') diff --git a/buildcfg/test.json b/buildcfg/test.json index 24d0b01af5..22f1c70c0b 100644 --- a/buildcfg/test.json +++ b/buildcfg/test.json @@ -5,7 +5,7 @@ "inherits": "base.json", "inputs": [ - "../test/requireall.js" + "../build/test/requireall.js" ], "paths": [ From 35fc2882b46d4110bf8d30dd2be778782cbe5bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Fri, 29 Mar 2013 16:09:38 +0100 Subject: [PATCH 5/7] .gitignore clean-up --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6865fd705e..756b8aa1a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ *.pyc /bin/plovr*.jar /build/check-requires-timestamp +/build/examples/*.combined.js +/build/examples/*.json /build/gh-pages /build/glsl-unit /build/jsdoc @@ -17,8 +19,6 @@ /build/proj4js-*.zip /build/src /build/test/requireall.js -/build/examples/*.combined.js /examples/*.html.png -/build/examples/*.json /examples/example-list.js /examples/example-list.xml From b87fcbb4c4735b8a39eba7c898650ee232e8fd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Fri, 29 Mar 2013 16:14:11 +0100 Subject: [PATCH 6/7] Move hosted examples loader our of build dir The build dir is now empty, and therefore unexisting for Git. --- {build => bin}/loader_hosted_examples.js | 0 build.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename {build => bin}/loader_hosted_examples.js (100%) diff --git a/build/loader_hosted_examples.js b/bin/loader_hosted_examples.js similarity index 100% rename from build/loader_hosted_examples.js rename to bin/loader_hosted_examples.js diff --git a/build.py b/build.py index 91bc071f21..b71fa93f1a 100755 --- a/build.py +++ b/build.py @@ -485,7 +485,7 @@ def host_examples(t): t.cp_r('examples/data', examples_dir + '/data') t.cp_r('examples/bootstrap', examples_dir + '/bootstrap') t.cp_r('examples/font-awesome', examples_dir + '/font-awesome') - t.cp('build/loader_hosted_examples.js', examples_dir + '/loader.js') + t.cp('bin/loader_hosted_examples.js', examples_dir + '/loader.js') t.cp('build/ol.js', 'build/ol-simple.js', 'build/ol-whitespace.js', 'build/ol.css', build_dir) t.cp('examples/index.html', 'examples/example-list.js', From 7f85dfbf1c0a011a4785dc057a5dd0ecab65cbe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Fri, 29 Mar 2013 16:32:43 +0100 Subject: [PATCH 7/7] Git can now ignore the entire build dir --- .gitignore | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 756b8aa1a2..89262bf53f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,6 @@ *.pyc /bin/plovr*.jar -/build/check-requires-timestamp -/build/examples/*.combined.js -/build/examples/*.json -/build/gh-pages -/build/glsl-unit -/build/jsdoc -/build/jsdoc-*-timestamp -/build/lint-timestamp -/build/ol-all.js -/build/ol-simple.js -/build/ol-whitespace.js -/build/ol.css -/build/ol.js -/build/phantomjs-*-windows -/build/phantomjs-*-windows.zip -/build/proj4js -/build/proj4js-*.zip -/build/src -/build/test/requireall.js +/build /examples/*.html.png /examples/example-list.js /examples/example-list.xml