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

Use new generate-exports.js task

Browse Source
This commit is contained in:
Tim Schaub
2014-04-09 17:31:36 -06:00
parent c692204ffd
commit 1273c26f7a
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apidoc/plugins/exports.js
+1 -1
View File
@@ -44,7 +44,7 @@ function collectOliExports(source) {
var encoding = env.conf.encoding || 'utf8'; var encoding = env.conf.encoding || 'utf8';
var fs = require('jsdoc/fs'); var fs = require('jsdoc/fs');
collectExports(fs.readFileSync('build/src/external/src/exports.js', encoding)); collectExports(fs.readFileSync('build/exports.js', encoding));
collectOliExports(fs.readFileSync('externs/oli.js', encoding)); collectOliExports(fs.readFileSync('externs/oli.js', encoding));
build.py
+5 -5
View File
@@ -90,7 +90,7 @@ EXPORTS = [path
for path in ifind('src') for path in ifind('src')
if path.endswith('.exports')] if path.endswith('.exports')]
EXTERNAL_SRC = ['build/src/external/src/exports.js'] EXTERNAL_SRC = ['build/exports.js']
EXAMPLES = [path EXAMPLES = [path
for path in ifind('examples') for path in ifind('examples')
@@ -182,7 +182,7 @@ def build_ol_css(t):
t.touch() t.touch()
@target('build/ol.js', PLOVR_JAR, SRC, EXTERNAL_SRC, SHADER_SRC, @target('build/ol.js', PLOVR_JAR, SRC, INTERNAL_SRC, EXTERNAL_SRC, SHADER_SRC,
LIBTESS_JS_SRC, 'buildcfg/base.json', 'buildcfg/ol.json') LIBTESS_JS_SRC, 'buildcfg/base.json', 'buildcfg/ol.json')
def build_ol_js(t): def build_ol_js(t):
t.output('%(JAVA)s', '-server', '-XX:+TieredCompilation', '-jar', t.output('%(JAVA)s', '-server', '-XX:+TieredCompilation', '-jar',
@@ -219,9 +219,9 @@ def build_ol_all_js(t):
PLOVR_JAR, 'build', 'buildcfg/ol-all.json') PLOVR_JAR, 'build', 'buildcfg/ol-all.json')
@target('build/src/external/src/exports.js', 'bin/generate-exports.py', EXPORTS) @target('build/exports.js', 'tasks/generate-exports.js')
def build_src_external_src_exports_js(t): def build_src_external_src_exports_js(t):
t.output('%(PYTHON)s', 'bin/generate-exports.py', '--exports', EXPORTS) t.run('node', 'tasks/generate-exports.js')
for glsl_src in GLSL_SRC: for glsl_src in GLSL_SRC:
@@ -622,7 +622,7 @@ virtual('apidoc', 'build/jsdoc-%(BRANCH)s-timestamp' % vars(variables))
@target('build/jsdoc-%(BRANCH)s-timestamp' % vars(variables), 'host-resources', @target('build/jsdoc-%(BRANCH)s-timestamp' % vars(variables), 'host-resources',
'build/src/external/src/exports.js', SRC, SHADER_SRC, 'build/exports.js', SRC, SHADER_SRC,
ifind('apidoc/template')) ifind('apidoc/template'))
def jsdoc_BRANCH_timestamp(t): def jsdoc_BRANCH_timestamp(t):
t.run('%(JSDOC)s', 'apidoc/index.md', '-c', 'apidoc/conf.json', t.run('%(JSDOC)s', 'apidoc/index.md', '-c', 'apidoc/conf.json',
buildcfg/ol-all.json
+1 -1
View File
@@ -18,7 +18,7 @@
"inputs": [ "inputs": [
"../build/src/internal/src/requireall.js", "../build/src/internal/src/requireall.js",
"../build/src/external/src/exports.js" "../build/exports.js"
] ]
} }
buildcfg/ol-simple.json
+1 -1
View File
@@ -28,7 +28,7 @@
"inputs": [ "inputs": [
"../build/src/internal/src/requireall.js", "../build/src/internal/src/requireall.js",
"../build/src/external/src/exports.js" "../build/exports.js"
], ],
"mode": "SIMPLE", "mode": "SIMPLE",
buildcfg/ol.json
+2 -1
View File
@@ -27,7 +27,8 @@
"inherits": "base.json", "inherits": "base.json",
"inputs": [ "inputs": [
"../build/src/external/src/exports.js" "../build/src/internal/src/requireall.js",
"../build/exports.js"
], ],
"output-wrapper": "// OpenLayers 3. see http://ol3js.org/\n(function(){%output%})();", "output-wrapper": "// OpenLayers 3. see http://ol3js.org/\n(function(){%output%})();",