From 13c6522a162eeba44371fed2fbb8f918e9ba3457 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Wed, 18 Aug 2004 16:22:42 +0000 Subject: Initialize the new branch for release. --- HOWTO/release.txt | 15 ++++++--------- README | 54 ++++++++++++++++++++---------------------------------- SConstruct | 17 +++++++++-------- debian/changelog | 7 +++++++ rpm/scons.spec.in | 2 +- src/CHANGES.txt | 5 +---- src/README.txt | 18 ++---------------- src/RELEASE.txt | 29 +++++------------------------ src/test_setup.py | 2 +- 9 files changed, 52 insertions(+), 97 deletions(-) diff --git a/HOWTO/release.txt b/HOWTO/release.txt index 51dfb70..dac4c0c 100644 --- a/HOWTO/release.txt +++ b/HOWTO/release.txt @@ -55,14 +55,14 @@ Things to do to release a new X.Y version of SCons: aeib {95} + aed + aeb aet aet -reg - aed - aeipass START THE NEW BRANCH FOR RELEASE @@ -93,11 +93,8 @@ Things to do to release a new X.Y version of SCons: aecp rpm/scons.spec.in vi rpm/scons.spec.in - aecp src/copyrightTests.py - vi src/copyrightTests.py - - aecp src/setupTests.py - vi src/setupTests.py + aecp src/test_setup.py + vi src/test_setup.py # Read through and update the README files if necessary [optional] aecp README @@ -136,10 +133,10 @@ Things to do to release a new X.Y version of SCons: # Now build and prepare the release itself. aeb - aet -reg - aed + aet -reg + aede etc. diff --git a/README b/README index c9b464e..dc7c0b5 100644 --- a/README +++ b/README @@ -66,12 +66,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.95-1.noarch.rpm + Red Hat Linux scons-0.96.noarch.rpm - Debian GNU/Linux scons_0.95-1_all.deb + Debian GNU/Linux scons_0.96_all.deb (or use apt-get) - Windows scons-0.95.win32.exe + Windows scons-0.96.win32.exe -- (Recommended.) Download the latest distutils package from the following URL: @@ -218,18 +218,18 @@ more typing: Depending on the utilities installed on your system, any or all of the following packages will be built: - build/dist/scons-0.95-1.noarch.rpm - build/dist/scons-0.95-1.src.rpm - build/dist/scons-0.95.linux-i686.tar.gz - build/dist/scons-0.95.tar.gz - build/dist/scons-0.95.win32.exe - build/dist/scons-0.95.zip - build/dist/scons-doc-0.95.tar.gz - build/dist/scons-local-0.95.tar.gz - build/dist/scons-local-0.95.zip - build/dist/scons-src-0.95.tar.gz - build/dist/scons-src-0.95.zip - build/dist/scons_0.95-1_all.deb + build/dist/scons-0.96-1.noarch.rpm + build/dist/scons-0.96-1.src.rpm + build/dist/scons-0.96.linux-i686.tar.gz + build/dist/scons-0.96.tar.gz + build/dist/scons-0.96.win32.exe + build/dist/scons-0.96.zip + build/dist/scons-doc-0.96.tar.gz + build/dist/scons-local-0.96.tar.gz + build/dist/scons-local-0.96.zip + build/dist/scons-src-0.96.tar.gz + build/dist/scons-src-0.96.zip + build/dist/scons_0.96-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. @@ -441,33 +441,19 @@ in the general flood of messages. MAILING LISTS ============= -PLEASE NOTE: We are in the process of planning to move our mailing list -administration on 14 March 2004. Details are available at our mailing -lists page: - - http://www.scons.org/lists.html - An active mailing list for developers of SCons is available. You may send questions or comments to the list at: - dev@scons.tigris.org (after 14 March 2004) - - scons-devel@lists.sourceforge.net (prior to 14 March 2004) + dev@scons.tigris.org -After 14 March 2004, please check our mailing lists web page in case -the actual date of the move has changed. - -You may request a subscription to the (new) developer's mailing list by -sending email to: +You may request a subscription to the developer's mailing list by sending +email to: dev-subscribe@scons.tigris.org -To subscribe to the old (sourceforge.net) mailing list prior to the move, -please consult the directions at our mailing lists page (address above). - Subscription to the developer's mailing list is by approval. In practice, -no one is refused list membership right now, but we reserve the right -to limit membership in the future and/or weed out lurkers. +no one is refused list membership, but we reserve the right to limit +membership in the future and/or weed out lurkers. There is also a low-volume mailing list available for announcements about SCons. Subscribe by sending email to: diff --git a/SConstruct b/SConstruct index a3e0903..09ec77c 100644 --- a/SConstruct +++ b/SConstruct @@ -39,7 +39,7 @@ import sys import time project = 'scons' -default_version = '0.95' +default_version = '0.96' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years Default('.') @@ -104,13 +104,14 @@ elif aesub: else: revision = default_version -a = string.split(revision, '.') -arr = [a[0]] -for s in a[1:]: - if len(s) == 1: - s = '0' + s - arr.append(s) -revision = string.join(arr, '.') +# This is old code that adds an initial "0" to revision numbers < 10. +#a = string.split(revision, '.') +#arr = [a[0]] +#for s in a[1:]: +# if len(s) == 1: +# s = '0' + s +# arr.append(s) +#revision = string.join(arr, '.') # Here's how we'd turn the calculated $revision into our package $version. # This makes it difficult to coordinate with other files (debian/changelog diff --git a/debian/changelog b/debian/changelog index ddda038..d6a9cc6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +scons (0.96-1) unstable; urgency=low + + * Seventh beta release. + + -- Steven Knight Wed, 18 Aug 2004 13:36:40 +0000 + + scons (0.95-1) unstable; urgency=low * Sixth beta release. diff --git a/rpm/scons.spec.in b/rpm/scons.spec.in index 96e9b8e..7c30145 100644 --- a/rpm/scons.spec.in +++ b/rpm/scons.spec.in @@ -1,5 +1,5 @@ %define name scons -%define version 0.95 +%define version 0.96 %define release 1 Summary: an Open Source software construction tool diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3f80fda..f3d5d01 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,10 +8,7 @@ r __COPYRIGHT__ -RELEASE 0.95 - XXX - - NOTE: This is a pre-release of 0.96 for testing purposes. When 0.96 - is released, all these changes will be listed as 0.96 changes. +RELEASE 0.96 - Wed, 18 Aug 2004 13:36:40 +0000 From Chad Austin: diff --git a/src/README.txt b/src/README.txt index 1eba8aa..e31fb21 100644 --- a/src/README.txt +++ b/src/README.txt @@ -187,29 +187,15 @@ in the general flood of messages. MAILING LISTS ============= -PLEASE NOTE: We are in the process of planning to move our mailing list -administration on 14 March 2004. Details are available at our mailing -lists page: - - http://www.scons.org/lists.html - An active mailing list for users of SCons is available. You may send questions or comments to the list at: - users@scons.tigris.org (after 14 March 2004) - - scons-users@lists.sourceforge.net (prior to 14 March 2004) + users@scons.tigris.org -After 14 March 2004, please check our mailing lists web page in case -the actual date of the move has changed. - -You may subscribe to the (new) mailing list by sending email to: +You may subscribe to the mailing list by sending email to: users-subscribe@scons.tigris.org -To subscribe to the old (sourceforge.net) mailing list prior to the move, -please consult the directions at our mailing lists page (address above). - There is also a low-volume mailing list available for announcements about SCons. Subscribe by sending email to: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 3183cfa..6760d94 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -20,10 +20,11 @@ more effectively, please sign up for the scons-users mailing list at: -RELEASE 0.96 - XXX +RELEASE 0.96 - Wed, 18 Aug 2004 13:36:40 +0000 - This is the seventh beta release of SCons. Please consult the - CHANGES.txt file for a list of specific changes since last release. + This is a pre-release for testing the seventh beta release of SCons. + Please consult the CHANGES.txt file for a list of specific changes + since last release. Please note the following important changes since release 0.95: @@ -161,7 +162,7 @@ RELEASE 0.96 - XXX the ATL and MFC directories to the INCLUDE and LIB environment variables by default. This default behavior will be changed in a future release; the current plan is to change it for the 0.97 - release (next release). + release (next beta release). Whether or not the ATL and MFC directories are added to these environment variables is now controlled by a new MSVS_USE_MFC_DIRS @@ -238,10 +239,6 @@ RELEASE 0.96 - XXX site is currently out of date. Take what you read there with a grain of salt. - - If a file is specified to be built in multiple ways, the last - processed builder specification overwrites all other builders, - without any warning. - - On Win32 systems, you must put a space between the redirection characters < and >, and the specified files (or construction variable expansions): @@ -251,16 +248,6 @@ RELEASE 0.96 - XXX If you don't supply a space (for example, "<$SOURCE"), SCons will not recognize the redirection. - - People have reported problems with SCons not stopping a build when - an interrupt (CTRL+C) is received. A fix was checked in to 0.11 - that should fix this behavior on many systems, but there are - issues with the underlying Python os.system() call that suggest - this fix does not work on all systems or in all circumstances. - We're working to try to find a universal solution. - - - Modifying a construction environment in a subsidiary SConscript - file modifies the global environment. - - MSVC .res files are not rebuilt when icons change. - The -c option does not clean up .sconsign files or directories @@ -294,18 +281,12 @@ RELEASE 0.96 - XXX - SCons does not automatically rebuild LaTeX files when the file has an undefined reference on the first build. - - SideEffect() files are not retrieved properly from a CacheDir(), - and can lead to a stack trace. - - Use of --implicit-cache with TargetSignatures('content') can, for some changes, not rebuild a file when necessary. - SCons does not currently automatically check out SConstruct or SConscript files from SCCS, RCS or BitKeeper. - - The Command() global function (specified without a construction - environment) is broken. - - No support yet for the following planned command-line options: -d -e -l --list-actions --list-derived --list-where diff --git a/src/test_setup.py b/src/test_setup.py index 799be78..4198af6 100644 --- a/src/test_setup.py +++ b/src/test_setup.py @@ -55,7 +55,7 @@ except KeyError: # version = os.environ['SCONS_VERSION'] #except KeyError: # version = '__VERSION__' -version = '0.95' +version = '0.96' scons_version = 'scons-%s' % version -- cgit v0.12