From 0b8a2ac3b7f2eea24a374600ac617a76c6c1cae1 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Tue, 14 Nov 2017 18:11:50 -0500
Subject: change back to development version strings
---
QMTest/TestSCons.py | 2 +-
README.rst | 16 ++++++++--------
ReleaseConfig | 2 +-
SConstruct | 4 ++--
src/Announce.txt | 2 +-
src/CHANGES.txt | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index 82e5583..eccad9d 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.1'
+default_version = '3.1.0.alpha.yyyymmdd'
python_version_unsupported = (2, 6, 0)
python_version_deprecated = (2, 7, 0)
diff --git a/README.rst b/README.rst
index 6bce4b7..2a911e8 100644
--- a/README.rst
+++ b/README.rst
@@ -492,14 +492,14 @@ following packages will be built::
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.1.tar.gz
- build/dist/scons-3.0.1.win32.exe
- build/dist/scons-3.0.1.zip
- build/dist/scons-doc-3.0.1.tar.gz
- build/dist/scons-local-3.0.1.tar.gz
- build/dist/scons-local-3.0.1.zip
- build/dist/scons-src-3.0.1.tar.gz
- build/dist/scons-src-3.0.1.zip
+ build/dist/scons-3.1.0.alpha.yyyymmdd.tar.gz
+ build/dist/scons-3.1.0.alpha.yyyymmdd.win32.exe
+ build/dist/scons-3.1.0.alpha.yyyymmdd.zip
+ build/dist/scons-doc-3.1.0.alpha.yyyymmdd.tar.gz
+ build/dist/scons-local-3.1.0.alpha.yyyymmdd.tar.gz
+ build/dist/scons-local-3.1.0.alpha.yyyymmdd.zip
+ build/dist/scons-src-3.1.0.alpha.yyyymmdd.tar.gz
+ build/dist/scons-src-3.1.0.alpha.yyyymmdd.zip
build/dist/scons_3.0.0-1_all.deb
The SConstruct file is supposed to be smart enough to avoid trying to build
diff --git a/ReleaseConfig b/ReleaseConfig
index 0ed1266..c9d98e3 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, 1)
+version_tuple = (3, 1, 0, 'alpha', 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 b301fc5..1a0deb3 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 = 'November 2017'
+month_year = 'MONTH YEAR'
#
# __COPYRIGHT__
@@ -51,7 +51,7 @@ import textwrap
import bootstrap
project = 'scons'
-default_version = '3.0.1'
+default_version = '3.1.0.alpha.yyyymmdd'
copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
SConsignFile()
diff --git a/src/Announce.txt b/src/Announce.txt
index b5c6636..266e6c8 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.1 - Mon, 12 Nov 2017 15:31:33 -0700
+RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
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 5c0b733..da4e6ae 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -5,7 +5,7 @@
Change Log
-RELEASE 3.0.1 - Mon, 12 Nov 2017 15:31:33 -0700
+RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE
From Daniel Moody:
- Jar can take multiple targets, and will make a duplicate jar from the sources for each target
--
cgit v0.12