Merge branch 'master' of github.com:SCons/scons

.github/issue_template.md → .github/ISSUE_TEMPLATE.md

@@ -1,12 +1,13 @@
-# 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
 * Which python distribution if applicable (python.org, cygwin, anaconda, macports, brew,etc)
 * 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")
+* How you invoke scons (The command line you're using "scons --flags some_arguments")

.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
+* [ ] I have updated the appropriate documentation

.travis.yml

@@ -11,8 +11,6 @@ addons:
 os:
   - linux
 
-sudo: required
-
 install:
     - ./.travis/install.sh
 

README.rst

@@ -178,7 +178,7 @@ Or on Windows::
 
 By default, the above commands will do the following:
 
-- Install the version-numbered "scons-3.1.0" and "sconsign-3.1.0" scripts in
+- Install the version-numbered "scons-3.1.0" and "sconsign-3.0.3" 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.
@@ -190,23 +190,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-3.1.0" and "sconsign-3.1.0"
+  hard links or symbolic links to the "scons-3.0.3" and "sconsign-3.0.3"
   scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on
   the command line.
 
-- Install "scons-3.1.0.bat" and "scons.bat" wrapper scripts in the Python
+- Install "scons-3.0.3.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-3.1.0.bat" and "scons.bat" files installed in the default system
+  have "scons-3.0.3.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-3.1.0 or
-  C:\\Python\*\\scons-3.1.0, for example).  See below for more options related to
+  version-numbered SCons library directory (/usr/lib/scons-3.0.3 or
+  C:\\Python\*\\scons-3.0.3, 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
@@ -484,7 +484,7 @@ running all of "runtest.py -a".
 Building Packages
 =================
 
-We use SCons (version 3.1.0 or later) to build its own packages.  If you
+We use SCons (version 3.0.3 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::
 
@@ -499,13 +499,13 @@ 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-3.0.2.tar.gz
-        build/dist/scons-3.0.2.zip
-        build/dist/scons-doc-3.0.2.tar.gz
-        build/dist/scons-local-3.0.2.tar.gz
-        build/dist/scons-local-3.0.2.zip
-        build/dist/scons-src-3.0.2.tar.gz
-        build/dist/scons-src-3.0.2.zip
+        build/dist/scons-3.0.3.tar.gz
+        build/dist/scons-3.0.3.zip
+        build/dist/scons-doc-3.0.3.tar.gz
+        build/dist/scons-local-3.0.3.tar.gz
+        build/dist/scons-local-3.0.3.zip
+        build/dist/scons-src-3.0.3.tar.gz
+        build/dist/scons-src-3.0.3.zip
 
 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

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, 'alpha', 0)
+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
@@ -51,7 +51,7 @@ deprecated_python_version = (2, 7, 0)
 #month_year = 'December 2012'
 
 # If copyright years is not given, the release year is used as the end.
-copyright_years = '2001 - 2018'
+copyright_years = '2001 - 2019'
 
 # Local Variables:
 # tab-width:4

SConstruct

@@ -5,10 +5,10 @@
 
 from __future__ import print_function
 
-copyright_years = '2001 - 2018'
+copyright_years = '2001 - 2019'
 
 # This gets inserted into the man pages to reflect the month of release.
-month_year = 'December 2018'
+month_year = 'January 2019'
 
 #
 # __COPYRIGHT__
@@ -51,7 +51,7 @@ import textwrap
 import bootstrap
 
 project = 'scons'
-default_version = '3.0.2'
+default_version = '3.0.3'
 copyright = "Copyright (c) %s The SCons Foundation" % copyright_years
 
 SConsignFile()

bin/scons_dev_master.py

@@ -42,6 +42,7 @@
     'python-epydoc',
     'rpm',
     'tar',
+    'lynx'
 
     # additional packages that Bill Deegan's web page suggests
     #'docbook-to-man',
@@ -70,11 +71,12 @@
     'bison',
     'cssc',
     'cvs',
-    'hg',
     'flex',
     'g++',
     'gcc',
-    'gcj',
+    # not on ubuntu 18.04
+    #    'gcj',
+    #    'hg',
     'ghostscript',
     'm4',
     'openssh-client',

bootstrap.py

@@ -178,15 +178,11 @@ def must_copy(dst, src):
     scons_py = os.path.join('src', 'script', 'scons.py')
     src_engine = os.path.join('src', 'engine')
     MANIFEST_in = find(os.path.join(src_engine, 'MANIFEST.in'))
-    MANIFEST_xml_in = find(os.path.join(src_engine, 'MANIFEST-xml.in'))
     manifest_files = [os.path.join(src_engine, x)
                       for x in parseManifestLines(os.path.join(script_dir, src_engine),
                                                   open(MANIFEST_in).readlines())]
 
-    manifest_xml_files = [os.path.join(src_engine, x)
-                          for x in parseManifestLines(os.path.join(script_dir, src_engine),
-                                                      open(MANIFEST_xml_in).readlines())]
-    files = [scons_py] + manifest_files + manifest_xml_files
+    files = [scons_py] + manifest_files
 
     for filename in files:
         src = find(filename)
@@ -214,6 +210,7 @@ def must_copy(dst, src):
 
     sys.exit(subprocess.Popen(args, env=os.environ).wait())
 
+
 if __name__ == "__main__":
     main()
 

debian/changelog

@@ -1,3 +1,9 @@
+scons (3.0.3) unstable; urgency=low
+
+  * Maintenance Release
+
+ -- William Deegan <[email protected]>  Sat, 07 Jan 2018 19:44:18 -0700
+
 scons (3.0.2) unstable; urgency=low
 
   * Maintenance Release

doc/generated/examples/caching_ex-random_1.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-cc -o f2.o -c f2.c
-cc -o f1.o -c f1.c
+cc -o f3.o -c f3.c
 cc -o f4.o -c f4.c
+cc -o f1.o -c f1.c
 cc -o f5.o -c f5.c
-cc -o f3.o -c f3.c
+cc -o f2.o -c f2.c
 cc -o prog f1.o f2.o f3.o f4.o f5.o
 </screen>

doc/generated/examples/troubleshoot_explain1_3.xml

@@ -3,5 +3,5 @@
 cp file.in file.oout
 
 scons: warning: Cannot find target file.out after building
-File "/home/bdbaddog/scons/git/as_scons/bootstrap/src/script/scons.py", line 204, in <module>
+File "/home/bdbaddog/scons/git/as_scons/src/script/scons.py", line 204, in <module>
 </screen>

doc/user/main.xml

@@ -74,10 +74,10 @@
 
     <corpauthor>Steven Knight and the SCons Development Team</corpauthor>
 
-    <pubdate>2004 - 2018</pubdate>
+    <pubdate>2004 - 2019</pubdate>
 
     <copyright>
-      <year>2004 - 2018</year>
+      <year>2004 - 2019</year>
       <holder>The SCons Foundation</holder>
     </copyright>
 

src/CHANGES.txt

@@ -8,12 +8,35 @@
 RELEASE  VERSION/DATE TO BE FILLED IN LATER
 
   From John Doe:
-
     - Whatever John Doe did.
+
+  From Mats Wichmann:
+    - Improve finding of Microsoft compiler: add a 'products' wildcard
+      in case 2017 Build Tools only is installed as it is considered a separate
+      product from the default Visual Studio
+    - Add TEMPFILESUFFIX to allow a customizable filename extension, as
+      described in the patch attached to issue #2431.
+
+  From Daniel Moody:
+    - Improved support for VC14.1 and Visual Studio 2017, as well as arm and arm64 targets.
+    - Update TempFileMunge class to use PRINT_CMD_LINE_FUNC
+
+  From Tobias Herzog
+    - Enhance cpp scanner regex logic to detect if/elif expressions without whitespaces but
+      parenthesis like "#if(defined FOO)" or "#elif!(BAR)" correctly.
+
+RELEASE 3.0.3 - Mon, 07 Jan 2019 20:05:22 -0400
+  NOTE: 3.0.2 release was dropped because there was a packaging bug. Please consider all 3.0.2
+        content.
+
+  From William Deegan:
+    - Fixes to packaging logic.  Ensuring the SCons.Tool.clangCommon module is added
+      to the release packages.
+    - Modify scons.bat script to check for scons python script without .py extension if no file
+      scons.py exists. This enables an all platform wheel to work.
 
   From Mats Wichmann:
-    - Update some doc examples for Py3: map() now returns an interable
-      instead of a list.
+    - Update doc examples to work with Python 3.5+:  map() now returns an iterable instead of a list.
 
 
 RELEASE 3.0.2 - Mon, 31 Dec 2018 16:00:12 -0700

src/README.txt

@@ -2,7 +2,7 @@
 
                  SCons - a software construction tool
 
-                         Version __VERSION__
+                         Version 3.0.3
 
 
 This is SCons, a tool for building software (and other files).  SCons is
@@ -56,7 +56,7 @@ provided Python-standard setup script as follows:
 
 By default, the above command will do the following:
 
-    --  Install the version-numbered "scons-__VERSION__" and "sconsign-__VERSION__"
+    --  Install the version-numbered "scons-3.0.3" and "sconsign-3.0.3"
         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
@@ -70,25 +70,25 @@ By default, the above command will do the following:
         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-__VERSION__" and
-        "sconsign-__VERSION__" scripts by specifying the "--hardlink-scons"
+        scripts be hard links or symbolic links to the "scons-3.0.3" and
+        "sconsign-3.0.3" scripts by specifying the "--hardlink-scons"
         or "--symlink-scons" options on the command line.
 
-    --  Install "scons-__VERSION__.bat" and "scons.bat" wrapper scripts in the
+    --  Install "scons-3.0.3.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-__VERSION__.bat" and "scons.bat" files
+        specified to have "scons-3.0.3.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-__VERSION__ or C:\Python*\scons-__VERSION__, for example).
+        (/usr/lib/scons-3.0.3 or C:\Python*\scons-3.0.3, for example).
         See below for more options related to installing the build
         engine library.
 
@@ -246,4 +246,4 @@ many contributors, including but not at all limited to:
 
 \... and many others.
 
-Copyright (c) 2001 - 2015 The SCons Foundation
+Copyright (c) 2001 - 2019 The SCons Foundation

src/RELEASE.txt

@@ -1,7 +1,7 @@
-  A new SCons checkpoint release, 3.0.3.alpha.yyyymmdd, is now available
+  A new SCons checkpoint release, 3.0.4.alpha.yyyymmdd, is now available
   on the SCons download page:
 
-          https://scons.org/pages/download.html
+          http://www.scons.org/download.php
 
   XXX The primary purpose of this release ... XXX
 

src/engine/MANIFEST.in

@@ -65,6 +65,7 @@ SCons/Tool/c++.py
 SCons/Tool/cxx.py
 SCons/Tool/cc.py
 SCons/Tool/cyglink.py
+SCons/Tool/clangCommon/__init__.py
 SCons/Tool/clang.py
 SCons/Tool/clangxx.py
 SCons/Tool/cvf.py
@@ -178,3 +179,5 @@ SCons/Tool/msgfmt.py
 SCons/Tool/msginit.py
 SCons/Tool/msgmerge.py
 SCons/Tool/xgettext.py
+#SCons/Tool/docbook/docbook-xsl-1.76.1/**
+#SCons/Tool/docbook/utils/**