eykamp
diff --git a/‎apidoc_config/Menu.txt
+247-183 b/‎apidoc_config/Menu.txt
+247-183
diff --git a/‎build/README.txt
+5 b/‎build/README.txt
+5
diff --git a/‎build/build.py
+18-3 b/‎build/build.py
+18-3
diff --git a/‎build/license.txt
+1-1 b/‎build/license.txt
+1-1
diff --git a/‎build/lite.cfg
+1-1 b/‎build/lite.cfg
+1-1
diff --git a/‎build/mobile.cfg
+1 b/‎build/mobile.cfg
+1
@@ -30,6 +30,11 @@ The options available for compression are:
    for files source Javascript files which are under 1MB. (Note that
    the default OpenLayers full build is not under 1MB.)
 
+ * uglify-js
+   This uses the uglify-js compiler.  You will need the uglifyjs tool
+   in your PATH; this can be installed using npm (the node.js package
+   manager).
+
  * jsmin
    jsmin is the default compiler, and uses the Python-based
    jsmin script to compress the Javascript. 
 
@@ -32,6 +32,13 @@ def build(config_file = None, output_file = None, options = None):
     except ImportError:
         print "No minimize"
 
+    try:
+        import uglify_js
+        uglify_js.check_available()
+        have_compressor.append("uglify-js")
+    except Exception, E:
+        print "No uglify-js (%s)" % E
+
     use_compressor = None
     if options.compressor and options.compressor in have_compressor:
         use_compressor = options.compressor
@@ -52,7 +59,7 @@ def build(config_file = None, output_file = None, options = None):
 
     print "Merging libraries."
     try:
-        if use_compressor == "closure":
+        if use_compressor == "closure" or use_compressor == 'uglify-js':
             sourceFiles = mergejs.getNames(sourceDirectory, configFilename)
         else:
             merged = mergejs.run(sourceDirectory, None, configFilename)
@@ -107,6 +114,14 @@ def build(config_file = None, output_file = None, options = None):
             print "\nAbnormal termination due to compilation errors." 
             sys.exit("ERROR: Closure Compilation failed! See compilation errors.") 
         print "Closure Compilation has completed successfully."
+    elif use_compressor == "uglify-js":
+        minimized = uglify_js.compile(sourceFiles)
+        if minimized is None:
+            print "\nAbnormal termination due to compilation errors."
+            sys.exit("ERROR: Uglify JS compilation failed! See compilation errors.")
+
+        print "Uglify JS compilation has completed successfully."
+
     else: # fallback
         minimized = merged 
 
@@ -128,7 +143,7 @@ def build(config_file = None, output_file = None, options = None):
 
 if __name__ == '__main__':
   opt = optparse.OptionParser(usage="%s [options] [config_file] [output_file]\n  Default config_file is 'full.cfg', Default output_file is 'OpenLayers.js'")
-  opt.add_option("-c", "--compressor", dest="compressor", help="compression method: one of 'jsmin' (default), 'minimize', 'closure_ws', 'closure', or 'none'", default="jsmin")
+  opt.add_option("-c", "--compressor", dest="compressor", help="compression method: one of 'jsmin' (default), 'minimize', 'closure_ws', 'closure', 'uglify-js', or 'none'", default="jsmin")
   opt.add_option("-s", "--status", dest="status", help="name of a file whose contents will be added as a comment at the front of the output file. For example, when building from a git repo, you can save the output of 'git describe --tags' in this file. Default is no file.", default=False)
   opt.add_option("--amd", dest="amd", help="output should be AMD module; wrap merged files in define function; can be either 'pre' (before compilation) or 'post' (after compilation). Wrapping the OpenLayers var in a function means the filesize can be reduced by the closure compiler using 'pre', but be aware that a few functions depend on the OpenLayers variable being present. Either option can be used with jsmin or minimize compression. Default false, not AMD.", default=False)
   opt.add_option("--amdname", dest="amdname", help="only useful with amd option. Name of AMD module. Default no name, anonymous module.", default=False)
@@ -140,4 +155,4 @@ def build(config_file = None, output_file = None, options = None):
   elif len(args) == 2:
     build(args[0], args[1], options=options)
   else:
-    print "Wrong number of arguments"
+    print "Wrong number of arguments"
@@ -2,7 +2,7 @@
 
   OpenLayers.js -- OpenLayers Map Viewer Library
 
-  Copyright (c) 2006-2012 by OpenLayers Contributors
+  Copyright (c) 2006-2013 by OpenLayers Contributors
   Published under the 2-clause BSD license.
   See http://openlayers.org/dev/license.txt for the full text of the license, and http://openlayers.org/dev/authors.txt for full list of contributors.
 
 
@@ -1,6 +1,6 @@
 # This file includes a small subset of OpenLayers code, designed to be
 # integrated into another application. It includes only the Layer types
-# neccesary to create tiled or untiled WMS, and does not include any Controls.
+# necessary to create tiled or untiled WMS, and does not include any Controls.
 # This is the result of what was at the time called "Webmap.js" at the FOSS4G
 # Web Mapping BOF.
 
 
@@ -29,6 +29,7 @@ OpenLayers/Protocol/HTTP.js
 OpenLayers/Protocol/WFS.js
 OpenLayers/Protocol/WFS/v1_0_0.js
 OpenLayers/Strategy/Fixed.js
+OpenLayers/TileManager.js
 
 [exclude]