From 1d04e02cc5dea9fe5795142aca7e6f9169452583 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Tue, 9 Sep 2008 07:01:56 +0000 Subject: [PATCH] Merged revisions 3289,3291-3299,3301-3313,3315-3347,3349-3350,3352-3354,3356,3358-3360,3362-3374,3376-3377 via svnmerge from http://scons.tigris.org/svn/scons/checkpoint ................ r3315 | stevenknight | 2008-08-26 09:44:08 -0700 (Tue, 26 Aug 2008) | 2 lines Update {CHANGES,RELEASE}.txt for today's checkpoint release. ................ r3344 | stevenknight | 2008-09-06 02:35:58 -0700 (Sat, 06 Sep 2008) | 3 lines Initialized merge tracking via "svnmerge" with revisions "1-3343" from http://scons.tigris.org/svn/scons/release ................ r3347 | stevenknight | 2008-09-06 02:40:06 -0700 (Sat, 06 Sep 2008) | 3 lines Removed unnecessary svnmerge-integrated tags (for /branches/*) copied over from /trunk. ................ r3377 | stevenknight | 2008-09-08 23:55:31 -0700 (Mon, 08 Sep 2008) | 18 lines Merged revisions 3344,3346-3348,3350-3351,3353-3355,3357,3359-3361,3363-3375 via svnmerge from http://scons.tigris.org/svn/scons/release ........ r3346 | stevenknight | 2008-09-06 02:38:28 -0700 (Sat, 06 Sep 2008) | 3 lines Remove unnecessary svnmerge-integrated tags (for /branches/* and /trunk) copied over from the /checkpoint branch. ........ r3359 | stevenknight | 2008-09-06 04:10:35 -0700 (Sat, 06 Sep 2008) | 2 lines Update information for release 1.0.1. ........ r3363 | stevenknight | 2008-09-06 07:29:51 -0700 (Sat, 06 Sep 2008) | 2 lines Release update for the last-minute Ubuntu variable name patch. ........ ................ git-svn-id: http://scons.tigris.org/svn/scons/trunk@3378 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- QMTest/TestSCons.py | 2 +- README | 40 ++++++++++++++++++++-------------------- SConstruct | 4 ++-- src/CHANGES.txt | 16 ++++++++++++++++ src/RELEASE.txt | 2 +- 5 files changed, 40 insertions(+), 24 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 2d042667..d3a57d0b 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.0' +default_version = '1.0.1' copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008' diff --git a/README b/README index 4d85f543..2ceef87b 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.0.noarch.rpm + Red Hat Linux scons-1.0.1.noarch.rpm Debian GNU/Linux use apt-get to get the official package - Windows scons-1.0.0.win32.exe + Windows scons-1.0.1.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.0" and "sconsign-1.0.0" + -- Install the version-numbered "scons-1.0.1" and "sconsign-1.0.1" 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.0" and - "sconsign-1.0.0" scripts by specifying the "--hardlink-scons" or + 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 "--symlink-scons" options on the command line. - -- Install "scons-1.0.0.bat" and "scons.bat" wrapper scripts in the + -- Install "scons-1.0.1.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.0.bat" and "scons.bat" files installed + specified to have "scons-1.0.1.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.0 or C:\Python*\scons-1.0.0, for example). + (/usr/lib/scons-1.0.1 or C:\Python*\scons-1.0.1, 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.0-1.noarch.rpm - build/dist/scons-1.0.0-1.src.rpm - build/dist/scons-1.0.0.linux-i686.tar.gz - build/dist/scons-1.0.0.tar.gz - build/dist/scons-1.0.0.win32.exe - build/dist/scons-1.0.0.zip - build/dist/scons-doc-1.0.0.tar.gz - build/dist/scons-local-1.0.0.tar.gz - build/dist/scons-local-1.0.0.zip - build/dist/scons-src-1.0.0.tar.gz - build/dist/scons-src-1.0.0.zip - build/dist/scons_1.0.0-1_all.deb + 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 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 62561e49..34059502 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 = 'August 2008' +month_year = 'September 2008' # # __COPYRIGHT__ @@ -45,7 +45,7 @@ import sys import tempfile project = 'scons' -default_version = '1.0.0' +default_version = '1.0.1' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years SConsignFile() diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 9f46e887..1055398f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -20,6 +20,22 @@ RELEASE 1.X - XXX - Fix Glob() polluting LIBPATH by returning copy of list + +RELEASE 1.0.1 - Sat, 06 Sep 2008 07:29:34 -0700 + + From Greg Noel: + + - Add a FindFile() section to the User's Guide. + + - Fix the FindFile() documentation in the man page. + + - Fix formatting errors in the Package() description in the man page. + + - Escape parentheses that appear within variable names when spawning + command lines using os.system(). + + + RELEASE 1.0.0 - XXX From Jared Grubb: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index bdf6feb5..f4aad8c6 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.0 - Sat, 09 Aug 2008 12:19:44 -0700 +RELEASE 1.0.1 - Sat, 06 Sep 2008 07:29:34 -0700 Please consult the CHANGES.txt file for a list of specific changes since last release. -- 2.26.2