Gary Oberbrunner avatar Gary Oberbrunner committed 1bf6b35 Merge

Merged rel_2.3.0 branch after release.

Comments (0)

Files changed (9)

 d958f66a48e51acfe0a9a175eba42f41fd49dfda 0.98.3
 e5e9f66add3c1b5cc95536628a61e4959533ab42 1.2.0
 6820de195f6c6e4c7ddf4b2eee89ae6a974c6d14 2.1.0.final.0
+38e9e6d0ba0ca64702b2504c32c68bb7bb88c630 2.3.0

QMTest/TestSCons.py

 # here provides some independent verification that what we packaged
 # conforms to what we expect.
 
-default_version = '2.1.0.alpha.yyyymmdd'
+default_version = '2.3.0'
 
-copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012'
+copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013'
 
 python_version_unsupported = (2, 3, 0)
-python_version_deprecated = (2, 4, 0)
+python_version_deprecated = (2, 7, 0)
 
 # In the checked-in source, the value of SConsVersion in the following
 # line must remain "__ VERSION __" (without the spaces) so the built
     m = re.search(l, out)
     if m:
         return m.start()
-    
+
     return None
 
 def search_re_in_list(out, l):
         m = re.search(l, o)
         if m:
             return idx
-    
+
     return None
 
 #
         # control character output on FC8
         # TERM can cause test failures due to control chars in prompts etc.
         os.environ['TERM'] = 'dumb'
-        
+
         self.ignore_python_version = kw.get('ignore_python_version',1)
         if kw.get('ignore_python_version', -1) != -1:
             del kw['ignore_python_version']
             if norm and os.sep != '/':
                 result = result.replace(os.sep, '/')
             return result
-        
+
         return self.where_is(prog)
 
     def detect_tool(self, tool, prog=None, ENV=None):
                 self._java_env = {}
             except KeyError:
                 pass
-    
+
             import SCons.Environment
             env = SCons.Environment.Environment()
             self._java_env[version] = env
-    
-    
+
+
             if version:
                 patterns = [
                     '/usr/java/jdk%s*/bin'    % version,
                     '/usr/local/j2sdk*/bin',
                 ]
                 java_path = self.paths(patterns) + [env['ENV']['PATH']]
-    
+
             env['ENV']['PATH'] = os.pathsep.join(java_path)
             return env['ENV']
 
         return None
-        
+
     def java_where_includes(self,version=None):
         """
         Return java include paths compiling java jni code
 
         libs = ['g2c']
         cmd = ['gcc','-v']
-    
+
         try:
             p = Popen(cmd, stdout=PIPE, stderr=PIPE)
             stdout, stderr = p.communicate()
         except:
             return libs
-    
+
         m = re.search('(gcc\s+version|gcc-Version)\s+(\d\.\d)', stderr)
         if m:
             gcc_version = m.group(2)
                 libs = ['gfortranbegin']
             elif gcc_version in ('3.1', '4.0'):
                 libs = ['frtbegin'] + libs
-    
+
         return libs
 
     def skip_if_not_msvc(self, check_platform=True):
                 msg = "Skipping Visual C/C++ test on non-Windows platform '%s'\n" % sys.platform
                 self.skip_test(msg)
                 return
-        
+
         try:
             import SCons.Tool.MSCommon as msc
             if not msc.msvc_exists():
                         if flag == self.CR:
                             # up to date
                             log=log + \
-                                 re.escape("scons: Configure: \"%s\" is up to date." 
+                                 re.escape("scons: Configure: \"%s\" is up to date."
                                            % file) + ls
                             log=log+re.escape("scons: Configure: The original builder "
                                               "output was:") + ls
             if doCheckLog: lastEnd = matchPart(ls, logfile, lastEnd)
             if doCheckLog and lastEnd != len(logfile):
                 raise NoMatch(lastEnd)
-            
+
         except NoMatch, m:
             print "Cannot match log file against log regexp."
             print "log file: "
                 source = os.path.join(root, filename)
                 destination = source.replace(source_dir, dest_dir)
                 shutil.copy2(source, destination)
-    
+
 
 # In some environments, $AR will generate a warning message to stderr
 # if the library doesn't previously exist and is being created.  One
         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.alpha.yyyymmdd.tar.gz
-        build/dist/scons-2.1.0.alpha.yyyymmdd.win32.exe
-        build/dist/scons-2.1.0.alpha.yyyymmdd.zip
-        build/dist/scons-doc-2.1.0.alpha.yyyymmdd.tar.gz
-        build/dist/scons-local-2.1.0.alpha.yyyymmdd.tar.gz
-        build/dist/scons-local-2.1.0.alpha.yyyymmdd.zip
-        build/dist/scons-src-2.1.0.alpha.yyyymmdd.tar.gz
-        build/dist/scons-src-2.1.0.alpha.yyyymmdd.zip
+        build/dist/scons-2.3.0.tar.gz
+        build/dist/scons-2.3.0.win32.exe
+        build/dist/scons-2.3.0.zip
+        build/dist/scons-doc-2.3.0.tar.gz
+        build/dist/scons-local-2.3.0.tar.gz
+        build/dist/scons-local-2.3.0.zip
+        build/dist/scons-src-2.3.0.tar.gz
+        build/dist/scons-src-2.3.0.zip
         build/dist/scons_1.3.0-1_all.deb
 
 The SConstruct file is supposed to be smart enough to avoid trying to build
 
 #
 # After updating this file, run bin/update-release-info.py <MODE>.
-# 
+#
 
 # The version tuple that will be used for the release.  The fields are
 # (major, minor, micro, type, patchlevel).  The release level is one of
 # 'alpha', 'beta', 'candidate', or 'final'.  If the release type is not
 # 'final', the patchlevel is set to the release date.  This value is
-# manatory and must be present in this file.
-version_tuple = (2, 2, 0, 'final', 0)
+# mandatory and must be present in this file.
+#version_tuple = (2, 2, 0, 'final', 0)
+version_tuple = (2, 3, 0)
 
 # Python versions prior to unsupported_python_version cause a fatal error
 # when that version is used.  Python versions prior to deprecate_python_version
 # cause a warning to be issued (assuming it's not disabled).  These values are
 # mandatory and must be present in the configuration file.
 unsupported_python_version = (2, 3, 0)
-deprecated_python_version = (2, 4, 0)
+deprecated_python_version = (2, 7, 0)
 
 # If release_date is (yyyy, mm, dd, hh, mm, ss), that is used as the release
 # date and time.  If release_date is (yyyy, mm, dd), it is used for the
 
 # When this gets changed, you must also change the copyright_years string
 # in QMTest/TestSCons.py so the test scripts look for the right string.
-copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012'
+copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'MONTH YEAR'
+month_year = 'March 2013'
 
 #
 # __COPYRIGHT__
 import tempfile
 
 project = 'scons'
-default_version = '2.1.0.alpha.yyyymmdd'
+default_version = '2.3.0'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
+scons (2.3.0) unstable; urgency=low
+
+  * Maintenance release.
+
+ -- Gary Oberbrunner <garyo@oberbrunner.com>  Sat, 9 Feb 2013 21:00:00 -0500
+
+
 scons (2.2.0) unstable; urgency=low
 
   * Maintenance release.
 scons (0.07-3) unstable; urgency=low
 
   * Removing /usr/doc links
-  * Python 2.1 -> Python 2.2 
+  * Python 2.1 -> Python 2.2
 
  -- Moshe Zadka <moshez@debian.org>  Tue, 27 Aug 2002 18:48:02 +0300
 
 
   * New upstream version
   * Packaging properly, instead of as debian native
-  * Modifying copyright to include upstream location (Closes: #144491) 
+  * Modifying copyright to include upstream location (Closes: #144491)
   * Fixing my e-mail address (Closes: #144490)
     * Thanks for looking after my packages, tbm ;-)
 
 
 scons (0.06-1) unstable; urgency=low
 
-  * New upstream version 
+  * New upstream version
 
  -- Moshe Zadka <moshez@debian.org>  Mon, 15 Apr 2002 19:22:09 +0300
 
 the scons-users mailing list.
 
 
-RELEASE 2.3.0 - FEB XXX 2013
+RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400
 
   Please consult the RELEASE.txt file for a summary of changes since the last
   release and consult the CHANGES.txt file for complete a list of changes
 
   Please note the following important changes since release 2.2.0:
 
+    -- SUPPORT FOR PYTHON VERSIONS BEFORE 2.7 IS NOW DEPRECATED
+
+       ***IMPORTANT***: This release is the last version of SCons to support
+       Python versions older than 2.7.  This release will warn if you are
+       running on Python 2.6 or older; future releases will probably not
+       work at all, as we are moving toward supporting Python 3.
+       Use --warn=no-python-version to suppress the warning if needed.
+
     -- A lot of python pre-2.4 compatibility code was removed
        in this release.  2.4 is the official floor for SCons,
        but this release will likely enforce it more rigidly.
 
                             Change Log
 
-RELEASE 2.3 -
+RELEASE 2.3.0 - Mon, 02 Mar 2013 13:22:29 -0400
 
   From Anatoly Techtonik:
     - Added ability to run scripts/scons.py directly from source checkout

src/engine/SCons/Script/Main.py

             SCons.Taskmaster.OutOfDateTask.fail_stop(self)
             exit_status = status
             this_build_status = status
-            
+
     def executed(self):
         t = self.targets[0]
         if self.top and not t.has_builder() and not t.side_effect:
             except ValueError:
                 t, e = exc_info
                 tb = None
-                
+
         # Deprecated string exceptions will have their string stored
         # in the first entry of the tuple.
         if e is None:
         errfmt = "scons: *** [%s] %s\n"
         sys.stderr.write(errfmt % (nodename, buildError))
 
-        if (buildError.exc_info[2] and buildError.exc_info[1] and 
+        if (buildError.exc_info[2] and buildError.exc_info[1] and
            not isinstance(
-               buildError.exc_info[1], 
+               buildError.exc_info[1],
                (EnvironmentError, SCons.Errors.StopError,
                             SCons.Errors.UserError))):
             type, value, trace = buildError.exc_info
     Input is a "pre-processed" stack trace in the form
     returned by traceback.extract_tb() or traceback.extract_stack()
     """
-    
+
     tb.reverse()
 
     # find the deepest traceback frame that is not part
 
 def _scons_user_error(e):
     """Handle user errors. Print out a message and a description of the
-    error, along with the line number and routine where it occured. 
+    error, along with the line number and routine where it occured.
     The file and line number will be the deepest stack frame that is
     not part of SCons itself.
     """
     else:
         site_dir_name = "site_scons"
         err_if_not_found = False
-        
+
     site_dir = os.path.join(topdir, site_dir_name)
     if not os.path.exists(site_dir):
         if err_if_not_found:
         _load_site_scons_dir(d.path, options.site_dir)
     elif not options.no_site_dir:
         _load_all_site_scons_dirs(d.path)
-        
+
     if options.include_dir:
         sys.path = options.include_dir + sys.path
 
     # warning about deprecated Python versions--delayed until here
     # in case they disabled the warning in the SConscript files.
     if python_version_deprecated():
-        msg = "Support for pre-2.4 Python (%s) is deprecated.\n" + \
+        msg = "Support for pre-%s Python version (%s) is deprecated.\n" + \
               "    If this will cause hardship, contact dev@scons.tigris.org."
+        deprecated_version_string = ".".join(map(str, deprecated_python_version))
         SCons.Warnings.warn(SCons.Warnings.PythonVersionWarning,
-                            msg % python_version_string())
+                            msg % (deprecated_version_string, python_version_string()))
 
     if not options.help:
         SCons.SConf.CreateConfigHBuilder(SCons.Defaults.DefaultEnvironment())
                         # x doesn't have a cwd, so it's either not a target,
                         # or not a file, so go ahead and keep it as a default
                         # target and let the engine sort it out:
-                        return 1                
+                        return 1
                 d = list(filter(check_dir, SCons.Script.DEFAULT_TARGETS))
                 SCons.Script.DEFAULT_TARGETS[:] = d
                 target_top = None
     except (ImportError, AttributeError):
         # On Windows there is no scons.py, so there is no
         # __main__.__version__, hence there is no script version.
-        pass 
+        pass
     parts.append(version_string("engine", SCons))
     parts.append(path_string("engine", SCons))
     parts.append("__COPYRIGHT__")
     values = SConsOptions.SConsValues(parser.get_default_values())
 
     OptionsParser = parser
-    
+
     try:
         _exec_main(parser, values)
     except SystemExit, s:
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.