Merge pull request #2297 from elemoine/remove-plovr

Remove Plovr
2014-07-04 22:34:26 +02:00
parent 207e23099a e0a8bb045a
commit 297503e7c9
15 changed files with 2722 additions and 440 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,8 @@ before_install:
  - "npm install -g npm && npm install"

 before_script:
-  - "./build.py plovr"
-  - "./build.py serve-integration-test &"
+  - "./build.py serve &"
  - "rm src/ol/renderer/webgl/*shader.js"
  - "sleep 3"

-script: "./build.py integration-test"
+script: "./build.py ci"
--- a/build.py
+++ b/build.py
@@ -129,9 +129,6 @@ SRC = [path
       if path.endswith('.js')
       if path not in SHADER_SRC]

-PLOVR_JAR = 'build/plovr-81ed862.jar'
-PLOVR_JAR_MD5 = '1c752daaf11ad6220b298e7d2ee2b87d'
-
 PROJ4JS = 'build/proj4js/lib/proj4js-combined.js'
 PROJ4JS_ZIP = 'build/proj4js-1.1.0.zip'
 PROJ4JS_ZIP_MD5 = '17caad64cf6ebc6e6fe62f292b134897'
@@ -153,7 +150,7 @@ def report_sizes(t):
 virtual('default', 'build')


-virtual('integration-test', 'lint', 'jshint', 'build', 'build-all',
+virtual('ci', 'lint', 'jshint', 'build', 'build-all',
        'test', 'build/examples/all.combined.js', 'check-examples', 'apidoc')


@@ -172,39 +169,30 @@ 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)


-@target('build/ol-simple.js', PLOVR_JAR, SRC, EXPORTS, SHADER_SRC,
-        'buildcfg/base.json', 'buildcfg/ol.json', 'buildcfg/ol-simple.json')
+@target('build/ol-simple.js', SRC, SHADER_SRC, 'buildcfg/ol-simple.json')
 def build_ol_simple_js(t):
-    t.output('%(JAVA)s', '-server', '-XX:+TieredCompilation', '-jar',
-            PLOVR_JAR, 'build', 'buildcfg/ol-simple.json')
+    t.run('node', 'tasks/build.js', 'buildcfg/ol-simple.json', 'build/ol-simple.js')
    report_sizes(t)


-@target('build/ol-whitespace.js', PLOVR_JAR, SRC, EXPORTS,
-        SHADER_SRC, 'buildcfg/base.json', 'buildcfg/ol.json',
-        'buildcfg/ol-whitespace.json')
+@target('build/ol-whitespace.js', SRC, SHADER_SRC, 'buildcfg/ol-whitespace.json')
 def build_ol_whitespace_js(t):
-    t.output('%(JAVA)s', '-server', '-XX:+TieredCompilation', '-jar',
-            PLOVR_JAR, 'build', 'buildcfg/ol-whitespace.json')
+    t.run('node', 'tasks/build.js', 'buildcfg/ol-whitespace.json', 'build/ol-whitespace.js')
    report_sizes(t)


 virtual('build-all', 'build/ol-all.js')


-@target('build/ol-all.js', PLOVR_JAR, SRC, EXPORTS, SHADER_SRC,
-        'buildcfg/base.json', 'buildcfg/ol-all.json')
+@target('build/ol-all.js', SRC, SHADER_SRC, 'buildcfg/ol-all.json')
 def build_ol_all_js(t):
-    t.output('%(JAVA)s', '-server', '-XX:+TieredCompilation', '-jar',
-            PLOVR_JAR, 'build', 'buildcfg/ol-all.json')
+    t.run('node', 'tasks/build.js', 'buildcfg/ol-all.json', 'build/ol-all.js')


@target(EXPORTS, SRC)
@@ -254,11 +242,11 @@ def examples_examples_list_js(t):
    t.run('%(PYTHON)s', 'bin/exampleparser.py', 'examples', 'examples')


-@target('build/examples/all.combined.js', 'build/examples/all.js', PLOVR_JAR,
-        SRC, SHADER_SRC, 'buildcfg/base.json', 'build/examples/all.json')
+@target('build/examples/all.combined.js', 'build/examples/all.js',
+        SRC, SHADER_SRC, 'buildcfg/examples-all.json')
 def build_examples_all_combined_js(t):
-    t.output('%(JAVA)s', '-server', '-XX:+TieredCompilation', '-jar',
-            PLOVR_JAR, 'build', 'buildcfg/examples-all.json')
+    t.run('node', 'tasks/build.js', 'buildcfg/examples-all.json',
+          'build/examples/all.combined.js')
    report_sizes(t)


@@ -276,55 +264,91 @@ def examples_star_json(name, match):
        # Note that we use the proper way in buildcfg/examples-all.json, which
        # is only used to check the examples code using the compiler.
        content = json.dumps({
-            'id': match.group('id'),
-            'inherits': '../../buildcfg/base.json',
-            'inputs': [
-                '../examples/%(id)s.js' % match.groupdict()
+          "exports": [],
+          "src": ["src/**/*.js", "examples/%(id)s.js" % match.groupdict()],
+          "compile": {
+            "externs": [
+              "externs/bingmaps.js",
+              "externs/bootstrap.js",
+              "externs/closure-compiler.js",
+              "externs/example.js",
+              "externs/geojson.js",
+              "externs/jquery-1.7.js",
+              "externs/oli.js",
+              "externs/olx.js",
+              "externs/proj4js.js",
+              "externs/tilejson.js",
+              "externs/topojson.js",
+              "externs/vbarray.js"
            ],
-            'externs': [
-                '//jquery-1.7.js',
-                '../externs/bingmaps.js',
-                '../externs/bootstrap.js',
-                '../externs/closure-compiler.js',
-                '../externs/example.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",
+            "output_wrapper": "// OpenLayers 3. See http://ol3.js.org/\n(function(){%output%})();",
+            "use_types_for_optimization": True,
+            "manage_closure_dependencies": True
+          }
        })
        with open(t.name, 'wb') as f:
            f.write(content)
-    dependencies = [__file__, 'buildcfg/base.json']
-    return Target(name, action=action, dependencies=dependencies)
+    return Target(name, action=action, dependencies=[__file__])


@rule(r'\Abuild/examples/(?P<id>.*).combined.js\Z')
 def examples_star_combined_js(name, match):
    def action(t):
-        t.output('%(JAVA)s', '-server', '-XX:+TieredCompilation', '-jar',
-                PLOVR_JAR, 'build', 'build/examples/%(id)s.json' %
-                match.groupdict())
+        config = 'build/examples/%(id)s.json' % match.groupdict()
+        t.run('node', 'tasks/build.js', config, name)
        report_sizes(t)
-    dependencies = [PLOVR_JAR, SRC, SHADER_SRC, 'buildcfg/base.json',
+    dependencies = [SRC, SHADER_SRC,
                    'examples/%(id)s.js' % match.groupdict(),
                    'build/examples/%(id)s.json' % match.groupdict()]
    return Target(name, action=action, dependencies=dependencies)


-@target('serve', PLOVR_JAR, 'test-deps', 'examples')
+@target('serve', PROJ4JS, 'examples')
 def serve(t):
-    t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'buildcfg/ol.json',
-          'buildcfg/ol-all.json', EXAMPLES_JSON, 'buildcfg/test.json')
-
-
-@target('serve-integration-test', PLOVR_JAR)
-def serve_precommit(t):
-    t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve',
-          'buildcfg/ol-all.json', 'buildcfg/test.json')
+    t.run('node', 'tasks/serve.js')


 virtual('lint', 'build/lint-timestamp', 'build/check-requires-timestamp',
@@ -375,19 +399,19 @@ def _strip_comments(lines):

@target('build/check-requires-timestamp', SRC, EXAMPLES_SRC, SHADER_SRC, SPEC)
 def build_check_requires_timestamp(t):
-    from zipfile import ZipFile
    unused_count = 0
    all_provides = set()
-    zf = ZipFile(PLOVR_JAR)
-    for zi in zf.infolist():
-        if zi.filename.endswith('.js'):
-            if not zi.filename.startswith('closure/goog/'):
+    closure_lib_path = output('node', '-e',
+        'process.stdout.write(require("closure-util").getLibraryPath())')
+    for filename in ifind(closure_lib_path):
+        if filename.endswith('.js'):
+            if not re.match(r'.*/closure/goog/', filename):
                continue
            # Skip goog.i18n because it contains so many modules that it causes
            # the generated regular expression to exceed Python's limits
-            if zi.filename.startswith('closure/goog/i18n/'):
+            if re.match(r'.*/closure/goog/i18n/', filename):
                continue
-            for line in zf.open(zi, 'rU'):
+            for line in open(filename, 'rU'):
                m = re.match(r'goog.provide\(\'(.*)\'\);', line)
                if m:
                    all_provides.add(m.group(1))
@@ -546,17 +570,6 @@ def build_check_whitespace_timestamp(t):
    t.touch()


-virtual('plovr', PLOVR_JAR)
-
-
-@target(PLOVR_JAR, clean=False)
-def plovr_jar(t):
-    t.info('downloading %r', t.name)
-    t.download('https://plovr.googlecode.com/files/' +
-               os.path.basename(PLOVR_JAR), md5=PLOVR_JAR_MD5)
-    t.info('downloaded %r', t.name)
-
-
 virtual('apidoc', 'build/jsdoc-%(BRANCH)s-timestamp' % vars(variables))


@@ -613,6 +626,8 @@ def host_examples(t):
    examples_dir = 'build/hosted/%(BRANCH)s/examples'
    build_dir = 'build/hosted/%(BRANCH)s/build'
    css_dir = 'build/hosted/%(BRANCH)s/css'
+    closure_lib_path = output('node', '-e',
+        'process.stdout.write(require("closure-util").getLibraryPath())')
    t.rm_rf(examples_dir)
    t.makedirs(examples_dir)
    t.rm_rf(build_dir)
@@ -631,10 +646,7 @@ def host_examples(t):
         'examples/example-list.xml', 'examples/Jugl.js',
         'examples/jquery.min.js', examples_dir)
    t.rm_rf('build/hosted/%(BRANCH)s/closure-library')
-    t.makedirs('build/hosted/%(BRANCH)s/closure-library')
-    with t.chdir('build/hosted/%(BRANCH)s/closure-library'):
-        t.run('%(JAR)s', 'xf', '../../../../' + PLOVR_JAR, 'closure')
-        t.run('%(JAR)s', 'xf', '../../../../' + PLOVR_JAR, 'third_party')
+    t.cp_r(closure_lib_path, 'build/hosted/%(BRANCH)s/closure-library')
    t.rm_rf('build/hosted/%(BRANCH)s/ol')
    t.makedirs('build/hosted/%(BRANCH)s/ol')
    t.cp_r('src/ol', 'build/hosted/%(BRANCH)s/ol/ol')
@@ -674,12 +686,10 @@ def proj4js_zip(t):
    t.info('downloaded %r', t.name)


-virtual('test-deps', PROJ4JS, 'build/test/requireall.js')
-
-
-@target('test', 'test-deps', phony=True)
+@target('test', PROJ4JS, phony=True)
 def test(t):
-    t.run('%(PHANTOMJS)s', 'test/mocha-phantomjs.js', 'test/ol.html')
+    t.run('%(PHANTOMJS)s', 'test/mocha-phantomjs.js',
+          'http://localhost:3000/test/index.html')


@target('fixme', phony=True)
@@ -740,7 +750,7 @@ There is one option:
  -c               - Cleans up the repository from previous builds.

 The most common targets are:
-  serve            - Serves files through plovr, usually on port 9810.
+  serve            - Serves files, on port 3000.
  lint             - Runs gjslint on all sourcefiles to enforce specific syntax.
  build            - Builds singlefile versions of OpenLayers JavaScript and
                     CSS. This is also the default build target which runs when
@@ -753,18 +763,17 @@ The most common targets are:

 Other less frequently used targets are:
  apidoc           - Builds the API-Documentation using JSDoc3.
-  integration-test - Builds all examples in various modes and usually takes a
+  ci               - Builds all examples in various modes and usually takes a
                     long time to finish. This target calls the following
                     targets: lint, build, build-all, test, build-examples,
-                     check-examples and apidoc.
+                     check-examples and apidoc. This is the target run on
+                     Travis CI.
  reallyclean      - Remove untracked files from the repository.
  checkdeps        - Checks whether all required development software is
                     installed on your machine.
  fixme            - Will print a list of parts of the code that are marked
                     with either TODO or FIXME.
  todo             - This is an alias for the fixme-target (see above).
-  plovr            - Fetches the required plovr.jar. Usually called by other
-                     targets that depend on plovr.

 If no target is given, the build-target will be executed.

--- a/buildcfg/base.json
+++ b/buildcfg/base.json
@@ -1,115 +0,0 @@
-{
-
-  "ambiguate-properties": true,
-
-  "checks": {
-    "accessControls": "ERROR",
-    "ambiguousFunctionDecl": "ERROR",
-    "checkDebuggerStatement": "WARNING",
-    "checkEventfulObjectDisposal": "ERROR",
-    "checkProvides": "ERROR",
-    "checkRegExp": "ERROR",
-    "checkStructDictInheritance": "ERROR",
-    "checkTypes": "ERROR",
-    "checkVars": "ERROR",
-    "const": "ERROR",
-    "constantProperty": "ERROR",
-    "deprecated": "ERROR",
-    "duplicate": "ERROR",
-    "duplicateMessage": "ERROR",
-    "es3": "ERROR",
-    "es5Strict": "ERROR",
-    "externsValidation": "ERROR",
-    "fileoverviewTags": "ERROR",
-    "globalThis": "ERROR",
-    "internetExplorerChecks": "ERROR",
-    "invalidCasts": "ERROR",
-    "misplacedTypeAnnotation": "ERROR",
-    "missingProperties": "ERROR",
-    "nonStandardJsDocs": "ERROR",
-    "strictModuleDepCheck": "ERROR",
-    "suspiciousCode": "ERROR",
-    "typeInvalidation": "ERROR",
-    "tweakValidation": "ERROR",
-    "undefinedNames": "ERROR",
-    "undefinedVars": "ERROR",
-    "unknownDefines": "ERROR",
-    "uselessCode": "ERROR",
-    "violatedModuleDep": "ERROR",
-    "visibility": "ERROR"
-  },
-
-  "define": {
-    "goog.dom.ASSUME_STANDARDS_MODE": true,
-    "goog.DEBUG": false
-  },
-
-  "disambiguate-properties": true,
-
-  "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"
-  ],
-
-  "level": "VERBOSE",
-
-  "mode": "ADVANCED",
-
-  "name-suffixes-to-strip": [
-    "logger",
-    "logger_"
-  ],
-
-  "paths": [
-    "../src"
-  ],
-
-  "treat-warnings-as-errors": false,
-
-  "type-prefixes-to-strip": [
-    "goog.asserts",
-    "goog.debug.Console",
-    "goog.debug.DebugWindow",
-    "goog.debug.DevCss",
-    "goog.debug.DivConsole",
-    "goog.debug.EntryPointMonitor",
-    "goog.debug.ErrorHandler",
-    "goog.debug.ErrorReporter",
-    "goog.debug.FancyWindow",
-    "goog.debug.Formatter",
-    "goog.debug.FpsDisplay",
-    "goog.debug.GcDiagnostics",
-    "goog.debug.HtmlFormatter",
-    "goog.debug.LogBuffer",
-    "goog.debug.LogManager",
-    "goog.debug.LogRecord",
-    "goog.debug.Logger",
-    "goog.debug.RelativeTimeProvider",
-    "goog.debug.TextFormatter",
-    "goog.debug.Trace",
-    "goog.debug.catchErrors",
-    "goog.debug.deepExpose",
-    "goog.debug.enhanceError",
-    "goog.debug.entryPointRegistry",
-    "goog.debug.errorHandlerWeakDep",
-    "goog.debug.expose",
-    "goog.debug.exposeArray",
-    "goog.debug.exposeException",
-    "goog.debug.getFunctionName",
-    "goog.debug.getStacktrace",
-    "goog.debug.getStacktraceSimple",
-    "goog.debug.logRecordSerializer",
-    "goog.debug.makeWhitespaceVisible",
-    "goog.debug.normalizeErrorObject",
-    "goog.debug.reflect",
-    "goog.log"
-  ]
-
-}
--- a/buildcfg/examples-all.json
+++ b/buildcfg/examples-all.json
@@ -1,21 +1,67 @@
 {
+  "exports": [],
+  "src": ["src/**/*.js", "build/examples/all.js"],
+  "compile": {
    "externs": [
-        "//jquery-1.7.js", 
-        "../externs/bingmaps.js", 
-        "../externs/bootstrap.js", 
-        "../externs/closure-compiler.js",
-        "../externs/example.js",
-        "../externs/geojson.js", 
-        "../externs/oli.js", 
-        "../externs/proj4js.js", 
-        "../externs/tilejson.js", 
-        "../externs/topojson.js",
-        "../externs/vbarray.js"
-    ], 
-    "id": "simple", 
-    "inherits": "base.json", 
-    "inputs": [
-        "../build/examples/all.js", 
-        "../externs/olx.js"
-    ]
+      "externs/bingmaps.js",
+      "externs/bootstrap.js",
+      "externs/closure-compiler.js",
+      "externs/example.js",
+      "externs/geojson.js",
+      "externs/jquery-1.7.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",
+      "checkEventfulObjectDisposal",
+      "checkRegExp",
+      "checkStructDictInheritance",
+      "checkTypes",
+      "checkVars",
+      "const",
+      "constantProperty",
+      "deprecated",
+      "duplicateMessage",
+      "es3",
+      "externsValidation",
+      "fileoverviewTags",
+      "globalThis",
+      "internetExplorerChecks",
+      "invalidCasts",
+      "misplacedTypeAnnotation",
+      "missingGetCssName",
+      "missingProperties",
+      "missingProvide",
+      "missingRequire",
+      "missingReturn",
+      "newCheckTypes",
+      "nonStandardJsDocs",
+      "suspiciousCode",
+      "strictModuleDepCheck",
+      "typeInvalidation",
+      "undefinedNames",
+      "undefinedVars",
+      "unknownDefines",
+      "uselessCode",
+      "visibility"
+    ],
+    "jscomp_off": [
+      "es5Strict"
+    ],
+    "compilation_level": "ADVANCED",
+    "output_wrapper": "// OpenLayers 3. See http://ol3.js.org/\n(function(){%output%})();",
+    "use_types_for_optimization": true,
+    "manage_closure_dependencies": true
+
+  }
 }
--- a/buildcfg/ol-all.json
+++ b/buildcfg/ol-all.json
@@ -1,23 +1,62 @@
 {
-
-  "id": "ol-all",
-
-  "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"
-  ]
-
+  "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",
+      "checkEventfulObjectDisposal",
+      "checkRegExp",
+      "checkStructDictInheritance",
+      "checkTypes",
+      "checkVars",
+      "const",
+      "constantProperty",
+      "deprecated",
+      "duplicateMessage",
+      "es3",
+      "externsValidation",
+      "fileoverviewTags",
+      "globalThis",
+      "internetExplorerChecks",
+      "invalidCasts",
+      "misplacedTypeAnnotation",
+      "missingGetCssName",
+      "missingProperties",
+      "missingProvide",
+      "missingRequire",
+      "missingReturn",
+      "newCheckTypes",
+      "nonStandardJsDocs",
+      "suspiciousCode",
+      "strictModuleDepCheck",
+      "typeInvalidation",
+      "undefinedNames",
+      "undefinedVars",
+      "unknownDefines",
+      "uselessCode",
+      "visibility"
+    ],
+    "jscomp_off": [
+      "es5Strict"
+    ],
+    "compilation_level": "ADVANCED",
+    "output_wrapper": "// OpenLayers 3. See http://ol3.js.org/\n(function(){%output%})();",
+    "use_types_for_optimization": true
+  }
 }
--- a/buildcfg/ol-simple.json
+++ b/buildcfg/ol-simple.json
@@ -1,39 +1,63 @@
 {
-
-  // If ambiguate-properties and disambiguate-properties are set to true
-  // we get function names like "ol_control_Control_prototype$setMap" in
-  // the compiled code when using the SIMPLE compilation. It looks like
-  // "ambiguate-properties" and  "disambiguate-properties" are only
-  // appropriate for ADVANCED compilation.
-
-  "ambiguate-properties": false,
-
-  "disambiguate-properties": false,
-
-  "id": "ol-simple",
-
-  "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": "ol.json",
-
-  "inputs": [
-    "../build/exports.js"
-  ],
-
-  "mode": "SIMPLE",
-
-  // Note: we can't have a (function(){%output%})() output wrapper with
-  // WHITESPACE and SIMPLE modes. See this link for explanations:
-  // https://groups.google.com/forum/#!topic/plovr/gQyZEa2NpsU
-  "output-wrapper": "%output%"
+  "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",
+      "checkEventfulObjectDisposal",
+      "checkRegExp",
+      "checkStructDictInheritance",
+      "checkTypes",
+      "checkVars",
+      "const",
+      "constantProperty",
+      "deprecated",
+      "duplicateMessage",
+      "es3",
+      "externsValidation",
+      "fileoverviewTags",
+      "globalThis",
+      "internetExplorerChecks",
+      "invalidCasts",
+      "misplacedTypeAnnotation",
+      "missingGetCssName",
+      "missingProperties",
+      "missingProvide",
+      "missingRequire",
+      "missingReturn",
+      "newCheckTypes",
+      "nonStandardJsDocs",
+      "suspiciousCode",
+      "strictModuleDepCheck",
+      "typeInvalidation",
+      "undefinedNames",
+      "undefinedVars",
+      "unknownDefines",
+      "uselessCode",
+      "visibility"
+    ],
+    "jscomp_off": [
+      "es5Strict"
+    ],
+    "compilation_level": "SIMPLE",
+    "output_wrapper": "%output%",
+    "use_types_for_optimization": false,
+    "manage_closure_dependencies": true
+  }
 }
--- a/buildcfg/ol-whitespace.json
+++ b/buildcfg/ol-whitespace.json
@@ -1,42 +1,63 @@
 {
-
-  "id": "ol-whitespace",
-
-  // If ambiguate-properties and disambiguate-properties are set to true
-  // we get function names like "ol_control_Control_prototype$setMap" in
-  // the compiled code when using the SIMPLE compilation. It looks like
-  // "ambiguate-properties" and  "disambiguate-properties" are only
-  // appropriate for ADVANCED compilation. To be sure we also don't
-  // set them for WHITESPACE.
-
-  "ambiguate-properties": false,
-
-  "disambiguate-properties": false,
-
-  "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": "ol.json",
-
-  "inputs": [
-    "../build/exports.js"
-  ],
-
-  "mode": "WHITESPACE",
-
-  "output-wrapper": [
-    "var CLOSURE_NO_DEPS = true;\n",
-    "%output%"
-  ],
-
-  "pretty-print": true
+  "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",
+      "checkEventfulObjectDisposal",
+      "checkRegExp",
+      "checkStructDictInheritance",
+      "checkTypes",
+      "checkVars",
+      "const",
+      "constantProperty",
+      "deprecated",
+      "duplicateMessage",
+      "es3",
+      "externsValidation",
+      "fileoverviewTags",
+      "globalThis",
+      "internetExplorerChecks",
+      "invalidCasts",
+      "misplacedTypeAnnotation",
+      "missingGetCssName",
+      "missingProperties",
+      "missingProvide",
+      "missingRequire",
+      "missingReturn",
+      "newCheckTypes",
+      "nonStandardJsDocs",
+      "suspiciousCode",
+      "strictModuleDepCheck",
+      "typeInvalidation",
+      "undefinedNames",
+      "undefinedVars",
+      "unknownDefines",
+      "uselessCode",
+      "visibility"
+    ],
+    "jscomp_off": [
+      "es5Strict"
+    ],
+    "compilation_level": "WHITESPACE_ONLY",
+    "output_wrapper": "var CLOSURE_DEPS = false;\n%output%",
+    "use_types_for_optimization": false,
+    "manage_closure_dependencies": true
+  }
 }
--- 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",
+      "checkEventfulObjectDisposal",
+      "checkRegExp",
+      "checkStructDictInheritance",
+      "checkTypes",
+      "checkVars",
+      "const",
+      "constantProperty",
+      "deprecated",
+      "duplicateMessage",
+      "es3",
+      "externsValidation",
+      "fileoverviewTags",
+      "globalThis",
+      "internetExplorerChecks",
+      "invalidCasts",
+      "misplacedTypeAnnotation",
+      "missingGetCssName",
+      "missingProperties",
+      "missingProvide",
+      "missingRequire",
+      "missingReturn",
+      "newCheckTypes",
+      "nonStandardJsDocs",
+      "suspiciousCode",
+      "strictModuleDepCheck",
+      "typeInvalidation",
+      "undefinedNames",
+      "undefinedVars",
+      "unknownDefines",
+      "uselessCode",
+      "visibility"
+    ],
+    "jscomp_off": [
+      "es5Strict"
+    ],
+    "compilation_level": "ADVANCED",
+    "output_wrapper": "// OpenLayers 3. See http://ol3.js.org/\n(function(){%output%})();",
+    "use_types_for_optimization": true,
+    "manage_closure_dependencies": true
+  }
 }
--- a/buildcfg/readme.md
+++ b/buildcfg/readme.md
@@ -0,0 +1,12 @@
+# Build configs
+
+This directory includes configuration files (json) for the tasks/build.js
+build script.
+
+Notes:
+
+`use_types_for_optimization` is set to `false` for the SIMPLE and WHITESPACE
+builds.  If it was set to `true` we would get function names like
+`ol_control_Control_prototype$setMap` in the compiled code when using the
+SIMPLE compilation. `use_types_for_optimization` is only appropriate for
+ADVANCED compilation. To be sure we also don't set it for WHITESPACE.
--- a/buildcfg/test.json
+++ b/buildcfg/test.json
@@ -1,16 +0,0 @@
-{
-
-  "id": "test",
-
-  "inherits": "base.json",
-
-  "inputs": [
-    "../build/test/requireall.js"
-  ],
-
-  "paths": [
-    "../src",
-    "../test"
-  ]
-
-}
--- a/examples/geojson.js
+++ b/examples/geojson.js
@@ -144,7 +144,7 @@ var vectorSource = new ol.source.GeoJSON(
              'type': 'MultiPolygon',
              'coordinates': [
                [[[-5e6, 6e6], [-5e6, 8e6], [-3e6, 8e6], [-3e6, 6e6]]],
-                [[[-2e6, 6e6], [-2e6, 8e6], [0e6, 8e6], [0e6, 6e6]]],
+                [[[-2e6, 6e6], [-2e6, 8e6], [0, 8e6], [0, 6e6]]],
                [[[1e6, 6e6], [1e6, 8e6], [3e6, 8e6], [3e6, 6e6]]]
              ]
            }
@@ -156,7 +156,7 @@ var vectorSource = new ol.source.GeoJSON(
              'geometries': [
                {
                  'type': 'LineString',
-                  'coordinates': [[-5e6, -5e6], [0e6, -5e6]]
+                  'coordinates': [[-5e6, -5e6], [0, -5e6]]
                },
                {
                  'type': 'Point',
--- a/examples/modify-test.js
+++ b/examples/modify-test.js
@@ -127,8 +127,8 @@ var source = new ol.source.GeoJSON(
              'coordinates': [
                [[[-5e6, 6e6], [-5e6, 8e6], [-3e6, 8e6],
                    [-3e6, 6e6], [-5e6, 6e6]]],
-                [[[-2e6, 6e6], [-2e6, 8e6], [0e6, 8e6],
-                    [0e6, 6e6], [-2e6, 6e6]]],
+                [[[-2e6, 6e6], [-2e6, 8e6], [0, 8e6],
+                    [0, 6e6], [-2e6, 6e6]]],
                [[[1e6, 6e6], [1e6, 8e6], [3e6, 8e6],
                    [3e6, 6e6], [1e6, 6e6]]]
              ]
@@ -141,7 +141,7 @@ var source = new ol.source.GeoJSON(
              'geometries': [
                {
                  'type': 'LineString',
-                  'coordinates': [[-5e6, -5e6], [0e6, -5e6]]
+                  'coordinates': [[-5e6, -5e6], [0, -5e6]]
                },
                {
                  'type': 'Point',
--- a/externs/closure-compiler.js
+++ b/externs/closure-compiler.js
@@ -8,63 +8,6 @@
 * @externs
 */

-// @see https://code.google.com/p/closure-compiler/issues/detail?id=1060
-
-
-/** @type {Date} */
-HTMLInputElement.prototype.valueAsDate;
-
-
-/** @type {number} */
-HTMLInputElement.prototype.valueAsNumber;
-
-
-// @see https://code.google.com/p/closure-compiler/issues/detail?id=1084
-
-
-/** @type {?number} */
-DeviceRotationRate.prototype.alpha;
-
-
-/** @type {?number} */
-DeviceRotationRate.prototype.beta;
-
-
-/** @type {?number} */
-DeviceRotationRate.prototype.gamma;
-
-
-// @see https://code.google.com/p/closure-compiler/issues/detail?id=1088
-
-
-/** @type {?number} */
-DeviceOrientationEvent.prototype.webkitCompassAccuracy;
-
-
-/** @type {?number} */
-DeviceOrientationEvent.prototype.webkitCompassHeading;
-
-
-// IE 11 fullscreen API
-// http://msdn.microsoft.com/en-us/library/ie/dn265028(v=vs.85).aspx
-
-
-/** @return {void} */
-Element.prototype.msRequestFullscreen = function() {};
-
-
-/** @return {void} */
-Element.prototype.msExitFullscreen = function() {};
-
-
-/** @type {boolean} */
-Document.prototype.msFullscreenEnabled;
-
-
-/** @type {Element} */
-Document.prototype.msFullscreenElement;
-
-
 /** @type {number} */
 Touch.prototype.force;

--- a/externs/jquery-1.7.js
+++ b/externs/jquery-1.7.js
--- a/test/index.html
+++ b/test/index.html
@@ -23,7 +23,7 @@
  </script>
  <script type="text/javascript" src="../build/proj4js/lib/proj4js-combined.js"></script>

-  <!-- This script is provided by the debug server (start with `npm start`) -->
+  <!-- This script is provided by the debug server (start with `build.py serve`) -->
  <script type="text/javascript" src="loader.js"></script>

  <script type="text/javascript">