Merge tag 'upstream/2.5.0+repack'

Upstream version 2.5.0+repack

1 files changed, 7 insertions, 28 deletions

diff --git a/SConstruct b/SConstruct
index 7b0e5aa..3ebe44c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3,13 +3,13 @@
 #
 # See the README.rst file for an overview of how SCons is built and tested.
 
-copyright_years = '2001 - 2015'
+copyright_years = '2001 - 2016'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'November 2015'
+month_year = 'April 2016'
 
 #
-# Copyright (c) 2001 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -43,7 +43,7 @@ import tempfile
 import bootstrap
 
 project = 'scons'
-default_version = '2.4.1'
+default_version = '2.5.0'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 platform = distutils.util.get_platform()
@@ -88,7 +88,6 @@ fakeroot = whereis('fakeroot')
 gzip = whereis('gzip')
 rpmbuild = whereis('rpmbuild')
 hg = os.path.exists('.hg') and whereis('hg')
-svn = os.path.exists('.svn') and whereis('svn')
 unzip = whereis('unzip')
 zip = whereis('zip')
 
@@ -117,16 +116,11 @@ if not version:
     version = default_version
 
 hg_status_lines = []
-svn_status_lines = []
 
 if hg:
     cmd = "%s status --all 2> /dev/null" % hg
     hg_status_lines = os.popen(cmd, "r").readlines()
 
-if svn:
-    cmd = "%s status --verbose 2> /dev/null" % svn
-    svn_status_lines = os.popen(cmd, "r").readlines()
-
 revision = ARGUMENTS.get('REVISION', '')
 def generate_build_id(revision):
     return revision
@@ -145,17 +139,6 @@ if not revision and hg:
                 result = result + '[MODIFIED]'
             return result
 
-if not revision and svn:
-    svn_info = os.popen("%s info 2> /dev/null" % svn, "r").read()
-    m = re.search('Revision: (\d+)', svn_info)
-    if m:
-        revision = m.group(1)
-        def generate_build_id(revision):
-            result = 'r' + revision
-            if [l for l in svn_status_lines if l[0] in 'ACDMR']:
-                result = result + '[MODIFIED]'
-            return result
-
 checkpoint = ARGUMENTS.get('CHECKPOINT', '')
 if checkpoint:
     if checkpoint == 'd':
@@ -236,7 +219,7 @@ command_line_variables = [
 
     ("REVISION=",       "The revision number of the source being built.  " +
                         "The default is the Subversion revision returned " +
-                        "'svn info', with an appended string of " +
+                        "'hg heads', with an appended string of " +
                         "'[MODIFIED]' if there are any changes in the " +
                         "working copy."),
 
@@ -822,7 +805,7 @@ for p in [ scons ]:
 
     #
     # Now run everything in src_file through the sed command we
-    # concocted to expand SConstruct, 2.4.1, etc.
+    # concocted to expand SConstruct, 2.5.0, etc.
     #
     for b in src_files:
         s = p['filemap'].get(b, b)
@@ -1234,12 +1217,8 @@ sfiles = None
 if hg_status_lines:
     slines = [l for l in hg_status_lines if l[0] in 'ACM']
     sfiles = [l.split()[-1] for l in slines]
-elif svn_status_lines:
-    slines = [l for l in svn_status_lines if l[0] in ' MA']
-    sentries = [l.split()[-1] for l in slines]
-    sfiles = list(filter(os.path.isfile, sentries))
 else:
-   print "Not building in a Mercurial or Subversion tree; skipping building src package."
+   print "Not building in a Mercurial tree; skipping building src package."
 
 if sfiles:
     remove_patterns = [