Use new generate-exports.js task

dasakigr · Apr 29, 2014 · 1273c26 · 1273c26
1 parent c692204
commit 1273c26
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/apidoc/plugins/exports.js b/apidoc/plugins/exports.js
@@ -44,7 +44,7 @@ function collectOliExports(source) {
 
 var encoding = env.conf.encoding || 'utf8';
 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));
 
 

diff --git a/build.py b/build.py
@@ -90,7 +90,7 @@
            for path in ifind('src')
            if path.endswith('.exports')]
 
-EXTERNAL_SRC = ['build/src/external/src/exports.js']
+EXTERNAL_SRC = ['build/exports.js']
 
 EXAMPLES = [path
             for path in ifind('examples')
@@ -182,7 +182,7 @@ def build_ol_css(t):
     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')
 def build_ol_js(t):
     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')
 
 
-@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):
-    t.output('%(PYTHON)s', 'bin/generate-exports.py', '--exports', EXPORTS)
+    t.run('node', 'tasks/generate-exports.js')
 
 
 for glsl_src in GLSL_SRC:
@@ -622,7 +622,7 @@ def plovr_jar(t):
 
 
 @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'))
 def jsdoc_BRANCH_timestamp(t):
     t.run('%(JSDOC)s', 'apidoc/index.md', '-c', 'apidoc/conf.json',

diff --git a/buildcfg/ol-all.json b/buildcfg/ol-all.json
@@ -18,7 +18,7 @@
 
   "inputs": [
     "../build/src/internal/src/requireall.js",
-    "../build/src/external/src/exports.js"
+    "../build/exports.js"
   ]
 
 }
diff --git a/buildcfg/ol-simple.json b/buildcfg/ol-simple.json
@@ -28,7 +28,7 @@
 
   "inputs": [
     "../build/src/internal/src/requireall.js",
-    "../build/src/external/src/exports.js"
+    "../build/exports.js"
   ],
 
   "mode": "SIMPLE",

diff --git a/buildcfg/ol.json b/buildcfg/ol.json
@@ -27,7 +27,8 @@
   "inherits": "base.json",
 
   "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%})();",