From f89abb53a906484639d458303d71a054e28ba3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Mon, 30 Jun 2014 18:07:18 +0200
Subject: [PATCH] Use build.js for ol-all.js

---
 build.py             |  6 ++--
 buildcfg/ol-all.json | 81 ++++++++++++++++++++++++++++++++------------
 2 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/build.py b/build.py
index f6b8101d9b..ebaa5e9a44 100755
--- a/build.py
+++ b/build.py
@@ -193,11 +193,9 @@ def build_ol_whitespace_js(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)
diff --git a/buildcfg/ol-all.json b/buildcfg/ol-all.json
index 7ce2c28f73..2df2d9a430 100644
--- 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",
+      "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
+  }
 }