William Deegan avatar William Deegan committed ade2640

Fixed version string to be 2.1.0
(transplanted from c13a66277b4c13a8d3374f19dc7eca2a406f76a6)

Comments (0)

Files changed (4)

 
 By default, the above commands will do the following:
 
-    --  Install the version-numbered "scons-2.0.0" and "sconsign-2.0.0"
+    --  Install the version-numbered "scons-2.1.0" and "sconsign-2.1.0"
         scripts in the default system script directory (/usr/bin or
         C:\Python*\Scripts, for example).  This can be disabled by
         specifying the "--no-version-script" option on the command
         making it the default on your system.
 
         On UNIX or Linux systems, you can have the "scons" and "sconsign"
-        scripts be hard links or symbolic links to the "scons-2.0.0" and
-        "sconsign-2.0.0" scripts by specifying the "--hardlink-scons" or
+        scripts be hard links or symbolic links to the "scons-2.1.0" and
+        "sconsign-2.1.0" scripts by specifying the "--hardlink-scons" or
         "--symlink-scons" options on the command line.
 
-    --  Install "scons-2.0.0.bat" and "scons.bat" wrapper scripts in the
+    --  Install "scons-2.1.0.bat" and "scons.bat" wrapper scripts in the
         Python prefix directory on Windows (C:\Python*, for example).
         This can be disabled by specifying the "--no-install-bat" option
         on the command line.
 
         On UNIX or Linux systems, the "--install-bat" option may be
-        specified to have "scons-2.0.0.bat" and "scons.bat" files installed
+        specified to have "scons-2.1.0.bat" and "scons.bat" files installed
         in the default system script directory, which is useful if you
         want to install SCons in a shared file system directory that can
         be used to execute SCons from both UNIX/Linux and Windows systems.
 
     --  Install the SCons build engine (a Python module) in an
         appropriate version-numbered SCons library directory
-        (/usr/lib/scons-2.0.0 or C:\Python*\scons-2.0.0, for example).
+        (/usr/lib/scons-2.1.0 or C:\Python*\scons-2.1.0, for example).
         See below for more options related to installing the build
         engine library.
 
 Depending on the utilities installed on your system, any or all of the
 following packages will be built:
 
-        build/dist/scons-2.0.0-1.noarch.rpm
-        build/dist/scons-2.0.0-1.src.rpm
-        build/dist/scons-2.0.0.linux-i686.tar.gz
-        build/dist/scons-2.1.0.final.0.tar.gz
-        build/dist/scons-2.1.0.final.0.win32.exe
-        build/dist/scons-2.1.0.final.0.zip
-        build/dist/scons-doc-2.1.0.final.0.tar.gz
-        build/dist/scons-local-2.1.0.final.0.tar.gz
-        build/dist/scons-local-2.1.0.final.0.zip
-        build/dist/scons-src-2.1.0.final.0.tar.gz
-        build/dist/scons-src-2.1.0.final.0.zip
-        build/dist/scons_1.3.0-1_all.deb
+        build/dist/scons-2.1.0-1.noarch.rpm
+        build/dist/scons-2.1.0-1.src.rpm
+        build/dist/scons-2.1.0.linux-i686.tar.gz
+        build/dist/scons-2.1.0.tar.gz
+        build/dist/scons-2.1.0.win32.exe
+        build/dist/scons-2.1.0.zip
+        build/dist/scons-doc-2.1.0.tar.gz
+        build/dist/scons-local-2.1.0.tar.gz
+        build/dist/scons-local-2.1.0.zip
+        build/dist/scons-src-2.1.0.tar.gz
+        build/dist/scons-src-2.1.0.zip
+        build/dist/scons_2.1.0-1_all.deb
 
 The SConstruct file is supposed to be smart enough to avoid trying to
 build packages for which you don't have the proper utilities installed.

bin/update-release-info.py

     else:
         yyyy,mm,dd,_,_,_ = release_date
         version_tuple = version_tuple[:4] + ((yyyy*100 + mm)*100 + dd,)
-version_string = '.'.join(map(str, version_tuple))
+
+import pdb
+pdb.set_trace()
+
+if mode == 'final' or mode == 'release':
+    version_string = '.'.join(map(str, version_tuple[0:3]))
+else:
+    version_string = '.'.join(map(str, version_tuple))
+
 version_type = version_tuple[3]
+    
+
 if DEBUG: print 'version string', version_string
 
 if version_type not in ['alpha', 'beta', 'candidate', 'final']:
         '''
         XXX
         '''
+        if DEBUG: print "content before:%s"%self.content
         self.content = self.match_rel.sub(replacement, self.content, count)
+        if DEBUG: print "content after :%s"%self.content
 
     # Determine the release date and the pattern to match a date
     # Mon, 05 Jun 2010 21:17:15 -0700
 the scons-users mailing list.
 
 
-RELEASE 2.1.0.final.0 - Mon, 09 Sep 2011 16:49:58 -0700
+RELEASE 2.1.0 - Mon, 09 Sep 2011 20:54:57 -0700
 
   Please consult the RELEASE.txt file for a summary changes since the last
   release and consult the CHANGES.txt file for complete a list of changes
                             Change Log
 
 
-RELEASE 2.1.0.final.0 - Mon, 09 Sep 2011 16:49:58 -0700
+RELEASE 2.1.0 - Mon, 09 Sep 2011 20:54:57 -0700
 
   From Anton Lazarev:
     - Fix Windows resource compiler scanner to accept DOS line endings.
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.