Clean up and simplify build system

.gitignore

@@ -6,10 +6,10 @@
 /examples/example-list.js
 /examples/example-list.xml
 /jsdoc/
-/ol-skeleton*.js
 /ol.js
+/ol-api.js
+/ol-skeleton.js
 /plovr*.jar
-/src/ol/ol.js
 /tools/*.pyc
 /tools/closure-compiler.jar
 /webgl-debug.js

Makefile

@@ -1,6 +1,5 @@
 PLOVR_JAR=bin/plovr-4b3caf2b7d84.jar
-SRC = $(filter-out $(TARGETS),$(shell find externs src/ol -name \*.js))
+SRC = $(shell find externs src/ol -name \*.js)
-TARGETS = src/ol/ol.js
 comma := ,
 empty :=
 space := $(empty) $(empty)
@@ -9,39 +8,24 @@ space := $(empty) $(empty)
 all: build webgl-debug.js
 
 .PHONY: build
-build: ol.js ol-skeleton.js ol-skeleton-debug.js ol-skeleton-dom.js ol-skeleton-webgl.js
+build: ol-api.js ol-skeleton.js
 
-ol.js: $(PLOVR_JAR) $(SRC) src/ol/ol.js
+ol-api.js: $(PLOVR_JAR) $(SRC) ol-base.json ol-api.json ol.js
 	java -jar $(PLOVR_JAR) build $(basename $@).json >$@
-	@echo $@ "uncompressed:" $(shell wc -c <$@) bytes
+	@echo $@ "uncompressed:" $$(wc -c <$@) bytes
-	@echo $@ "  compressed:" $(shell gzip -9 -c <$@ | wc -c) bytes
+	@echo $@ "  compressed:" $$(gzip -9 -c <$@ | wc -c) bytes
 
-ol-skeleton.js: $(PLOVR_JAR) $(SRC) skeleton.js
+ol-skeleton.js: $(PLOVR_JAR) $(SRC) ol-base.json ol-skeleton.json skeleton.js
 	java -jar $(PLOVR_JAR) build $(basename $@).json >$@
-	@echo $@ "uncompressed:" $(shell wc -c <$@) bytes
+	@echo $@ "uncompressed:" $$(wc -c <$@) bytes
-	@echo $@ "  compressed:" $(shell gzip -9 -c <$@ | wc -c) bytes
+	@echo $@ "  compressed:" $$(gzip -9 -c <$@ | wc -c) bytes
-
-ol-skeleton-debug.js: $(PLOVR_JAR) $(SRC) skeleton.js
-	java -jar $(PLOVR_JAR) build $(basename $@).json >$@
-	@echo $@ "uncompressed:" $(shell wc -c <$@) bytes
-	@echo $@ "  compressed:" $(shell gzip -9 -c <$@ | wc -c) bytes
-
-ol-skeleton-dom.js: $(PLOVR_JAR) $(SRC) skeleton.js
-	java -jar $(PLOVR_JAR) build $(basename $@).json >$@
-	@echo $@ "uncompressed:" $(shell wc -c <$@) bytes
-	@echo $@ "  compressed:" $(shell gzip -9 -c <$@ | wc -c) bytes
-
-ol-skeleton-webgl.js: $(PLOVR_JAR) $(SRC) skeleton.js
-	java -jar $(PLOVR_JAR) build $(basename $@).json >$@
-	@echo $@ "uncompressed:" $(shell wc -c <$@) bytes
-	@echo $@ "  compressed:" $(shell gzip -9 -c <$@ | wc -c) bytes
 
 .PHONY: serve
 serve: $(PLOVR_JAR)
-	java -jar $(PLOVR_JAR) serve *.json
+	java -jar $(PLOVR_JAR) serve ol-api.json ol-skeleton.json
 
-src/ol/ol.js: $(SRC)
+ol.js: $(SRC)
-	( echo "goog.provide('ol');" && echo && find src/ol -name \*.js -not -path $@ | xargs grep -rh ^goog.provide | sort | uniq | sed -e 's/provide/require/g' ) > $@
+	( find src/ol -name \*.js | xargs grep -rh ^goog.provide | sort | uniq | sed -e 's/provide/require/g' ) > $@
 
 .PHONY: lint
 lint:
@@ -54,11 +38,9 @@ $(PLOVR_JAR):
 	curl http://plovr.googlecode.com/files/$(notdir $@) > $@
 
 clean:
-	rm -f src/ol/ol.js
+	rm -f ol.js
+	rm -f ol-api.js
 	rm -f ol-skeleton.js
-	rm -f ol-skeleton-debug.js
-	rm -f ol-skeleton-dom.js
-	rm -f ol-skeleton-webgl.js
 
 reallyclean: clean
 	rm -f $(PLOVR_JAR)

ol-api.json

@@ -0,0 +1,9 @@
+{
+
+  "id": "ol-api",
+
+  "inherits": "ol-base.json",
+
+  "inputs": "ol.js"
+
+}

ol-base.json

@@ -1,24 +1,4 @@
 {
-  "id": "ol",
-
-  "inputs": "src/ol/ol.js",
-
-  "paths": [
-    "src"
-  ],
-
-  "define": {
-    "goog.dom.ASSUME_STANDARDS_MODE": true,
-    "goog.DEBUG": false
-  },
-
-  "externs": [
-    "externs/bingmaps.js",
-    "externs/webgl-debug.js"
-  ],
-
-  "mode": "ADVANCED",
-  "level": "VERBOSE",
 
   "checks": {
     "accessControls": "ERROR",
@@ -32,6 +12,22 @@
     "missingProperties": "ERROR",
     "nonStandardJsDocs": "ERROR",
     "undefinedVars": "ERROR"
-  }
+  },
+
+  "define": {
+    "goog.dom.ASSUME_STANDARDS_MODE": true,
+    "goog.DEBUG": false
+  },
+
+  "externs": [
+    "externs/bingmaps.js",
+    "externs/webgl-debug.js"
+  ],
+
+  "level": "VERBOSE",
+
+  "mode": "ADVANCED",
+
+  "paths": "src"
 
 }

ol-skeleton-debug.json

@@ -1,37 +0,0 @@
-{
-  "id": "ol-skeleton-debug",
-
-  "inputs": "skeleton.js",
-
-  "paths": [
-    "src"
-  ],
-
-  "define": {
-    "goog.dom.ASSUME_STANDARDS_MODE": true,
-    "goog.DEBUG": true
-  },
-
-  "externs": [
-    "externs/bingmaps.js",
-    "externs/webgl-debug.js"
-  ],
-
-  "mode": "ADVANCED",
-  "level": "VERBOSE",
-
-  "checks": {
-    "accessControls": "ERROR",
-    "visibility": "ERROR",
-    "checkTypes": "ERROR",
-    "checkRegExp": "ERROR",
-    "checkVars": "ERROR",
-    "deprecated": "ERROR",
-    "fileoverviewTags": "ERROR",
-    "invalidCasts": "ERROR",
-    "missingProperties": "ERROR",
-    "nonStandardJsDocs": "ERROR",
-    "undefinedVars": "ERROR"
-  }
-
-}

ol-skeleton-dom.json

@@ -1,39 +0,0 @@
-{
-  "id": "ol-skeleton-dom",
-
-  "inputs": "skeleton.js",
-
-  "paths": [
-    "src"
-  ],
-
-  "define": {
-    "goog.dom.ASSUME_STANDARDS_MODE": true,
-    "ol.ENABLE_DOM": true,
-    "ol.ENABLE_WEBGL": false,
-    "goog.DEBUG": false
-  },
-
-  "externs": [
-    "externs/bingmaps.js",
-    "externs/webgl-debug.js"
-  ],
-
-  "mode": "ADVANCED",
-  "level": "VERBOSE",
-
-  "checks": {
-    "accessControls": "ERROR",
-    "visibility": "ERROR",
-    "checkTypes": "ERROR",
-    "checkRegExp": "ERROR",
-    "checkVars": "ERROR",
-    "deprecated": "ERROR",
-    "fileoverviewTags": "ERROR",
-    "invalidCasts": "ERROR",
-    "missingProperties": "ERROR",
-    "nonStandardJsDocs": "ERROR",
-    "undefinedVars": "ERROR"
-  }
-
-}

ol-skeleton-webgl.json

@@ -1,39 +0,0 @@
-{
-  "id": "ol-skeleton-webgl",
-
-  "inputs": "skeleton.js",
-
-  "paths": [
-    "src"
-  ],
-
-  "define": {
-    "goog.dom.ASSUME_STANDARDS_MODE": true,
-    "ol.ENABLE_DOM": false,
-    "ol.ENABLE_WEBGL": true,
-    "goog.DEBUG": false
-  },
-
-  "externs": [
-    "externs/bingmaps.js",
-    "externs/webgl-debug.js"
-  ],
-
-  "mode": "ADVANCED",
-  "level": "VERBOSE",
-
-  "checks": {
-    "accessControls": "ERROR",
-    "visibility": "ERROR",
-    "checkTypes": "ERROR",
-    "checkRegExp": "ERROR",
-    "checkVars": "ERROR",
-    "deprecated": "ERROR",
-    "fileoverviewTags": "ERROR",
-    "invalidCasts": "ERROR",
-    "missingProperties": "ERROR",
-    "nonStandardJsDocs": "ERROR",
-    "undefinedVars": "ERROR"
-  }
-
-}

ol-skeleton.json

@@ -1,37 +1,9 @@
 {
+
   "id": "ol-skeleton",
 
-  "inputs": "skeleton.js",
+  "inherits": "ol-base.json",
 
-  "paths": [
+  "inputs": "skeleton.js"
-    "src"
-  ],
-
-  "define": {
-    "goog.dom.ASSUME_STANDARDS_MODE": true,
-    "goog.DEBUG": false
-  },
-
-  "externs": [
-    "externs/bingmaps.js",
-    "externs/webgl-debug.js"
-  ],
-
-  "mode": "ADVANCED",
-  "level": "VERBOSE",
-
-  "checks": {
-    "accessControls": "ERROR",
-    "visibility": "ERROR",
-    "checkTypes": "ERROR",
-    "checkRegExp": "ERROR",
-    "checkVars": "ERROR",
-    "deprecated": "ERROR",
-    "fileoverviewTags": "ERROR",
-    "invalidCasts": "ERROR",
-    "missingProperties": "ERROR",
-    "nonStandardJsDocs": "ERROR",
-    "undefinedVars": "ERROR"
-  }
 
 }