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

Move Plovr json files in specific dir

Browse Source
This commit is contained in:
Éric Lemoine
2013-03-29 15:51:21 +01:00
parent 15ae6832d4
commit 5019f9378c
10 changed files with 106 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.py
+23 -21
View File
@@ -131,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)
@@ -156,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',
@@ -245,24 +246,24 @@ 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)
@@ -272,7 +273,8 @@ def examples_star_combined_js(name, match):
t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build',
'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(),
'build/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)
@@ -280,14 +282,14 @@ def examples_star_combined_js(name, match):
@target('serve', PLOVR_JAR, INTERNAL_SRC, 'test/requireall.js', 'examples') @target('serve', PLOVR_JAR, INTERNAL_SRC, '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')
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": [
"../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"
]
}