merge master

6 files changed, 61 insertions, 72 deletions

diff --git a/.github/issue_template.md b/.github/ISSUE_TEMPLATE.md
index 1d35486ec..eeeb6bce2 100644
--- a/.github/issue_template.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,7 +1,8 @@
-# Please bring your issue to the SCons users mailing list before filing an issue here
-# See: http://scons.org/bugs.html
+## Please bring your issue to the SCons users mailing list before filing an issue here
+## See: https://scons.org/bugs.html
+
+## If the issue is confirmed to be a bug please include the following information
 
-# If the issue is confirmed to be a bug please include the following information
 * Link to SCons Users thread discussing your issue.
 * Version of SCons
 * Version of Python
@@ -9,4 +10,4 @@
 * How you installed SCons
 * What Platform are you on? (Linux/Windows and which version)
 * How to reproduce your issue?  Please include a small self contained reproducer. Likely a SConstruct should do for most issues.
-* How you invoke scons (The command line you're using "scons --flags some_arguments")
\ No newline at end of file
+* How you invoke scons (The command line you're using "scons --flags some_arguments")
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 60ff50f9c..9e8b7a264 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,11 @@
 ## Remove this paragraph
 Please have a look at our developer documentation before submitting your Pull Request.
 
-http://scons.org/guidelines.html
+https://scons.org/guidelines.html
 
 
 ## Contributor Checklist:
 
 * [ ] I have created a new test or updated the unit tests to cover the new/changed functionality.
 * [ ] I have updated `master/src/CHANGES.txt` directory (and read the `README.txt` in that directory)
-* [ ] I have updated the appropriate documentation
\ No newline at end of file
+* [ ] I have updated the appropriate documentation
diff --git a/.travis.yml b/.travis.yml
index 76f6db060..e279ad9a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,6 @@ addons:
 os:
   - linux
 
-sudo: required
-
 install:
     - ./.travis/install.sh
 
diff --git a/ReleaseConfig b/ReleaseConfig
index b5954df57..900e8b566 100755
--- 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, 3)
+version_tuple = (3, 0, 4, '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/src/Announce.txt b/src/Announce.txt
index 9e9c16b5a..c7948c0bd 100755
--- 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.3 - Mon, 07 Jan 2019 20:05:22 -0400
+RELEASE VERSION/DATE TO BE FILLED IN LATER
 
   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/RELEASE.txt b/src/RELEASE.txt
index 2355f4756..8987ee2c0 100755
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -1,83 +1,73 @@
+  A new SCons checkpoint release, 3.0.4.alpha.yyyymmdd, is now available
+  on the SCons download page:
 
-  A new SCons release, 3.0.3, is now available on the SCons download page:
+          http://www.scons.org/download.php
 
-          https://scons.org/pages/download.html
+  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.
 
-  Here is a summary of the changes since 3.0.1:
+  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
 
-    - Properly support versioned shared libraries for MacOS.  We've also introduced two
-      new env variables APPLELINK_CURRENT_VERSION and APPLELINK_COMPATIBILITY_VERSION which will specify
-      what is passed to the linkers -current_version and -compatibility_version flags.  If not specified
-      they will be derived from SHLIBVERSION as such:
-          - APPLELINK_CURRENT_VERSION = SHLIBVERSION
-          - APPLELINK_COMPATIBILITY_VERSION = all but the last digit in SHLIBVERSION with .0 appended.
-          Note that the values of the above will be validated. Valid format for either APPLELINK variable is
-          X[.Y[.Z]] where 0 <= X <= 65535, 0 <= Y <= 255, 0 <= Z <= 255.
-    - Add flag must_exist to SConscript() call to fail on missing script.
-        Not failing on missing script is now considered deprecated, and the first instance will print a
-        deprecation message.
-    - Add xz compression format to packaging choices.
-    - Add Textfile/Substfile to default environment. (issue #3147)
-    - Added virtualenv support. A new function Virtualenv() determines whether
-        SCons runs in a virtualenv. The search PATH may also be extended to
-        prefer executables from the current virtualenv over the ones provided by
-        base environment. New option --enable-virtualenv provided to import some
-        virtualenv-related variables to SCons and extend every env['ENV']['PATH']
-        automatically. New option --ignore-virtualenv disables this. Two
-        environment variables, SCONS_ENABLE_VIRTUALENV and
-        SCONS_IGNORE_VIRTUALENV are supported for the same purpose.
+    - List new features (presumably why a checkpoint is being released)
 
   DEPRECATED FUNCTIONALITY
 
-    - Going forward calling SConscript on a non-existing SConscript file will issue a warning.  Currently
-      it will issue a deprecation notice.
+    - List anything that's been deprecated since the last release
 
   CHANGED/ENHANCED EXISTING FUNCTIONALITY
 
-    - Recognize new java 9, 10, 11 (as 9.0 and 10.0, 11.0)
+    - List modifications to existing features, where the previous behavior
+      wouldn't actually be considered a bug
+
+  FIXES
+
+    - List fixes of outright bugs
+
+  IMPROVEMENTS
+
+    - 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
+
+    - List changes in the way SCons is packaged and/or released
 
   DOCUMENTATION
-    - Update some doc examples for Py3: map() now returns an iterable
-      instead of a list.
 
-  FIXES
+    - 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)
 
-    - Fix issue #2980 with credit to Piotr Bartosik (and William Blevins).  This is an issue where using
-         TimeStamp-MD5 Decider and CacheDir can yield incorrect md5's being written into the .sconsign.
-         The difference between Piotr Bartosik's patch and the current code is that the more complicated
-         creation of file to csig map is only done when the count of children for the current node doesn't
-         match the previous count which is loaded from the sconsign.
+  DEVELOPMENT
 
+    - List visible changes in the way SCons is developed
 
-  Thanks to Bernard Blackham, William Deegan, Ray Donnelly, Andrew Featherstone, Arda Fu,
-  Philipp Maierhöfer,  Matthew Marinets, Fredrik Medley, Daniel Moody, Gary Oberbrunner,
-  Jonathon Reinhart, Zachary Tessler, Paweł Tomulik, Richard West, Mats Wichmann, Bernhard M. Wiedemann,
-  and Hao Wu 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.
 
-git shortlog --no-merges -ns 3.0.1..HEAD
-   254  William Deegan
-    79  Daniel Moody
-    73  Mats Wichmann
-    17  Paweł Tomulik
-    16  Andrew Featherstone
-     8  grbd
-     7  maiphi
-     6  Gary Oberbrunner
-     6  Daniel
-     4  Hao Wu
-     3  Gabriel Russell
-     2  MatthewMarinets
-     2  Jonathon Reinhart
-     2  ArdaFu
-     1  Bernhard M. Wiedemann
-     1  Isaac Pascual Monells
-     1  Fredrik Medley
-     1  Philipp Maierhoefer
-     1  Piotr Kasprzyk
-     1  Ray Donnelly
-     1  Zachary Tessler
-     1  cclauss
+__COPYRIGHT__
+__FILE__ __REVISION__ __DATE__ __DEVELOPER__