diff --git a/build.py b/build.py index 54918a65ed..0129d55881 100755 --- a/build.py +++ b/build.py @@ -172,11 +172,9 @@ def build_ol_css(t): t.touch() -@target('build/ol.js', PLOVR_JAR, SRC, EXPORTS, SHADER_SRC, - 'buildcfg/base.json', 'buildcfg/ol.json') -def build_ol_js(t): - t.output('%(JAVA)s', '-server', '-XX:+TieredCompilation', '-jar', - PLOVR_JAR, 'build', 'buildcfg/ol.json') +@target('build/ol.js', SRC, SHADER_SRC, 'buildcfg/ol.json') +def build_ol_new_js(t): + t.run('node', 'tasks/build.js', 'buildcfg/ol.json', 'build/ol.js') report_sizes(t) diff --git a/buildcfg/ol.json b/buildcfg/ol.json index 77513d9363..fb704efba2 100644 --- a/buildcfg/ol.json +++ b/buildcfg/ol.json @@ -1,39 +1,63 @@ { - - "id": "ol", - - "css-allowed-unrecognized-properties": [ - "user-select" - ], - - "css-inputs": [ - "../css/ol.css" - ], - - "css-output-file": "../build/ol.css", - - "externs": [ - "../externs/bingmaps.js", - "../externs/closure-compiler.js", - "../externs/geojson.js", - "../externs/oli.js", - "../externs/olx.js", - "../externs/proj4js.js", - "../externs/tilejson.js", - "../externs/topojson.js", - "../externs/vbarray.js" - ], - - "inherits": "base.json", - - "inputs": [ - "../build/exports.js" - ], - - "output-wrapper": "// OpenLayers 3. see http://ol3js.org/\n(function(){%output%})();", - - "paths": [ - "../src" - ] - + "exports": ["*"], + "src": ["src/**/*.js"], + "compile": { + "externs": [ + "externs/bingmaps.js", + "externs/closure-compiler.js", + "externs/geojson.js", + "externs/oli.js", + "externs/olx.js", + "externs/proj4js.js", + "externs/tilejson.js", + "externs/topojson.js", + "externs/vbarray.js" + ], + "define": [ + "goog.dom.ASSUME_STANDARDS_MODE=true", + "goog.DEBUG=false" + ], + "jscomp_error": [ + "accessControls", + "ambiguousFunctionDecl", + "checkDebuggerStatement", + "checkEventfulObjectDisposal", + "checkProvides", + "checkRegExp", + "checkStructDictInheritance", + "checkTypes", + "checkVars", + "const", + "constantProperty", + "deprecated", + "duplicate", + "duplicateMessage", + "es3", + "externsValidation", + "fileoverviewTags", + "globalThis", + "internetExplorerChecks", + "invalidCasts", + "misplacedTypeAnnotation", + "missingProperties", + "nonStandardJsDocs", + "strictModuleDepCheck", + "suspiciousCode", + "typeInvalidation", + "tweakValidation", + "undefinedNames", + "undefinedVars", + "unknownDefines", + "uselessCode", + "violatedModuleDep", + "visibility" + ], + "jscomp_off": [ + "es5Strict" + ], + "compilation_level": "ADVANCED_OPTIMIZATIONS", + "output_wrapper": "// OpenLayers 3. See http://ol3.js.org/\n(function(){%output%})();", + "use_types_for_optimization": true, + "manage_closure_dependencies": true + } }