Move Plovr json files in specific dir

build.py

@@ -131,34 +131,35 @@ def build_ol_css(t):
 
 
 @target('build/ol.js', PLOVR_JAR, SRC, EXTERNAL_SRC, SHADER_SRC,
-        'base.json', 'build/ol.json')
+        'buildcfg/base.json', 'buildcfg/ol.json')
 def build_ol_js(t):
-    t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'build/ol.json')
+    t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'buildcfg/ol.json')
     report_sizes(t)
 
 
 @target('build/ol-simple.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC,
-        'base.json', 'build/ol.json', 'build/ol-simple.json')
+        'buildcfg/base.json', 'buildcfg/ol.json', 'buildcfg/ol-simple.json')
 def build_ol_simple_js(t):
-    t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'build/ol-simple.json')
+    t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'buildcfg/ol-simple.json')
     report_sizes(t)
 
 
 @target('build/ol-whitespace.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC,
-        'base.json', 'build/ol.json', 'build/ol-whitespace.json')
+        'buildcfg/base.json', 'buildcfg/ol.json',
+        'buildcfg/ol-whitespace.json')
 def build_ol_whitespace_js(t):
     t.output('%(JAVA)s', '-jar', PLOVR_JAR,
-             'build', 'build/ol-whitespace.json')
+             'build', 'buildcfg/ol-whitespace.json')
     report_sizes(t)
 
 
 virtual('build-all', 'build/ol-all.js')
 
 
 @target('build/ol-all.js', PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC,
-        'base.json', 'build/ol-all.json')
+        'buildcfg/base.json', 'buildcfg/ol-all.json')
 def build_ol_all_js(t):
-    t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'build/ol-all.json')
+    t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build', 'buildcfg/ol-all.json')
 
 
 @target('build/src/external/externs/types.js', 'bin/generate-exports.py',
@@ -245,24 +246,24 @@ def examples_star_json(name, match):
     def action(t):
         content = json.dumps({
             'id': match.group('id'),
-            'inherits': '../../base.json',
+            'inherits': '../../buildcfg/base.json',
             'inputs': [
-                'examples/%(id)s.js' % match.groupdict(),
-                'build/src/internal/src/types.js',
+                '../examples/%(id)s.js' % match.groupdict(),
+                '../build/src/internal/src/types.js',
             ],
             'externs': [
                 '//json.js',
                 '//jquery-1.7.js',
-                'externs/bingmaps.js',
-                'externs/bootstrap.js',
-                'externs/geojson.js',
-                'externs/proj4js.js',
-                'externs/tilejson.js',
+                '../externs/bingmaps.js',
+                '../externs/bootstrap.js',
+                '../externs/geojson.js',
+                '../externs/proj4js.js',
+                '../externs/tilejson.js',
             ],
         })
         with open(t.name, 'w') as f:
             f.write(content)
-    dependencies = [__file__, 'base.json']
+    dependencies = [__file__, 'buildcfg/base.json']
     return Target(name, action=action, dependencies=dependencies)
 
 
@@ -272,22 +273,23 @@ def action(t):
         t.output('%(JAVA)s', '-jar', PLOVR_JAR, 'build',
                  'build/examples/%(id)s.json' % match.groupdict())
         report_sizes(t)
-    dependencies = [PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC, 'base.json',
+    dependencies = [PLOVR_JAR, SRC, INTERNAL_SRC, SHADER_SRC,
+                    'buildcfg/base.json',
                     'examples/%(id)s.js' % match.groupdict(),
                     'build/examples/%(id)s.json' % match.groupdict()]
     return Target(name, action=action, dependencies=dependencies)
 
 
 @target('serve', PLOVR_JAR, INTERNAL_SRC, 'test/requireall.js', 'examples')
 def serve(t):
-    t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'build/ol.json',
-          'build/ol-all.json', EXAMPLES_JSON, 'test/test.json')
+    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, INTERNAL_SRC)
 def serve_precommit(t):
     t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve',
-          'build/ol-all.json', 'test/test.json')
+          'buildcfg/ol-all.json', 'buildcfg/test.json')
 
 
 virtual('lint', 'build/lint-timestamp', 'build/check-requires-timestamp')

base.json → buildcfg/base.json

@@ -40,19 +40,19 @@
 
   "externs": [
     "//json.js",
-    "externs/bingmaps.js",
-    "externs/geojson.js",
-    "externs/proj4js.js",
-    "externs/tilejson.js"
+    "../externs/bingmaps.js",
+    "../externs/geojson.js",
+    "../externs/proj4js.js",
+    "../externs/tilejson.js"
   ],
 
   "level": "VERBOSE",
 
   "mode": "ADVANCED",
 
   "paths": [
-    "build/src/internal/src",
-    "src"
+    "../build/src/internal/src",
+    "../src"
   ],
 
   "treat-warnings-as-errors": false

buildcfg/ol-all.json

@@ -0,0 +1,12 @@
+{
+
+  "id": "ol-all",
+
+  "inherits": "base.json",
+
+  "inputs": [
+    "../build/src/internal/src/requireall.js",
+    "../build/src/internal/src/types.js"
+  ]
+
+}

build/ol-simple.json → buildcfg/ol-simple.json

@@ -14,17 +14,17 @@
 
   "externs": [
     "//json.js",
-    "externs/bingmaps.js",
-    "externs/geojson.js",
-    "externs/proj4js.js",
-    "externs/tilejson.js"
+    "../externs/bingmaps.js",
+    "../externs/geojson.js",
+    "../externs/proj4js.js",
+    "../externs/tilejson.js"
   ],
 
   "inherits": "ol.json",
 
   "inputs": [
-    "build/src/internal/src/requireall.js",
-    "build/src/internal/src/types.js"
+    "../build/src/internal/src/requireall.js",
+    "../build/src/internal/src/types.js"
   ],
 
   "mode": "SIMPLE",

build/ol-whitespace.json → buildcfg/ol-whitespace.json

@@ -15,17 +15,17 @@
 
   "externs": [
     "//json.js",
-    "externs/bingmaps.js",
-    "externs/geojson.js",
-    "externs/proj4js.js",
-    "externs/tilejson.js"
+    "../externs/bingmaps.js",
+    "../externs/geojson.js",
+    "../externs/proj4js.js",
+    "../externs/tilejson.js"
   ],
 
   "inherits": "ol.json",
 
   "inputs": [
-    "build/src/internal/src/requireall.js",
-    "build/src/internal/src/types.js"
+    "../build/src/internal/src/requireall.js",
+    "../build/src/internal/src/types.js"
   ],
 
   "mode": "WHITESPACE",

buildcfg/ol.json

@@ -0,0 +1,37 @@
+{
+
+  "id": "ol",
+
+  "css-allowed-unrecognized-properties": [
+    "user-select"
+  ],
+
+  "css-inputs": [
+    "../css/ol.css"
+  ],
+
+  "css-output-file": "../build/ol.css",
+
+  "externs": [
+    "//json.js",
+    "../build/src/external/externs/types.js",
+    "../externs/bingmaps.js",
+    "../externs/geojson.js",
+    "../externs/proj4js.js",
+    "../externs/tilejson.js"
+  ],
+
+  "inherits": "base.json",
+
+  "inputs": [
+    "../build/src/external/src/exports.js",
+    "../build/src/external/src/types.js"
+  ],
+
+  "output-wrapper": "(function(){%output%})();",
+
+  "paths": [
+    "../src"
+  ]
+
+}

buildcfg/test.json

@@ -0,0 +1,16 @@
+{
+
+  "id": "test",
+
+  "inherits": "base.json",
+
+  "inputs": [
+    "../test/requireall.js"
+  ],
+
+  "paths": [
+    "../src",
+    "../test"
+  ]
+
+}