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

Merge pull request #446 from elemoine/build

Browse Source 
Put all build artifacts in a single directory
This commit is contained in:
Éric Lemoine
2013-03-29 08:34:20 -07:00
parent dac2a5ad5a 7f85dfbf1c
commit 660537ed2b
12 changed files with 124 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -19
View File
@@ -1,24 +1,6 @@
*.pyc *.pyc
/bin/plovr*.jar /bin/plovr*.jar
/build/check-requires-timestamp /build
/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
/examples/*.combined.js
/examples/*.html.png /examples/*.html.png
/examples/*.json
/examples/example-list.js /examples/example-list.js
/examples/example-list.xml /examples/example-list.xml
/test/requireall.js
build/loader_hosted_examples.js → bin/loader_hosted_examples.js
View File
build.py
+40 -37
View File
@@ -51,13 +51,9 @@ EXTERNAL_SRC = [
EXAMPLES = [path EXAMPLES = [path
for path in ifind('examples') for path in ifind('examples')
if not path.startswith('examples/standalone/')
if path.endswith('.html') if path.endswith('.html')
if path != 'examples/index.html'] if path != 'examples/index.html']
EXAMPLES_JSON = [example.replace('.html', '.json')
for example in EXAMPLES]
EXAMPLES_SRC = [path EXAMPLES_SRC = [path
for path in ifind('examples') for path in ifind('examples')
if path.endswith('.js') if path.endswith('.js')
@@ -68,6 +64,12 @@ EXAMPLES_SRC = [path
if path != 'examples/jquery.min.js' if path != 'examples/jquery.min.js'
if path != 'examples/example-list.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 = [ INTERNAL_SRC = [
'build/src/internal/src/requireall.js', 'build/src/internal/src/requireall.js',
'build/src/internal/src/types.js'] 'build/src/internal/src/types.js']
@@ -129,24 +131,25 @@ def build_ol_css(t):
@target('build/ol.js', PLOVR_JAR, SRC, EXTERNAL_SRC, SHADER_SRC, @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): 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) report_sizes(t)
@target('build/ol-simple.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, @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): 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) report_sizes(t)
@target('build/ol-whitespace.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, @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): def build_ol_whitespace_js(t):
t.output('%(JAVA)s', '-jar', PLOVR_JAR, t.output('%(JAVA)s', '-jar', PLOVR_JAR,
'build', 'build/ol-whitespace.json') 'build', 'buildcfg/ol-whitespace.json')
report_sizes(t) report_sizes(t)
@@ -154,9 +157,9 @@ virtual('build-all', 'build/ol-all.js')
@target('build/ol-all.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, @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): 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', @target('build/src/external/externs/types.js', 'bin/generate-exports.py',
@@ -210,7 +213,7 @@ def build_src_internal_src_requireall_js(t):
_build_require_list(t.dependencies, t.name) _build_require_list(t.dependencies, t.name)
@target('test/requireall.js', SPEC) @target('build/test/requireall.js', SPEC)
def build_test_requireall_js(t): def build_test_requireall_js(t):
_build_require_list(t.dependencies, t.name) _build_require_list(t.dependencies, t.name)
@@ -222,12 +225,10 @@ def build_src_internal_types_js(t):
'--typedef', 'src/objectliterals.exports') '--typedef', 'src/objectliterals.exports')
virtual('build-examples', 'examples', (path.replace( virtual('build-examples', 'examples', EXAMPLES_COMBINED)
'.html', '.combined.js') for path in EXAMPLES))
virtual('examples', 'examples/example-list.xml', ( virtual('examples', 'examples/example-list.xml', EXAMPLES_JSON)
path.replace('.html', '.json') for path in EXAMPLES))
@target('examples/example-list.xml', 'examples/example-list.js') @target('examples/example-list.xml', 'examples/example-list.js')
@@ -240,54 +241,56 @@ def examples_examples_list_js(t):
t.run('%(PYTHON)s', 'bin/exampleparser.py', 'examples', 'examples') t.run('%(PYTHON)s', 'bin/exampleparser.py', 'examples', 'examples')
@rule(r'\Aexamples/(?P<id>.*).json\Z') @rule(r'\Abuild/examples/(?P<id>.*).json\Z')
def examples_star_json(name, match): def examples_star_json(name, match):
def action(t): def action(t):
content = json.dumps({ content = json.dumps({
'id': match.group('id'), 'id': match.group('id'),
'inherits': '../base.json', 'inherits': '../../buildcfg/base.json',
'inputs': [ 'inputs': [
'examples/%(id)s.js' % match.groupdict(), '../examples/%(id)s.js' % match.groupdict(),
'build/src/internal/src/types.js', '../build/src/internal/src/types.js',
], ],
'externs': [ 'externs': [
'//json.js', '//json.js',
'//jquery-1.7.js', '//jquery-1.7.js',
'externs/bingmaps.js', '../externs/bingmaps.js',
'externs/bootstrap.js', '../externs/bootstrap.js',
'externs/geojson.js', '../externs/geojson.js',
'externs/proj4js.js', '../externs/proj4js.js',
'externs/tilejson.js', '../externs/tilejson.js',
], ],
}) })
with open(t.name, 'w') as f: with open(t.name, 'w') as f:
f.write(content) f.write(content)
dependencies = [__file__, 'base.json'] dependencies = [__file__, 'buildcfg/base.json']
return Target(name, action=action, dependencies=dependencies) return Target(name, action=action, dependencies=dependencies)
@rule(r'\Aexamples/(?P<id>.*).combined.js\Z') @rule(r'\Abuild/examples/(?P<id>.*).combined.js\Z')
def examples_star_combined_js(name, match): def examples_star_combined_js(name, match):
def action(t): def action(t):
t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build',
'examples/%(id)s.json' % match.groupdict()) 'build/examples/%(id)s.json' % match.groupdict())
report_sizes(t) 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(), '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) 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): def serve(t):
t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'build/ol.json', t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'buildcfg/ol.json',
'build/ol-all.json', EXAMPLES_JSON, 'test/test.json') 'buildcfg/ol-all.json', EXAMPLES_JSON, 'buildcfg/test.json')
@target('serve-integration-test', PLOVR_JAR, INTERNAL_SRC) @target('serve-integration-test', PLOVR_JAR, INTERNAL_SRC)
def serve_precommit(t): def serve_precommit(t):
t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 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') virtual('lint', 'build/lint-timestamp', 'build/check-requires-timestamp')
@@ -482,7 +485,7 @@ def host_examples(t):
t.cp_r('examples/data', examples_dir + '/data') t.cp_r('examples/data', examples_dir + '/data')
t.cp_r('examples/bootstrap', examples_dir + '/bootstrap') t.cp_r('examples/bootstrap', examples_dir + '/bootstrap')
t.cp_r('examples/font-awesome', examples_dir + '/font-awesome') 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', t.cp('build/ol.js', 'build/ol-simple.js', 'build/ol-whitespace.js',
'build/ol.css', build_dir) 'build/ol.css', build_dir)
t.cp('examples/index.html', 'examples/example-list.js', t.cp('examples/index.html', 'examples/example-list.js',
@@ -531,7 +534,7 @@ def proj4js_zip(t):
os.path.basename(t.name), md5=PROJ4JS_ZIP_MD5) 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): def test(t):
t.run('%(PHANTOMJS)s', 'test/mocha-phantomjs.coffee', 'test/ol.html') t.run('%(PHANTOMJS)s', 'test/mocha-phantomjs.coffee', 'test/ol.html')
build/ol-all.json
-12
View File
@@ -1,12 +0,0 @@
{
"id": "ol-all",
"inherits": "../base.json",
"inputs": [
"build/src/internal/src/requireall.js",
"build/src/internal/src/types.js"
]
}
build/ol.json
-37
View File
@@ -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"
]
}
base.json → buildcfg/base.json
+6 -6
View File
@@ -40,10 +40,10 @@
"externs": [ "externs": [
"//json.js", "//json.js",
"externs/bingmaps.js", "../externs/bingmaps.js",
"externs/geojson.js", "../externs/geojson.js",
"externs/proj4js.js", "../externs/proj4js.js",
"externs/tilejson.js" "../externs/tilejson.js"
], ],
"level": "VERBOSE", "level": "VERBOSE",
@@ -51,8 +51,8 @@
"mode": "ADVANCED", "mode": "ADVANCED",
"paths": [ "paths": [
"build/src/internal/src", "../build/src/internal/src",
"src" "../src"
], ],
"treat-warnings-as-errors": false "treat-warnings-as-errors": false
buildcfg/ol-all.json
+12
View File
@@ -0,0 +1,12 @@
{
"id": "ol-all",
"inherits": "base.json",
"inputs": [
"../build/src/internal/src/requireall.js",
"../build/src/internal/src/types.js"
]
}
build/ol-simple.json → buildcfg/ol-simple.json
+6 -6
View File
@@ -14,17 +14,17 @@
"externs": [ "externs": [
"//json.js", "//json.js",
"externs/bingmaps.js", "../externs/bingmaps.js",
"externs/geojson.js", "../externs/geojson.js",
"externs/proj4js.js", "../externs/proj4js.js",
"externs/tilejson.js" "../externs/tilejson.js"
], ],
"inherits": "ol.json", "inherits": "ol.json",
"inputs": [ "inputs": [
"build/src/internal/src/requireall.js", "../build/src/internal/src/requireall.js",
"build/src/internal/src/types.js" "../build/src/internal/src/types.js"
], ],
"mode": "SIMPLE", "mode": "SIMPLE",
build/ol-whitespace.json → buildcfg/ol-whitespace.json
+6 -6
View File
@@ -15,17 +15,17 @@
"externs": [ "externs": [
"//json.js", "//json.js",
"externs/bingmaps.js", "../externs/bingmaps.js",
"externs/geojson.js", "../externs/geojson.js",
"externs/proj4js.js", "../externs/proj4js.js",
"externs/tilejson.js" "../externs/tilejson.js"
], ],
"inherits": "ol.json", "inherits": "ol.json",
"inputs": [ "inputs": [
"build/src/internal/src/requireall.js", "../build/src/internal/src/requireall.js",
"build/src/internal/src/types.js" "../build/src/internal/src/types.js"
], ],
"mode": "WHITESPACE", "mode": "WHITESPACE",
buildcfg/ol.json
+37
View File
@@ -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"
]
}
buildcfg/test.json
+16
View File
@@ -0,0 +1,16 @@
{
"id": "test",
"inherits": "base.json",
"inputs": [
"../build/test/requireall.js"
],
"paths": [
"../src",
"../test"
]
}
test/test.json
-16
View File
@@ -1,16 +0,0 @@
{
"id": "test",
"inherits": "../base.json",
"inputs": [
"test/requireall.js"
],
"paths": [
"src",
"test"
]
}