From 16e3b96cff107a782238141719d4282338cb8db8 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Fri, 10 Oct 2008 16:28:25 +0000 Subject: [PATCH] Merged revisions 3378-3423,3425-3532,3534-3599,3601-3610 via svnmerge from http://scons.tigris.org/svn/scons/checkpoint ................ r3425 | stevenknight | 2008-09-15 11:21:57 -0700 (Mon, 15 Sep 2008) | 2 lines Update version and dates for the 20080915 checkpoint release. ................ r3534 | stevenknight | 2008-10-01 23:20:52 -0700 (Wed, 01 Oct 2008) | 2 lines Update for 1.1 release candidate checkpoint. ................ r3610 | stevenknight | 2008-10-10 09:25:52 -0700 (Fri, 10 Oct 2008) | 9 lines Merged revisions 3377-3600,3602-3609 via svnmerge from http://scons.tigris.org/svn/scons/release ........ r3603 | stevenknight | 2008-10-10 05:42:04 -0700 (Fri, 10 Oct 2008) | 2 lines Updates for the 1.1.0 release. ........ ................ git-svn-id: http://scons.tigris.org/svn/scons/trunk@3611 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- QMTest/TestSCons.py | 2 +- README | 40 ++++++++++++++++++++-------------------- SConstruct | 4 ++-- src/CHANGES.txt | 2 +- src/RELEASE.txt | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index a35bf8de..45970225 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -42,7 +42,7 @@ from TestCommon import __all__ # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '1.0.1' +default_version = '1.1.0' copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008' diff --git a/README b/README index 2ceef87b..c59911a2 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.0.1.noarch.rpm + Red Hat Linux scons-1.1.0.noarch.rpm Debian GNU/Linux use apt-get to get the official package - Windows scons-1.0.1.win32.exe + Windows scons-1.1.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.0.1" and "sconsign-1.0.1" + -- Install the version-numbered "scons-1.1.0" and "sconsign-1.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 @@ -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.0.1" and - "sconsign-1.0.1" scripts by specifying the "--hardlink-scons" or + scripts be hard links or symbolic links to the "scons-1.1.0" and + "sconsign-1.1.0" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. - -- Install "scons-1.0.1.bat" and "scons.bat" wrapper scripts in the + -- Install "scons-1.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-1.0.1.bat" and "scons.bat" files installed + specified to have "scons-1.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-1.0.1 or C:\Python*\scons-1.0.1, for example). + (/usr/lib/scons-1.1.0 or C:\Python*\scons-1.1.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.0.1-1.noarch.rpm - build/dist/scons-1.0.1-1.src.rpm - build/dist/scons-1.0.1.linux-i686.tar.gz - build/dist/scons-1.0.1.tar.gz - build/dist/scons-1.0.1.win32.exe - build/dist/scons-1.0.1.zip - build/dist/scons-doc-1.0.1.tar.gz - build/dist/scons-local-1.0.1.tar.gz - build/dist/scons-local-1.0.1.zip - build/dist/scons-src-1.0.1.tar.gz - build/dist/scons-src-1.0.1.zip - build/dist/scons_1.0.1-1_all.deb + build/dist/scons-1.1.0-1.noarch.rpm + build/dist/scons-1.1.0-1.src.rpm + build/dist/scons-1.1.0.linux-i686.tar.gz + build/dist/scons-1.1.0.tar.gz + build/dist/scons-1.1.0.win32.exe + build/dist/scons-1.1.0.zip + build/dist/scons-doc-1.1.0.tar.gz + build/dist/scons-local-1.1.0.tar.gz + build/dist/scons-local-1.1.0.zip + build/dist/scons-src-1.1.0.tar.gz + build/dist/scons-src-1.1.0.zip + build/dist/scons_1.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. diff --git a/SConstruct b/SConstruct index 34059502..21c5d6f8 100644 --- a/SConstruct +++ b/SConstruct @@ -9,7 +9,7 @@ copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008' # This gets inserted into the man pages to reflect the month of release. -month_year = 'September 2008' +month_year = 'October 2008' # # __COPYRIGHT__ @@ -45,7 +45,7 @@ import sys import tempfile project = 'scons' -default_version = '1.0.1' +default_version = '1.1.0' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years SConsignFile() diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 69a874f1..ad77deea 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,7 +8,7 @@ -RELEASE 1.X - XXX +RELEASE 1.1.0 - Thu, 09 Oct 2008 08:33:47 -0700 From Steven Knight: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index f4aad8c6..2bca5312 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -20,7 +20,7 @@ more effectively, please sign up for the scons-users mailing list at: -RELEASE 1.0.1 - Sat, 06 Sep 2008 07:29:34 -0700 +RELEASE 1.1.0 - Thu, 09 Oct 2008 08:33:47 -0700 Please consult the CHANGES.txt file for a list of specific changes since last release. -- 2.26.2