From 0f086e238c98ae8fdc393a4759299ad0db1483d6 Mon Sep 17 00:00:00 2001 From: Greg Noel Date: Sun, 30 May 2010 06:03:04 +0000 Subject: Prepare for checkpoint release. Everything should be set up and ready to go. Update various files to have the correct date, time, version, and floor. Rework Script/Main.py and QMTest/TestSCons.py to make automated updating possible in the future. Remove a duplicate MANIFEST-xml.in entry. Fix TeX tests, which ran 'kpsewitch' before determining if the TeX tools were installed. --- QMTest/TestSCons.py | 9 ++++++--- README | 34 +++++++++++++++++----------------- src/CHANGES.txt | 2 +- src/RELEASE.txt | 2 +- src/engine/MANIFEST-xml.in | 1 - src/engine/SCons/Script/Main.py | 10 +++++----- test/TEX/glossaries.py | 2 +- test/TEX/glossary.py | 2 +- test/TEX/nomencl.py | 2 +- 9 files changed, 33 insertions(+), 31 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 0668f9d..a5529f4 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -31,10 +31,13 @@ from TestCommon import __all__ # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '1.3.0' +default_version = '2.0.0' copyright_years = '2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010' +python_version_unsupported = (2, 3, 0) +python_version_deprecated = (2, 4, 0) + # In the checked-in source, the value of SConsVersion in the following # line must remain "__ VERSION __" (without the spaces) so the built # version in build/QMTest/TestSCons.py contains the actual version @@ -150,10 +153,10 @@ def python_minor_version_string(): return sys.version[:3] def unsupported_python_version(version=sys.version_info): - return version < (2, 3, 0) + return version < python_version_unsupported def deprecated_python_version(version=sys.version_info): - return version < (2, 4, 0) + return version < python_version_deprecated if deprecated_python_version(): msg = r""" diff --git a/README b/README index d8fa7b5..8b9a9b3 100644 --- a/README +++ b/README @@ -158,7 +158,7 @@ Or on Windows: By default, the above commands will do the following: - -- Install the version-numbered "scons-1.3.0" and "sconsign-1.3.0" + -- Install the version-numbered "scons-2.0.0" and "sconsign-2.0.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 @@ -172,24 +172,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.3.0" and - "sconsign-1.3.0" scripts by specifying the "--hardlink-scons" or + scripts be hard links or symbolic links to the "scons-2.0.0" and + "sconsign-2.0.0" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. - -- Install "scons-1.3.0.bat" and "scons.bat" wrapper scripts in the + -- Install "scons-2.0.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.3.0.bat" and "scons.bat" files installed + specified to have "scons-2.0.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.3.0 or C:\Python*\scons-1.3.0, for example). + (/usr/lib/scons-2.0.0 or C:\Python*\scons-2.0.0, for example). See below for more options related to installing the build engine library. @@ -492,17 +492,17 @@ above about EXECUTING SCONS WITHOUT INSTALLING): Depending on the utilities installed on your system, any or all of the following packages will be built: - 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-2.0.0-1.noarch.rpm + build/dist/scons-2.0.0-1.src.rpm + build/dist/scons-2.0.0.linux-i686.tar.gz + build/dist/scons-2.0.0.tar.gz + build/dist/scons-2.0.0.win32.exe + build/dist/scons-2.0.0.zip + build/dist/scons-doc-2.0.0.tar.gz + build/dist/scons-local-2.0.0.tar.gz + build/dist/scons-local-2.0.0.zip + build/dist/scons-src-2.0.0.tar.gz + build/dist/scons-src-2.0.0.zip build/dist/scons_1.3.0-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to diff --git a/src/CHANGES.txt b/src/CHANGES.txt index e494a95..459d280 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -7,7 +7,7 @@ Change Log -RELEASE 2.0.0.alpha.20100508 - Sat, 08 May 2010 14:29:17 -0700 +RELEASE 2.0.0.beta.20100531 - Mon, 31 May 2010 22:15:00 -0700 From Dirk Baechle: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 89508c6..9fc23f3 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,4 +1,4 @@ - A new SCons checkpoint release, 2.0.0.beta.yyyymmdd, is now available on + A new SCons checkpoint release, 2.0.0.beta.20100531, is now available on the SCons download page: http://www.scons.org/download.php diff --git a/src/engine/MANIFEST-xml.in b/src/engine/MANIFEST-xml.in index f6ce08a..97f77e5 100644 --- a/src/engine/MANIFEST-xml.in +++ b/src/engine/MANIFEST-xml.in @@ -22,7 +22,6 @@ SCons/Tool/ar.xml SCons/Tool/as.xml SCons/Tool/bcc32.xml SCons/Tool/c++.xml -SCons/Tool/c++.xml SCons/Tool/cc.xml SCons/Tool/cvf.xml SCons/Tool/default.xml diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py index 0c39340..875da71 100644 --- a/src/engine/SCons/Script/Main.py +++ b/src/engine/SCons/Script/Main.py @@ -8,10 +8,11 @@ should not be, or be considered, part of the build engine. If it's something that we expect other software to want to use, it should go in some other module. If it's specific to the "scons" script invocation, it goes here. - """ -# +unsupported_python_version = (2, 3, 0) +deprecated_python_version = (2, 4, 0) + # __COPYRIGHT__ # # Permission is hereby granted, free of charge, to any person obtaining @@ -38,7 +39,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import SCons.compat import os -import os.path import sys import time import traceback @@ -419,10 +419,10 @@ def python_version_string(): return sys.version.split()[0] def python_version_unsupported(version=sys.version_info): - return version < (1, 5, 2) + return version < unsupported_python_version def python_version_deprecated(version=sys.version_info): - return version < (2, 4, 0) + return version < deprecated_python_version # Global variables diff --git a/test/TEX/glossaries.py b/test/TEX/glossaries.py index 2a3ca82..4050189 100644 --- a/test/TEX/glossaries.py +++ b/test/TEX/glossaries.py @@ -37,11 +37,11 @@ import TestSCons test = TestSCons.TestSCons() latex = test.where_is('latex') -gloss = os.system('kpsewhich glossaries.sty') if not latex: test.skip_test("Could not find latex; skipping test(s).\n") +gloss = os.system('kpsewhich glossaries.sty') if not gloss==0: test.skip_test("glossaries.sty not installed; skipping test(s).\n") diff --git a/test/TEX/glossary.py b/test/TEX/glossary.py index 423ffc7..be0a870 100644 --- a/test/TEX/glossary.py +++ b/test/TEX/glossary.py @@ -37,11 +37,11 @@ import TestSCons test = TestSCons.TestSCons() latex = test.where_is('latex') -gloss = os.system('kpsewhich glossary.sty') if not latex: test.skip_test("Could not find latex; skipping test(s).\n") +gloss = os.system('kpsewhich glossary.sty') if not gloss==0: test.skip_test("glossary.sty not installed; skipping test(s).\n") diff --git a/test/TEX/nomencl.py b/test/TEX/nomencl.py index 2aadeef..93a3c3b 100644 --- a/test/TEX/nomencl.py +++ b/test/TEX/nomencl.py @@ -37,11 +37,11 @@ import TestSCons test = TestSCons.TestSCons() latex = test.where_is('latex') -nomencl = os.system('kpsewhich nomencl.sty') if not latex: test.skip_test("Could not find latex; skipping test(s).\n") +nomencl = os.system('kpsewhich nomencl.sty') if not nomencl==0: test.skip_test("nomencl.sty not installed; skipping test(s).\n") -- cgit v0.12