From bcee2d3a12d6f25747ed0b56703f35fc8403cfff Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 26 Jul 2012 00:23:18 +0200
Subject: [PATCH] Auto-generate ol.js

---
 .gitignore   |  1 +
 Makefile     |  8 +++++++-
 src/ol/ol.js | 48 ------------------------------------------------
 3 files changed, 8 insertions(+), 49 deletions(-)
 delete mode 100644 src/ol/ol.js

diff --git a/.gitignore b/.gitignore
index 0eb23476a1..101cd2aefa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /ol-skeleton*.js
 /plovr*.jar
 /webgl-debug.js
+/src/ol/ol.js
diff --git a/Makefile b/Makefile
index 19386649c3..25650c7a9e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ all: build webgl-debug.js
 build: ol.js ol-skeleton.js ol-skeleton-debug.js ol-skeleton-dom.js ol-skeleton-webgl.js
 
 .PHONY: ol.js
-ol.js: $(PLOVR_JAR)
+ol.js: $(PLOVR_JAR) src/ol/ol.js
 	java -jar $(PLOVR_JAR) build $(basename $@).json >$@
 	@echo $@ "uncompressed:" $(shell wc -c <$@) bytes
 	@echo $@ "  compressed:" $(shell gzip -9 -c <$@ | wc -c) bytes
@@ -43,6 +43,11 @@ ol-skeleton-webgl.js: $(PLOVR_JAR)
 serve: $(PLOVR_JAR)
 	java -jar $(PLOVR_JAR) serve *.json
 
+src/ol/ol.js: $(shell find src/ol -name \*.js | grep -v src/ol/ol.js)
+	echo "goog.provide('ol');" >$@
+	echo >>$@
+	find src/ol -name \*.js | grep -v src/ol/ol.js | xargs grep -rh ^goog.provide | sort | uniq | sed -e 's/provide/require/g' >>$@
+
 .PHONY: lint
 lint:
 	gjslint --strict --limited_doc_files=$(subst $(space),$(comma),$(shell find externs -name \*.js)) $(shell find externs src/ol -name \*.js) skeleton.js
@@ -54,6 +59,7 @@ $(PLOVR_JAR):
 	curl http://plovr.googlecode.com/files/$(notdir $@) > $@
 
 clean:
+	rm -f src/ol/ol.js
 	rm -f ol-skeleton.js
 	rm -f ol-skeleton-debug.js
 	rm -f ol-skeleton-dom.js
diff --git a/src/ol/ol.js b/src/ol/ol.js
deleted file mode 100644
index b1adcab3fe..0000000000
--- a/src/ol/ol.js
+++ /dev/null
@@ -1,48 +0,0 @@
-goog.provide('ol');
-
-goog.require('ol.Array');
-goog.require('ol.ArrayEvent');
-goog.require('ol.ArrayEventType');
-goog.require('ol.Control');
-goog.require('ol.Extent');
-goog.require('ol.Layer');
-goog.require('ol.LayerProperty');
-goog.require('ol.LayerRenderer');
-goog.require('ol.Map');
-goog.require('ol.MapBrowserEvent');
-goog.require('ol.MapProperty');
-goog.require('ol.Object');
-goog.require('ol.Projection');
-goog.require('ol.Rectangle');
-goog.require('ol.Store');
-goog.require('ol.Tile');
-goog.require('ol.TileBounds');
-goog.require('ol.TileCoord');
-goog.require('ol.TileGrid');
-goog.require('ol.TileLayer');
-goog.require('ol.TileStore');
-goog.require('ol.TileUrlFunction');
-goog.require('ol.TileUrlFunctionType');
-goog.require('ol.TransformFunction');
-goog.require('ol.control.DblClickZoom');
-goog.require('ol.control.Drag');
-goog.require('ol.control.DragPan');
-goog.require('ol.control.DragZoom');
-goog.require('ol.control.MouseWheelZoom');
-goog.require('ol.createMap');
-goog.require('ol.dom');
-goog.require('ol.dom.LayerRenderer');
-goog.require('ol.dom.Map');
-goog.require('ol.dom.TileLayerRenderer');
-goog.require('ol.tilegrid.createXYZ');
-goog.require('ol.tilelayer.createOpenStreetMap');
-goog.require('ol.tilelayer.createXYZ');
-goog.require('ol.tilestore.createXYZ');
-goog.require('ol.webgl');
-goog.require('ol.webgl.LayerRenderer');
-goog.require('ol.webgl.Map');
-goog.require('ol.webgl.TileLayerRenderer');
-goog.require('ol.webgl.WebGLContextEventType');
-goog.require('ol.webgl.map.shader');
-goog.require('ol.webgl.shader.Fragment');
-goog.require('ol.webgl.shader.Vertex');