Pullup r2999:3087 for RC2.

svn merge trunk/openlayers/@2999 trunk/openlayers/@HEAD branches/openlayers/2.4/



git-svn-id: http://svn.openlayers.org/branches/openlayers/2.4@3088 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

tools/mergejs.py

@@ -117,9 +117,9 @@ class Config:
         """
         Parses the content of the named file and stores the values.
         """
-        lines = [line[:-1] # Assumes end-of-line character is present
+        lines = [line.strip() # Assumes end-of-line character is present
                  for line in open(filename)
-                 if line != "\n"] # Skip blank lines
+                 if line.strip()] # Skip blank lines
 
         self.forceFirst = lines[lines.index("[first]") + 1:lines.index("[last]")]
 

tools/release.sh

@@ -3,7 +3,7 @@ VERSION=$1
 echo "Building OpenLayers $VERSION"
 svn export http://svn.openlayers.org/tags/openlayers/release-$VERSION OpenLayers-$VERSION
 cd OpenLayers-$VERSION/build
-./build.sh
+./build.py full
 mkdir /www/openlayers/htdocs/api/$VERSION
 cp OpenLayers.js /www/openlayers/htdocs/api/$VERSION
 cd ..