summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--QMTest/TestSCons.py38
-rw-r--r--README.rst16
-rw-r--r--ReleaseConfig9
-rw-r--r--SConstruct6
-rw-r--r--debian/changelog13
-rw-r--r--src/Announce.txt2
-rw-r--r--src/CHANGES.txt2
7 files changed, 47 insertions, 39 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index b015637..6f6beb1 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -34,12 +34,12 @@ from TestCmd import PIPE
# 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
@@ -119,7 +119,7 @@ def search_re(out, l):
m = re.search(l, out)
if m:
return m.start()
-
+
return None
def search_re_in_list(out, l):
@@ -131,7 +131,7 @@ def search_re_in_list(out, l):
m = re.search(l, o)
if m:
return idx
-
+
return None
#
@@ -256,7 +256,7 @@ class TestSCons(TestCommon):
# 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']
@@ -312,7 +312,7 @@ class TestSCons(TestCommon):
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):
@@ -656,12 +656,12 @@ class TestSCons(TestCommon):
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,
@@ -676,12 +676,12 @@ class TestSCons(TestCommon):
'/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
@@ -959,13 +959,13 @@ SConscript( sconscript )
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)
@@ -973,7 +973,7 @@ SConscript( sconscript )
libs = ['gfortranbegin']
elif gcc_version in ('3.1', '4.0'):
libs = ['frtbegin'] + libs
-
+
return libs
def skip_if_not_msvc(self, check_platform=True):
@@ -990,7 +990,7 @@ SConscript( sconscript )
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():
@@ -1058,7 +1058,7 @@ SConscript( sconscript )
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
@@ -1086,7 +1086,7 @@ SConscript( sconscript )
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: "
@@ -1474,7 +1474,7 @@ class TimeSCons(TestSCons):
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
diff --git a/README.rst b/README.rst
index 862d323..2d09018 100644
--- a/README.rst
+++ b/README.rst
@@ -480,14 +480,14 @@ 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.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
diff --git a/ReleaseConfig b/ReleaseConfig
index c7943a1..b64ebc0 100644
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -24,21 +24,22 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
#
# 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
diff --git a/SConstruct b/SConstruct
index 722429a..f55634b 100644
--- a/SConstruct
+++ b/SConstruct
@@ -5,10 +5,10 @@
# 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__
@@ -43,7 +43,7 @@ import sys
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()
diff --git a/debian/changelog b/debian/changelog
index af58281..ec049e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.
@@ -112,7 +119,7 @@ scons (0.08-1) unstable; urgency=low
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
@@ -128,7 +135,7 @@ scons (0.07-1) unstable; urgency=low
* 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 ;-)
@@ -136,7 +143,7 @@ scons (0.07-1) unstable; urgency=low
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
diff --git a/src/Announce.txt b/src/Announce.txt
index 7d80e79..8ca84b4 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -19,7 +19,7 @@ effectively, please go to http://scons.org/lists.php#users to sign up for
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
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index a33c75d..e0a4fb5 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -4,7 +4,7 @@
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
generated by cgit v0.12 at 2024-11-23 11:31:26 (GMT)