summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2015-11-09 09:30:07 -0800
committerWilliam Deegan <bill@baddogconsulting.com>2015-11-09 09:30:07 -0800
commitfd7c74e54856d9c5e0cae2b9b58b0b41c4bd33b9 (patch)
treeb36b2cbf4dd3e5601546ed008f6769309c417cda /README.rst
parent48852ff84df9460b8a9428c8b78ce1a9305cd2b5 (diff)
downloadscons-fd7c74e54856d9c5e0cae2b9b58b0b41c4bd33b9.tar.gz
merge changes from 2.4.1 release to default
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst34
1 files changed, 17 insertions, 17 deletions
diff --git a/README.rst b/README.rst
index 05be7128..a2b15a6d 100644
--- a/README.rst
+++ b/README.rst
@@ -156,7 +156,7 @@ Or on Windows::
By default, the above commands will do the following:
-- Install the version-numbered "scons-2.4.0" and "sconsign-2.4.0" scripts in
+- Install the version-numbered "scons-2.4.1" and "sconsign-2.4.1" 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,16 +168,16 @@ 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.4.0" and "sconsign-2.4.0"
+ hard links or symbolic links to the "scons-2.4.1" and "sconsign-2.4.1"
scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on
the command line.
-- Install "scons-2.4.0.bat" and "scons.bat" wrapper scripts in the Python
+- Install "scons-2.4.1.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.4.0.bat" and "scons.bat" files installed in the default system
+ have "scons-2.4.1.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.
@@ -462,7 +462,7 @@ running all of "runtest.py -a".
Building Packages
=================
-We use SCons (version 2.4.0 or later) to build its own packages. If you
+We use SCons (version 2.4.1 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::
@@ -477,18 +477,18 @@ 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.4.0-1.noarch.rpm
- build/dist/scons-2.4.0-1.src.rpm
- build/dist/scons-2.4.0.linux-i686.tar.gz
- build/dist/scons-2.4.0.tar.gz
- build/dist/scons-2.4.0.win32.exe
- build/dist/scons-2.4.0.zip
- build/dist/scons-doc-2.4.0.tar.gz
- build/dist/scons-local-2.4.0.tar.gz
- build/dist/scons-local-2.4.0.zip
- build/dist/scons-src-2.4.0.tar.gz
- build/dist/scons-src-2.4.0.zip
- build/dist/scons_2.4.0-1_all.deb
+ build/dist/scons-2.4.1-1.noarch.rpm
+ build/dist/scons-2.4.1-1.src.rpm
+ build/dist/scons-2.4.1.linux-i686.tar.gz
+ build/dist/scons-2.4.1.tar.gz
+ build/dist/scons-2.4.1.win32.exe
+ build/dist/scons-2.4.1.zip
+ build/dist/scons-doc-2.4.1.tar.gz
+ build/dist/scons-local-2.4.1.tar.gz
+ build/dist/scons-local-2.4.1.zip
+ build/dist/scons-src-2.4.1.tar.gz
+ build/dist/scons-src-2.4.1.zip
+ build/dist/scons_2.4.1-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