diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-05-30 06:03:04 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-05-30 06:03:04 (GMT) |
| commit | 0f086e238c98ae8fdc393a4759299ad0db1483d6 (patch) | |
| tree | 48beeaa12f3e22cb5ea4308611cb070bfd7d1de9 /src/engine | |
| parent | f8098968bdca6e11a1cc1daa0df70f801c4e251f (diff) | |
| download | SCons-0f086e238c98ae8fdc393a4759299ad0db1483d6.zip SCons-0f086e238c98ae8fdc393a4759299ad0db1483d6.tar.gz SCons-0f086e238c98ae8fdc393a4759299ad0db1483d6.tar.bz2 | |
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.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/MANIFEST-xml.in | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 10 |
2 files changed, 5 insertions, 6 deletions
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 |