summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-09-18 08:38:46 -0700
committerWilliam Deegan <bill@baddogconsulting.com>2017-09-18 08:38:46 -0700
commit2a3bc3d414f202e823b6d7e2a8ba2ec3a429f65a (patch)
tree0348f56f60e827bb4b3d180403777697938e72a7
parentfeceb48d0b9a73bf19cd379f6549a1564a770058 (diff)
downloadscons-2a3bc3d414f202e823b6d7e2a8ba2ec3a429f65a.tar.gz
Updates for 3.0.0 release
-rw-r--r--QMTest/TestSCons.py2
-rw-r--r--README.rst44
-rw-r--r--ReleaseConfig2
-rw-r--r--SConstruct4
-rw-r--r--debian/changelog4
-rw-r--r--src/Announce.txt2
-rw-r--r--src/CHANGES.txt12
-rw-r--r--src/RELEASE.txt2
8 files changed, 36 insertions, 36 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 61e50125..b5f29535 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -35,7 +35,7 @@ from TestCmd import PIPE
# here provides some independent verification that what we packaged
# conforms to what we expect.
-default_version = '3.0.0.alpha.20170821'
+default_version = '3.0.0'
python_version_unsupported = (2, 6, 0)
python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index faf8b106..258d6a17 100644
--- a/README.rst
+++ b/README.rst
@@ -168,7 +168,7 @@ Or on Windows::
By default, the above commands will do the following:
-- Install the version-numbered "scons-2.5.0" and "sconsign-2.5.0" scripts in
+- Install the version-numbered "scons-3.0.0" and "sconsign-3.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 line.
@@ -180,23 +180,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.5.0" and "sconsign-2.5.0"
+ hard links or symbolic links to the "scons-3.0.0" and "sconsign-3.0.0"
scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on
the command line.
-- Install "scons-2.5.0.bat" and "scons.bat" wrapper scripts in the Python
+- Install "scons-3.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-2.5.0.bat" and "scons.bat" files installed in the default system
+ have "scons-3.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-2.5.0 or
- C:\\Python\*\\scons-2.5.0, for example). See below for more options related to
+ version-numbered SCons library directory (/usr/lib/scons-3.0.0 or
+ C:\\Python\*\\scons-3.0.0, 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
@@ -474,7 +474,7 @@ running all of "runtest.py -a".
Building Packages
=================
-We use SCons (version 2.5.0 or later) to build its own packages. If you
+We use SCons (version 3.0.0 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::
@@ -489,18 +489,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.5.0-1.noarch.rpm
- build/dist/scons-2.5.0-1.src.rpm
- build/dist/scons-2.5.0.linux-i686.tar.gz
- build/dist/scons-3.0.0.alpha.20170821.tar.gz
- build/dist/scons-3.0.0.alpha.20170821.win32.exe
- build/dist/scons-3.0.0.alpha.20170821.zip
- build/dist/scons-doc-3.0.0.alpha.20170821.tar.gz
- build/dist/scons-local-3.0.0.alpha.20170821.tar.gz
- build/dist/scons-local-3.0.0.alpha.20170821.zip
- build/dist/scons-src-3.0.0.alpha.20170821.tar.gz
- build/dist/scons-src-3.0.0.alpha.20170821.zip
- build/dist/scons_3.0.0.alpha.20170614-1_all.deb
+ build/dist/scons-3.0.0-1.noarch.rpm
+ build/dist/scons-3.0.0-1.src.rpm
+ build/dist/scons-3.0.0.linux-i686.tar.gz
+ build/dist/scons-3.0.0.tar.gz
+ build/dist/scons-3.0.0.win32.exe
+ build/dist/scons-3.0.0.zip
+ build/dist/scons-doc-3.0.0.tar.gz
+ build/dist/scons-local-3.0.0.tar.gz
+ build/dist/scons-local-3.0.0.zip
+ build/dist/scons-src-3.0.0.tar.gz
+ build/dist/scons-src-3.0.0.zip
+ build/dist/scons_3.0.0-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
@@ -664,7 +664,7 @@ section of small examples for getting started using SCons.
Additional documentation for SCons is available at:
- http://www.scons.org/documentation.php
+ http://www.scons.org/documentation
Licensing
@@ -724,7 +724,7 @@ If you find SCons helpful, please consider making a donation (of cash,
software, or hardware) to support continued work on the project. Information
is available at:
- http://www.scons.org/donate.php
+ http://www.scons.org/donate.html
For More Information
@@ -760,5 +760,5 @@ many contributors, including but not at all limited to:
\... and many others.
-Copyright (c) 2001 - 2015 The SCons Foundation
+Copyright (c) 2001 - 2017 The SCons Foundation
diff --git a/ReleaseConfig b/ReleaseConfig
index 331380a9..c8473f1b 100644
--- a/ReleaseConfig
+++ b/ReleaseConfig
@@ -32,7 +32,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
# 'final', the patchlevel is set to the release date. This value is
# mandatory and must be present in this file.
#version_tuple = (2, 2, 0, 'final', 0)
-version_tuple = (3, 0, 0, 'alpha', 0)
+version_tuple = (3, 0, 0)
# Python versions prior to unsupported_python_version cause a fatal error
# when that version is used. Python versions prior to deprecate_python_version
diff --git a/SConstruct b/SConstruct
index 2e173828..b14fe455 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,7 +8,7 @@ from __future__ import print_function
copyright_years = '2001 - 2017'
# This gets inserted into the man pages to reflect the month of release.
-month_year = 'MONTH YEAR'
+month_year = 'September 2017'
#
# __COPYRIGHT__
@@ -46,7 +46,7 @@ import time
import bootstrap
project = 'scons'
-default_version = '3.0.0.alpha.20170821'
+default_version = '3.0.0'
copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
platform = distutils.util.get_platform()
diff --git a/debian/changelog b/debian/changelog
index 4e7470d7..4f8dc794 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-scons (__VERSION__) unstable; urgency=low
+scons (3.0.0) unstable; urgency=low
* Maintenance Release
- -- __DEVELOPER__ <bill@baddogconsulting.com> __DATE__
+ -- William Deegan <bill@baddogconsulting.com> Mon, 18 Sep 2017 08:32:04 -0700
scons (2.5.1) unstable; urgency=low
diff --git a/src/Announce.txt b/src/Announce.txt
index fb7d0eaf..5c962c75 100644
--- a/src/Announce.txt
+++ b/src/Announce.txt
@@ -18,7 +18,7 @@ So that everyone using SCons can help each other learn how to use it more
effectively, please go to http://scons.org/lists.html#users to sign up for
the scons-users mailing list.
-RELEASE 3.0.0.alpha.20170821 - Mon, 21 Aug 2017 16:15:02 -0700
+RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
Please consult the RELEASE.txt file for a summary of changes since the last
release and consult the CHANGES.txt file for complete a list of changes
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 2f04031c..7788fdb7 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,11 +5,11 @@
Change Log
-RELEASE 3.0.0.alpha.20170821 - Mon, 21 Aug 2017 16:15:02 -0700
+RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
NOTE: This is a major release. You should expect that some targets may rebuild when upgrading.
-Significant changes in some python action signatures. Also switching between PY 2 and PY 3.5, 3.6
-may cause rebuilds. In no case should rebuilds not happen.
+Significant changes in some python action signatures. Also switching between PY 2.7 and PY 3.5, 3.6
+will cause rebuilds.
From William Blevins:
@@ -79,6 +79,9 @@ may cause rebuilds. In no case should rebuilds not happen.
"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
It can be downloaded separately at
https://github.com/Microsoft/vswhere
+
+ From Tom Tanner:
+ - Allow nested $( ... $) sections
From Paweł Tomulik:
- Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jenness
@@ -115,9 +118,6 @@ may cause rebuilds. In no case should rebuilds not happen.
tools, must now include the ar tool to get this builder as is required for
other compiler tools.
- Add clang and clang++ tools based on Paweł Tomulik's work.
-
- From Tom Tanner:
- - Allow nested $( ... $) sections
RELEASE 2.5.1 - Mon, 03 Nov 2016 13:37:42 -0400
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index bbc1e427..ff0673a4 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,4 +1,4 @@
- A new SCons checkpoint release, 3.0.0.alpha.20170821, is now available
+ A new SCons checkpoint release, 3.0.0, is now available
on the SCons download page:
http://www.scons.org/download.php