From b15827bf6461723209ffbd36268814713abfdaac Mon Sep 17 00:00:00 2001 From: garyo Date: Wed, 24 Mar 2010 03:52:50 +0000 Subject: [PATCH] Merged r4724 (1.3.0 release changes) back into trunk. git-svn-id: http://scons.tigris.org/svn/scons/trunk@4726 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- QMTest/TestSCons.py | 2 +- README | 40 ++++++++++++++++++++-------------------- SConstruct | 2 +- src/CHANGES.txt | 11 ++++++++++- src/RELEASE.txt | 10 +++++----- 5 files changed, 37 insertions(+), 28 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 21efa3a1..506f7084 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -50,7 +50,7 @@ from TestCommon import __all__ # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '1.2.0' +default_version = '1.3.0' copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010' diff --git a/README b/README index 6eff34c9..efb7c083 100644 --- a/README +++ b/README @@ -83,11 +83,11 @@ In this case, your options are: -- (Optional.) Install from a pre-packaged SCons package that does not require distutils: - Red Hat Linux scons-1.2.0.noarch.rpm + Red Hat Linux scons-1.3.0.noarch.rpm Debian GNU/Linux use apt-get to get the official package - Windows scons-1.2.0.win32.exe + Windows scons-1.3.0.win32.exe -- (Recommended.) Download the latest distutils package from the following URL: @@ -159,7 +159,7 @@ And on Windows: By default, the above commands will do the following: - -- Install the version-numbered "scons-1.2.0" and "sconsign-1.2.0" + -- Install the version-numbered "scons-1.3.0" and "sconsign-1.3.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 @@ -173,24 +173,24 @@ By default, the above commands will do the following: 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-1.2.0" and - "sconsign-1.2.0" scripts by specifying the "--hardlink-scons" or + scripts be hard links or symbolic links to the "scons-1.3.0" and + "sconsign-1.3.0" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. - -- Install "scons-1.2.0.bat" and "scons.bat" wrapper scripts in the + -- Install "scons-1.3.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-1.2.0.bat" and "scons.bat" files installed + specified to have "scons-1.3.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-1.2.0 or C:\Python*\scons-1.2.0, for example). + (/usr/lib/scons-1.3.0 or C:\Python*\scons-1.3.0, for example). See below for more options related to installing the build engine library. @@ -527,18 +527,18 @@ On Windows: Depending on the utilities installed on your system, any or all of the following packages will be built: - build/dist/scons-1.2.0-1.noarch.rpm - build/dist/scons-1.2.0-1.src.rpm - build/dist/scons-1.2.0.linux-i686.tar.gz - build/dist/scons-1.2.0.tar.gz - build/dist/scons-1.2.0.win32.exe - build/dist/scons-1.2.0.zip - build/dist/scons-doc-1.2.0.tar.gz - build/dist/scons-local-1.2.0.tar.gz - build/dist/scons-local-1.2.0.zip - build/dist/scons-src-1.2.0.tar.gz - build/dist/scons-src-1.2.0.zip - build/dist/scons_1.2.0-1_all.deb + build/dist/scons-1.3.0-1.noarch.rpm + build/dist/scons-1.3.0-1.src.rpm + build/dist/scons-1.3.0.linux-i686.tar.gz + build/dist/scons-1.3.0.tar.gz + build/dist/scons-1.3.0.win32.exe + build/dist/scons-1.3.0.zip + build/dist/scons-doc-1.3.0.tar.gz + build/dist/scons-local-1.3.0.tar.gz + build/dist/scons-local-1.3.0.zip + build/dist/scons-src-1.3.0.tar.gz + build/dist/scons-src-1.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 packages for which you don't have the proper utilities installed. diff --git a/SConstruct b/SConstruct index 1c2cc47e..dc2036b5 100644 --- a/SConstruct +++ b/SConstruct @@ -45,7 +45,7 @@ import sys import tempfile project = 'scons' -default_version = '1.2.0' +default_version = '1.3.0' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3a1b8e3d..9749e432 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -7,8 +7,17 @@ Change Log +RELEASE 1.3.0 - Tue, 23 Mar 2010 21:44:19 -0400 -RELEASE X.X.X - XXX + From Steven Knight: + + - Update man page and documentation. + + From William Deegan (plus minor patch from Gary Oberbrunner): + + - Support Visual Studio 8.0 Express + +RELEASE 1.2.0.d20100306 - Sat, 06 Mar 2010 16:18:33 -0800 From Luca Falavigna: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 8e462e62..6342483d 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -14,19 +14,19 @@ to solve build problems. You do not, however, need to know Python to use SCons effectively. So that everyone using SCons can help each other learn how to use it -more effectively, please sign up for the scons-users mailing list at: +more effectively, please sign up for the scons-users mailing list using +the instructions on the following page: - http://lists.sourceforge.net/lists/listinfo/scons-users + http://scons.org/lists.php -RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800 +RELEASE 1.3.0 - Tue, 23 Mar 2010 21:44:19 -0400 Please consult the CHANGES.txt file for a list of specific changes since last release. - Please note the following important changes scheduled for the next - minor release (1.3.0): + Please note the following important changes in this release: -- DEPRECATED FEATURES WILL GENERATE MANDATORY WARNINGS IN 1.3.0 -- 2.26.2