From ad3e89d6ead2da35e0eaf219e75b7fc91e9790de Mon Sep 17 00:00:00 2001 From: stevenknight Date: Mon, 8 Jan 2007 17:33:58 +0000 Subject: [PATCH] Merged revisions 1757-1765 via svnmerge from http://scons.tigris.org/svn/scons/branches/core ........ r1759 | stevenknight | 2007-01-07 09:36:37 -0600 (Sun, 07 Jan 2007) | 1 line 0.96.D541 - Update the Copyright year string to include 2007. Automate updating the month+year string in man page title headers. Fix hard-coded __revision__ strings that crept into some older tests. ........ r1765 | stevenknight | 2007-01-08 11:28:02 -0600 (Mon, 08 Jan 2007) | 1 line 0.96.D543 - Update development line for 0.96.94. ........ git-svn-id: http://scons.tigris.org/svn/scons/trunk@1767 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- HOWTO/release.txt | 32 +++- QMTest/TestSCons.py | 2 +- README | 50 ++++--- SConstruct | 2 +- debian/changelog | 4 +- rpm/scons.spec.in | 2 +- src/CHANGES.txt | 154 +++++++++++++++++++- src/setup.py | 8 +- src/{test_copyrights.py => test_strings.py} | 0 9 files changed, 224 insertions(+), 30 deletions(-) rename src/{test_copyrights.py => test_strings.py} (100%) diff --git a/HOWTO/release.txt b/HOWTO/release.txt index 57f38b77..cff44b9e 100644 --- a/HOWTO/release.txt +++ b/HOWTO/release.txt @@ -347,8 +347,10 @@ Things to do to release a new X.Y version of SCons: download.php: new version number - versions.php: add new version number do $docversions[], - shift index numbers :-( + includes/versions.php: + update $stablerelease and/or $latestrelease + add new version number do $docversions[], + SHIFT $docversions[] INDEX NUMBERS :-( index.php: announcement on the home page remove out-of-date announcements @@ -405,6 +407,32 @@ Things to do to release a new X.Y version of SCons: Add news item to the SourceForge project page + Pull down "Project => News" + + Click "Submit" + + Fill in the "Subject:" box + + Cut-and-paste the announcement text into the "Details:" box + + Click "submit" + + + + Add news item to the tigris.org project page + + Click "Announcements" + + Click "Add new announcement" + + Double-check the date (probably already set) + + Fill in the "Headline" box + + Fill in the "Body" box (probably short) + + Click "Add new announcement" + Announce to the following mailing lists (template below): diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 091c29f8..79e96d70 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -30,7 +30,7 @@ from TestCommon import __all__ # to what we expect. (If we derived the version number from the same # data driving the build we might miss errors if the logic breaks.) -SConsVersion = '0.96.93' +SConsVersion = '0.96.94' __all__.extend([ 'TestSCons', 'python', diff --git a/README b/README index 518de06e..8a5b5626 100644 --- a/README +++ b/README @@ -83,12 +83,12 @@ In this case, your options are: -- (Optional.) Install from a pre-packaged SCons package that does not require distutils: - Red Hat Linux scons-0.96.93.noarch.rpm + Red Hat Linux scons-0.96.94.noarch.rpm - Debian GNU/Linux scons_0.96.93_all.deb + Debian GNU/Linux scons_0.96.94_all.deb (or use apt-get) - Windows scons-0.96.93.win32.exe + Windows scons-0.96.94.win32.exe -- (Recommended.) Download the latest distutils package from the following URL: @@ -160,7 +160,7 @@ And on Windows: By default, the above commands will do the following: - -- Install the version-numbered "scons-0.96.93" and "sconsign-0.96.93" + -- Install the version-numbered "scons-0.96.94" and "sconsign-0.96.94" 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,15 +173,15 @@ By default, the above commands will do the following: if you want to install and experiment with a new version before 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-0.96.93" and "sconsign-0.96.93" scripts + symbolic links to the "scons-0.96.94" and "sconsign-0.96.94" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. - -- Install "scons-0.96.93.bat" and "scons.bat" wrapper scripts in the + -- Install "scons-0.96.94.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-0.96.93.bat" + "--install-bat" option may be specified to have "scons-0.96.94.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 @@ -189,7 +189,7 @@ By default, the above commands will do the following: -- Install the SCons build engine (a Python module) in an appropriate version-numbered SCons library directory - (/usr/lib/scons-0.96.93 or C:\Python*\scons-0.96.93, for example). + (/usr/lib/scons-0.96.94 or C:\Python*\scons-0.96.94, for example). See below for more options related to installing the build engine library. @@ -504,7 +504,15 @@ you can build everything by simply running it: $ scons If you don't have SCons version 0.96.93 later already installed on your -system, you can build this version of SCons with itself with a little more +system, you can use the supplied bootstrap.py script: + + $ python bootstrap.py build/scons + +The bootstrap.py keeps the src/ subdirectory free of compiled Python +(*.pyc or *.pyo) files by copying the necessary SCons files to a local +bootstrap/ subdirectory and executing it from there. + +You can also build this version of SCons by hand with a little more typing. On UNIX or Linux (using sh or a derivative like bash or ksh): $ export SCONS_LIB_DIR=`pwd`/src/engine @@ -518,18 +526,18 @@ On Windows: Depending on the utilities installed on your system, any or all of the following packages will be built: - build/dist/scons-0.96.93-1.noarch.rpm - build/dist/scons-0.96.93-1.src.rpm - build/dist/scons-0.96.93.linux-i686.tar.gz - build/dist/scons-0.96.93.tar.gz - build/dist/scons-0.96.93.win32.exe - build/dist/scons-0.96.93.zip - build/dist/scons-doc-0.96.93.tar.gz - build/dist/scons-local-0.96.93.tar.gz - build/dist/scons-local-0.96.93.zip - build/dist/scons-src-0.96.93.tar.gz - build/dist/scons-src-0.96.93.zip - build/dist/scons_0.96.93-1_all.deb + build/dist/scons-0.96.94-1.noarch.rpm + build/dist/scons-0.96.94-1.src.rpm + build/dist/scons-0.96.94.linux-i686.tar.gz + build/dist/scons-0.96.94.tar.gz + build/dist/scons-0.96.94.win32.exe + build/dist/scons-0.96.94.zip + build/dist/scons-doc-0.96.94.tar.gz + build/dist/scons-local-0.96.94.tar.gz + build/dist/scons-local-0.96.94.zip + build/dist/scons-src-0.996.94tar.gz + build/dist/scons-src-0.96.94.zip + build/dist/scons_0.96.94-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 a61466af..374cef0c 100644 --- a/SConstruct +++ b/SConstruct @@ -45,7 +45,7 @@ import sys import time project = 'scons' -default_version = '0.96.93' +default_version = '0.96.94' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years Default('.') diff --git a/debian/changelog b/debian/changelog index dc5945b4..84f2b2e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -scons (0.96-93) unstable; urgency=low +scons (0.96-94) unstable; urgency=low * Pre-release of eighth beta release. - -- Steven Knight Mon, 06 Nov 2006 00:44:11 -0600 + -- Steven Knight Sun, 07 Jan 2007 18:36:20 -0600 scons (0.96-1) unstable; urgency=low diff --git a/rpm/scons.spec.in b/rpm/scons.spec.in index 50bae78b..3b49196e 100644 --- a/rpm/scons.spec.in +++ b/rpm/scons.spec.in @@ -1,5 +1,5 @@ %define name scons -%define version 0.96.93 +%define version 0.96.94 %define release 1 Summary: an Open Source software construction tool diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3678dd18..711b26ca 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,7 +8,159 @@ -RELEASE 0.97 - XXX +RELEASE 0.96.94 - Sun, 07 Jan 2007 18:36:20 -0600 + + NOTE: This is a pre-release of 0.97 for testing purposes. + + From Anonymous: + + - Allow arbitrary white space after a SWIG %module declaration. + + From Paul: + + - When compiling resources under MinGW, make sure there's a space + between the --include-dir option and its argument. + + From Jay Kint: + + - Alleviate long command line issues on Windows by executing command + lines directly via os.spawnv() if the command line doesn't need + shell interpretation (has no pipes, redirection, etc.). + + From Walter Franzini: + + - Exclude additional Debian packaging files from the copyright check. + + From Fawad Halim: + + - Handle the conflict between the impending Python 2.6 'as' keyword + and our Tool/as.py module name. + + From Steven Knight: + + - Speed up the Node.FS.Dir.rel_path() method used to generate path names + that get put into the .sconsign* file(s). + + - Optimize Node.FS.Base.get_suffix() by computing the suffix once, up + front, when we set the Node's name. (Duh...) + + - Reduce the Memoizer's responsibilities to simply counting hits and + misses when the --debug=memoizer option is used, not to actually + handling the key calculation and memoization itself. This speeds + up some configurations significantly, and should cause no functional + differences. + + - Add a new scons-time script with subcommands for generating + consistent timing output from SCons configurations, extracting + various information from those timings, and displaying them in + different formats. + + - Reduce some unnecessary stat() calls from on-disk entry type checks. + + - Fix SideEffect() when used with -j, which was badly broken in 0.96.93. + + - Propagate TypeError exceptions when evaluating construction variable + expansions up the stack, so users can see what's going on. + + - When disambiguating a Node.FS.Entry into a Dir or File, don't look + in the on-disk source directory until we've confirmed there's no + on-disk entry locally and there *is* one in the srcdir. This avoids + creating a phantom Node that can interfere with dependencies on + directory contents. + + - Add an AllowSubstExceptions() function that gives the SConscript + files control over what exceptions cause a string to expand to '' + vs. terminating processing with an error. + + - Allow the f90.py and f95.py Tool modules to compile earlier source + source files of earlier Fortran version. + + - Fix storing signatures of files retrieved from CacheDir() so they're + correctly identified as up-to-date next invocation. + + - Make sure lists of computed source suffixes cached by Builder objects + don't persist across changes to the list of source Builders (so the + addition of suffixes like .ui by the qt.py Tool module take effect). + + - Enhance the bootstrap.py script to allow it to be used to execute + SCons more easily from a checked-out source tree. + + From Ben Leslie: + + - Fix post-Memoizer value caching misspellings in Node.FS._doLookup(). + + From Rob Managan, Dmitry Mikhin and Joel B. Mohler: + + - Handle TeX/LaTeX files in subdirectories by changing directory + before invoking TeX/LaTeX. + + - Scan LaTeX files for \bibliography lines. + + - Support multiple file names in a "\bibliography{file1,file2}" string. + + - Handle TeX warnings about undefined citations. + + - Support re-running LaTeX if necessary due to a Table of Contents. + + From Dmitry Mikhin: + + - Return LaTeX if "Rerun to get citations correct" shows up on the next + line after the "Warning:" string. + + From Gary Oberbrunner: + + - Add #include lines to fix portability issues in two tests. + + - Eliminate some unnecessary os.path.normpath() calls. + + - Add a $CFLAGS variable for C-specific options, leaving $CCFLAGS + for options common to C and C++. + + From Tom Parker: + + - Have the error message print the missing file that Qt can't find. + + From John Pye: + + - Fix env.MergeFlags() appending to construction variable value of None. + + From Steve Robbins: + + - Fix the "sconsign" script when the .sconsign.dblite file is explicitly + specified on the command line (and not intuited from the old way of + calling it with just ".sconsign"). + + From Jose Pablo Ezequiel "Pupeno" Fernandez Silva: + + - Give the 'lex' tool knowledge of the additional target files produced + by the flex "--header-file=" and "--tables-file=" options. + + - Give the 'yacc' tool knowledge of the additional target files produced + by the bison "-g", "--defines=" and "--graph=" options. + + - Generate intermediate files with Objective C file suffixes (.m) when + the lex and yacc source files have appropriate suffixes (.lm and .ym). + + From Sohail Somain: + + - Have the mslink.py Tool only look for a 'link' executable on Windows + systems. + + From Vaclav Smilauer: + + - Add support for a "srcdir" keyword argument when calling a Builder, + which will add a srcdir prefix to all non-relative string sources. + + From Jonathan Ultis: + + - Allow Options converters to take the construction environment as + an optional argument. + + + +RELEASE 0.96.93 - Mon, 06 Nov 2006 00:44:11 -0600 + + NOTE: This is a pre-release of 0.97 for testing purposes. From Anonymous: diff --git a/src/setup.py b/src/setup.py index f06e717a..fa2baf44 100644 --- a/src/setup.py +++ b/src/setup.py @@ -29,7 +29,13 @@ import stat import string import sys -Version = "0.96.93" +Version = "0.96.94" + +man_pages = [ + 'scons.1', + 'sconsign.1', + 'scons-time.1', +] man_pages = [ 'scons.1', diff --git a/src/test_copyrights.py b/src/test_strings.py similarity index 100% rename from src/test_copyrights.py rename to src/test_strings.py -- 2.26.2