summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--QMTest/TestSCons.py2
-rw-r--r--README.rst16
-rw-r--r--SConstruct4
-rw-r--r--src/CHANGES.txt7
-rw-r--r--src/RELEASE.txt55
5 files changed, 58 insertions, 26 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index ef70261..a9fd6a0 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -34,7 +34,7 @@ from TestCmd import PIPE
# here provides some independent verification that what we packaged
# conforms to what we expect.
-default_version = '2.4.1'
+default_version = '2.4.2.alpha.yyyymmdd'
python_version_unsupported = (2, 3, 0)
python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index a2b15a6..5710586 100644
--- a/README.rst
+++ b/README.rst
@@ -480,14 +480,14 @@ following packages will be built::
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.2.alpha.yyyymmdd.tar.gz
+ build/dist/scons-2.4.2.alpha.yyyymmdd.win32.exe
+ build/dist/scons-2.4.2.alpha.yyyymmdd.zip
+ build/dist/scons-doc-2.4.2.alpha.yyyymmdd.tar.gz
+ build/dist/scons-local-2.4.2.alpha.yyyymmdd.tar.gz
+ build/dist/scons-local-2.4.2.alpha.yyyymmdd.zip
+ build/dist/scons-src-2.4.2.alpha.yyyymmdd.tar.gz
+ build/dist/scons-src-2.4.2.alpha.yyyymmdd.zip
build/dist/scons_2.4.1-1_all.deb
The SConstruct file is supposed to be smart enough to avoid trying to build
diff --git a/SConstruct b/SConstruct
index 79249e9..3bbaca6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -6,7 +6,7 @@
copyright_years = '2001 - 2015'
# This gets inserted into the man pages to reflect the month of release.
-month_year = 'November 2015'
+month_year = 'MONTH YEAR'
#
# __COPYRIGHT__
@@ -43,7 +43,7 @@ import tempfile
import bootstrap
project = 'scons'
-default_version = '2.4.1'
+default_version = '2.4.2.alpha.yyyymmdd'
copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
platform = distutils.util.get_platform()
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 02afa43..685a6ae 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -11,6 +11,13 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- Whatever John Doe did.
+RELEASE 2.4.2.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
+
+ From John Doe:
+
+ - Whatever John Doe did.
+
+
RELEASE 2.4.1 - Mon, 07 Nov 2015 10:37:21 -0700
From Arfrever Frehtes Taifersar Arahesis:
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 114b4f5..3bff366 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,47 +1,72 @@
- A new SCons checkpoint release, 2.4.2.alpha.yyyymmdd, is now available
+ A new SCons checkpoint release, 2.4.3.alpha.yyyymmdd, is now available
on the SCons download page:
http://www.scons.org/download.php
- Here is a summary of the changes since 2.3.6:
+ XXX The primary purpose of this release ... XXX
+
+ A SCons "checkpoint release" is intended to provide early access to
+ new features so they can be tested in the field before being released
+ for adoption by other software distributions.
+
+ Note that a checkpoint release is developed using the same test-driven
+ development methodology as all SCons releases. Existing SCons
+ functionality should all work as it does in previous releases (except
+ for any changes identified in the release notes) and early adopters
+ should be able to use a checkpoint release safely for production work
+ with existing SConscript files. If not, it represents not only a bug
+ in SCons but also a hole in the regression test suite, and we want to
+ hear about it.
+
+ New features may be more lightly tested than in past releases,
+ especially as concerns their interaction with all of the other
+ functionality in SCons. We are especially interested in hearing bug
+ reports about new functionality.
+
+ We do not recommend that downstream distributions (Debian, Fedora,
+ etc.) package a checkpoint release, mainly to avoid confusing the
+ "public" release numbering with the long checkpoint release names.
+
+ Here is a summary of the changes since 1.3.0:
NEW FUNCTIONALITY
- - None
+ - List new features (presumably why a checkpoint is being released)
DEPRECATED FUNCTIONALITY
- - None
+ - List anything that's been deprecated since the last release
CHANGED/ENHANCED EXISTING FUNCTIONALITY
- - Switched several core classes to using "slots", for
- reducing the overall memory consumption in large
- projects (fixes #2180, #2178, #2198)
- - Memoizer counting uses decorators now, instead of
- the old metaclasses approach.
+ - List modifications to existing features, where the previous behavior
+ wouldn't actually be considered a bug
FIXES
- - 2180, 2178, 2198 (See above)
+ - List fixes of outright bugs
IMPROVEMENTS
- - See CHANGED/ENHANCED EXISTING FUNCTIONALITY above
+ - List improvements that wouldn't be visible to the user in the
+ documentation: performance improvements (describe the circumstances
+ under which they would be observed), or major code cleanups
PACKAGING
- - None
+ - List changes in the way SCons is packaged and/or released
DOCUMENTATION
- - Bug 2504 - Fixed incorrect default SWIGPATH in documentation
+ - List any significant changes to the documentation (not individual
+ typo fixes, even if they're mentioned in src/CHANGES.txt to give
+ the contributor credit)
DEVELOPMENT
- - None
+ - List visible changes in the way SCons is developed
- Thanks to Dirk Baechle, and Andrew Featherstone for their contributions to this release.
+ Thanks to CURLY, LARRY, and MOE for their contributions to this release.
Contributors are listed alphabetically by their last name.
__COPYRIGHT__