summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-09-27 10:22:16 -0400
committerGary Oberbrunner <garyo@oberbrunner.com>2014-09-27 10:22:16 -0400
commit20a64c96f5d02b2040e5a7a728bcb2fd35352477 (patch)
treef4b4522fd746e52646f14efdfc198f741d5c60f8
parentfe124209da28eb5ddf3331de73a8315fe6f1f194 (diff)
downloadscons-20a64c96f5d02b2040e5a7a728bcb2fd35352477.tar.gz
Release fixes: README.rst python version, and some auto version numbering.
-rw-r--r--README.rst26
-rw-r--r--src/Announce.txt5
2 files changed, 18 insertions, 13 deletions
diff --git a/README.rst b/README.rst
index 56c48e26..f80afd75 100644
--- a/README.rst
+++ b/README.rst
@@ -47,7 +47,7 @@ version at the SCons download page:
Execution Requirements
======================
-Running SCons requires Python version 2.4 or later (Python 3 is not
+Running SCons requires Python version 2.6 or later (Python 3 is not
yet supported). There should be no other dependencies or requirements
to run SCons.
@@ -156,7 +156,7 @@ Or on Windows::
By default, the above commands will do the following:
-- Install the version-numbered "scons-2.0.0" and "sconsign-2.0.0" scripts in
+- Install the version-numbered "scons-2.3.3" and "sconsign-2.3.3" 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 line.
@@ -168,23 +168,23 @@ By default, the above commands will do the following:
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-2.0.0" and "sconsign-2.0.0"
+ hard links or symbolic links to the "scons-2.3.3" and "sconsign-2.3.3"
scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on
the command line.
-- Install "scons-2.0.0.bat" and "scons.bat" wrapper scripts in the Python
+- Install "scons-2.3.3.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-2.0.0.bat" and "scons.bat" files installed in the default system
+ have "scons-2.3.3.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-2.0.0 or
- C:\\Python\*\\scons-2.0.0, for example). See below for more options related to
+ version-numbered SCons library directory (/usr/lib/scons-2.3.3 or
+ C:\\Python\*\\scons-2.3.3, for example). See below for more options related to
installing the build engine library.
- Install the troff-format man pages in an appropriate directory on UNIX or
@@ -462,13 +462,13 @@ running all of "runtest.py -a".
Building Packages
=================
-We use SCons (version 0.96.93 later) to build its own packages. If you
+We use SCons (version 2.3.3 or later) to build its own packages. If you
already have an appropriate version of SCons installed on your system, you can
build everything by simply running it::
$ scons
-If you don't have SCons version 0.96.93 later already installed on your
+If you don't have SCons already installed on your
system, you can use the supplied bootstrap.py script (see the section above
about `Executing SCons Without Installing`_)::
@@ -477,9 +477,9 @@ 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-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.3.3-1.noarch.rpm
+ build/dist/scons-2.3.3-1.src.rpm
+ build/dist/scons-2.3.3.linux-i686.tar.gz
build/dist/scons-2.3.3.tar.gz
build/dist/scons-2.3.3.win32.exe
build/dist/scons-2.3.3.zip
@@ -488,7 +488,7 @@ following packages will be built::
build/dist/scons-local-2.3.3.zip
build/dist/scons-src-2.3.3.tar.gz
build/dist/scons-src-2.3.3.zip
- build/dist/scons_1.3.0-1_all.deb
+ build/dist/scons_2.3.3-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. For
diff --git a/src/Announce.txt b/src/Announce.txt
index 9ca047da..6cb69b35 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -26,6 +26,11 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
since last release. This announcement highlights only the important
changes.
+ Please note the following important changes since release 2.3.3:
+
+ -- Fix for EnsureSConsVersion regression in 2.3.3.
+ -- Fix for interactive mode with Configure contexts
+
Please note the following important changes since release 2.3.2:
-- On Windows, .def files did not work as sources to shared