From 962c46e4b8f433ecb7a07144849f6dab724fd5f5 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 5 Jan 2019 19:54:47 -0500 Subject: Regenerated docs for 3.0.3 release --- doc/generated/examples/caching_ex-random_1.xml | 4 ++-- doc/generated/examples/troubleshoot_Dump_2.xml | 2 +- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- doc/generated/variables.gen | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index cab47eb..667ab4b 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,9 +1,9 @@ % scons -Q -cc -o f2.o -c f2.c cc -o f1.o -c f1.c cc -o f4.o -c f4.c -cc -o f5.o -c f5.c +cc -o f2.o -c f2.c cc -o f3.o -c f3.c +cc -o f5.o -c f5.c cc -o prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml index a621422..08c6f04 100644 --- a/doc/generated/examples/troubleshoot_Dump_2.xml +++ b/doc/generated/examples/troubleshoot_Dump_2.xml @@ -79,7 +79,7 @@ scons: Reading SConscript files ... 'SHCXX': '$CXX', 'SHCXXCOM': '${TEMPFILE("$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM","$SHCXXCOMSTR")}', 'SHCXXFLAGS': ['$CXXFLAGS'], - 'SHELL': None, + 'SHELL': 'command', 'SHLIBPREFIX': '', 'SHLIBSUFFIX': '.dll', 'SHOBJPREFIX': '$OBJPREFIX', diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index cbe4800..ed8f6d9 100644 --- a/doc/generated/examples/troubleshoot_explain1_3.xml +++ b/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 "/Users/bdbaddog/devel/scons/git/as_scons/src/script/scons.py", line 204, in <module> diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 5ed8c2f..436f14e 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -3298,7 +3298,7 @@ The command line used to call the Java archive tool. The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. @@ -3308,7 +3308,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET") The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. -- cgit v0.12 From 2ecbca718d3d03cebaeb53aeb617107ac15e7e78 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 5 Jan 2019 19:54:57 -0500 Subject: Updated for 3.0.3 release --- ReleaseConfig | 2 +- src/CHANGES.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ReleaseConfig b/ReleaseConfig index 6bda340..7ff6087 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, 'alpha', 0) +version_tuple = (3, 0, 3) # 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/CHANGES.txt b/src/CHANGES.txt index 6732d38..308f113 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -5,11 +5,11 @@ Change Log -RELEASE VERSION/DATE TO BE FILLED IN LATER +RELEASE 3.0.3 - Sat, 02 Jan 2018 19:44:18 -0700 - From John Doe: + From William Deegan: - - Whatever John Doe did. + - Fixes to packaging logic. From Mats Wichmann: - Update some doc examples for Py3: map() now returns an interable -- cgit v0.12 From c5f4cb45a170e16f280729da55be53531966bb1e Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 5 Jan 2019 20:04:54 -0500 Subject: Updates for 3.0.3 release --- debian/changelog | 6 +++ src/Announce.txt | 2 +- src/CHANGES.txt | 2 + src/RELEASE.txt | 114 ++++++++++++++++++++++++++++++------------------------- 4 files changed, 71 insertions(+), 53 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7fe610e..e906075 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +scons (3.0.3) unstable; urgency=low + + * Maintenance Release + + -- William Deegan Sat, 02 Jan 2018 19:44:18 -0700 + scons (3.0.2) unstable; urgency=low * Maintenance Release diff --git a/src/Announce.txt b/src/Announce.txt index c7948c0..d981b15 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 VERSION/DATE TO BE FILLED IN LATER +RELEASE 3.0.3 - Sat, 02 Jan 2018 19:44:18 -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 308f113..505471c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -6,6 +6,8 @@ RELEASE 3.0.3 - Sat, 02 Jan 2018 19:44:18 -0700 + NOTE: 3.0.2 release was dropped because there was a packaging bug. Please consider all 3.0.2 + content. From William Deegan: diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 11d20e6..3cc5b6c 100755 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,73 +1,83 @@ - A new SCons checkpoint release, 3.0.3.alpha.yyyymmdd, is now available - on the SCons download page: - 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. - - 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. + A new SCons release, 3.0.3, is now available on the SCons download page: - 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. + https://scons.org/pages/download.html - 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: + Here is a summary of the changes since 3.0.1: NEW FUNCTIONALITY - - List new features (presumably why a checkpoint is being released) + - 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. DEPRECATED FUNCTIONALITY - - List anything that's been deprecated since the last release + - Going forward calling SConscript on a non-existing SConscript file will issue a warning. Currently + it will issue a deprecation notice. CHANGED/ENHANCED EXISTING FUNCTIONALITY - - 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 + - Recognize new java 9, 10, 11 (as 9.0 and 10.0, 11.0) DOCUMENTATION + - Update some doc examples for Py3: map() now returns an iterable + instead of a list. - - 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) + FIXES - DEVELOPMENT + - 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. - - List visible changes in the way SCons is developed - Thanks to CURLY, LARRY, and MOE for their contributions to this release. + 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. Contributors are listed alphabetically by their last name. -__COPYRIGHT__ -__FILE__ __REVISION__ __DATE__ __DEVELOPER__ +git shortlog --no-merges -ns 3.0.1..HEAD + 235 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 -- cgit v0.12 From 995b295e108a86ecae369039cdfdd1308ce92621 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 5 Jan 2019 20:06:02 -0500 Subject: updates from update-release-info for 3.0.3 release --- README.rst | 14 +++++++------- SConstruct | 4 ++-- doc/user/main.xml | 4 ++-- src/Announce.txt | 2 +- src/CHANGES.txt | 2 +- testing/framework/TestSCons.py | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.rst b/README.rst index 3c84ce6..b7f49da 100755 --- a/README.rst +++ b/README.rst @@ -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 diff --git a/SConstruct b/SConstruct index 86e9711..22caa1d 100644 --- a/SConstruct +++ b/SConstruct @@ -8,7 +8,7 @@ from __future__ import print_function copyright_years = '2001 - 2018' # 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() diff --git a/doc/user/main.xml b/doc/user/main.xml index a34405b..42724d1 100644 --- a/doc/user/main.xml +++ b/doc/user/main.xml @@ -74,10 +74,10 @@ Steven Knight and the SCons Development Team - 2004 - 2018 + 2004 - 2019 - 2004 - 2018 + 2004 - 2019 The SCons Foundation diff --git a/src/Announce.txt b/src/Announce.txt index d981b15..b4d50f1 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 - Sat, 02 Jan 2018 19:44:18 -0700 +RELEASE 3.0.3 - Mon, 05 Jan 2019 20:05:22 -0400 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 505471c..288f97c 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -5,7 +5,7 @@ Change Log -RELEASE 3.0.3 - Sat, 02 Jan 2018 19:44:18 -0700 +RELEASE 3.0.3 - Mon, 05 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. diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index ee8f0ec..b543c07 100644 --- a/testing/framework/TestSCons.py +++ b/testing/framework/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.2' +default_version = '3.0.3' python_version_unsupported = (2, 6, 0) python_version_deprecated = (2, 7, 0) -- cgit v0.12 From 37e6ab8f3e6d1885f8e87b8bdd77f20039192a6d Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 5 Jan 2019 17:12:10 -0800 Subject: Fix version string from 3.1.0 to 3.0.3 --- README.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index b7f49da..ca66d51 100755 --- a/README.rst +++ b/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:: -- cgit v0.12 From 102c35fc0f5e15ed1548e94911c8ecc02ed8ad5d Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 5 Jan 2019 17:15:03 -0800 Subject: Minor versioning fixes --- src/README.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/README.txt b/src/README.txt index ce65b8d..40d7217 100644 --- a/src/README.txt +++ b/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,17 +70,17 @@ 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 @@ -88,7 +88,7 @@ By default, the above command will do the following: -- 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 -- cgit v0.12 From d93d777d1feee8bc155da9cd488b3461b7da3ae1 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 5 Jan 2019 17:15:14 -0800 Subject: Fix version strings to be 3.0.3 --- src/setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/setup.py b/src/setup.py index d189dfc..cfa362b 100755 --- a/src/setup.py +++ b/src/setup.py @@ -325,7 +325,7 @@ class install_scripts(_install_scripts): base = os.path.basename(src) scons = os.path.join(self.install_dir, base) scons_ver = scons + '-' + Version - if sys.platform == "win32": + if is_win32:: scons = scons + '.py' scons_ver = scons_ver + '.py' create_version_script(src, scons_ver) @@ -414,8 +414,8 @@ arguments = { 'version': Version, 'description': description, 'long_description': long_description, - 'author': 'Steven Knight', - 'author_email': 'knight@baldmt.com', + 'author': 'William Deegan', + 'author_email': 'bill@baddogconsulting.com', 'url': "http://www.scons.org/", 'packages': ["SCons", "SCons.compat", -- cgit v0.12 From 3efb7c2a611d1cf9dea74817bcb015dde4e744bc Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 6 Jan 2019 12:48:51 -0800 Subject: Fix typo --- src/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/setup.py b/src/setup.py index cfa362b..3e5413d 100755 --- a/src/setup.py +++ b/src/setup.py @@ -325,7 +325,7 @@ class install_scripts(_install_scripts): base = os.path.basename(src) scons = os.path.join(self.install_dir, base) scons_ver = scons + '-' + Version - if is_win32:: + if is_win32: scons = scons + '.py' scons_ver = scons_ver + '.py' create_version_script(src, scons_ver) -- cgit v0.12 From 13b03bc29abb128096b404d44fc3b57f1fcf2e24 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 6 Jan 2019 12:49:15 -0800 Subject: Add clangCommon to MANIFEST.in so it get's packaged --- src/engine/MANIFEST.in | 1 + 1 file changed, 1 insertion(+) diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index 4a9f240..cf307f4 100644 --- a/src/engine/MANIFEST.in +++ b/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 -- cgit v0.12 From 0ea03df3fc070363a927cad37cc58ca62d1312b0 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 6 Jan 2019 13:33:36 -0800 Subject: add clangCommon to packaging --- src/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/setup.py b/src/setup.py index 3e5413d..ef2e5e2 100755 --- a/src/setup.py +++ b/src/setup.py @@ -424,6 +424,7 @@ arguments = { "SCons.Scanner", "SCons.Script", "SCons.Tool", + "SCons.Tool.clangCommon", "SCons.Tool.docbook", "SCons.Tool.MSCommon", "SCons.Tool.packaging", -- cgit v0.12 From ba753f0ee5f92c215aab62afa598060141aebdff Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 11:26:37 -0500 Subject: Adding docbooks xsl files and clangCommong --- src/engine/MANIFEST.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index 4a9f240..7456824 100644 --- a/src/engine/MANIFEST.in +++ b/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/** -- cgit v0.12 From 35170015889281f21653acfc8c99e5040246b97c Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 11:26:54 -0500 Subject: Add clangCommon --- src/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/setup.py b/src/setup.py index d189dfc..99700b8 100755 --- a/src/setup.py +++ b/src/setup.py @@ -425,6 +425,7 @@ arguments = { "SCons.Script", "SCons.Tool", "SCons.Tool.docbook", + 'SCons.Tool.clangCommon', "SCons.Tool.MSCommon", "SCons.Tool.packaging", "SCons.Variables", -- cgit v0.12 From 48378d8af7ce77e60138f33bf6e572db5942ceab Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 11:27:59 -0500 Subject: Remove src/engine/MANIFEST-xml.in and logic which refers to it. Can't see why we had a seperate manifest for just the xml files which were then not included in the package, making docbook builders not work --- bootstrap.py | 7 ++----- src/engine/MANIFEST-xml.in | 8 -------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 src/engine/MANIFEST-xml.in diff --git a/bootstrap.py b/bootstrap.py index 7a4dc91..ea7e0c8 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -178,15 +178,11 @@ def main(): 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 main(): sys.exit(subprocess.Popen(args, env=os.environ).wait()) + if __name__ == "__main__": main() diff --git a/src/engine/MANIFEST-xml.in b/src/engine/MANIFEST-xml.in deleted file mode 100644 index cfbfd3a..0000000 --- a/src/engine/MANIFEST-xml.in +++ /dev/null @@ -1,8 +0,0 @@ -SCons/*.xml -SCons/Platform/*.xml -SCons/Scanner/__init__.xml -SCons/Script/*.xml -SCons/Tool/*.xml -SCons/Tool/docbook/__init__.xml -SCons/Tool/docbook/utils/xmldepend.xsl -SCons/Tool/packaging/__init__.xml -- cgit v0.12 From 8f579b127e277e5b6a99ab26769dfad7783aa772 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 11:29:49 -0500 Subject: update CHANGES.txt --- src/CHANGES.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 288f97c..071bd59 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -5,13 +5,14 @@ Change Log -RELEASE 3.0.3 - Mon, 05 Jan 2019 20:05:22 -0400 +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. + - Fixes to packaging logic. Ensuring the SCons.Tool.clangCommon module and the docbook xsl files are added + to the packages. From Mats Wichmann: - Update some doc examples for Py3: map() now returns an interable -- cgit v0.12 From 0e20ef9c3a8737bb1bcdceba8ce9d766cd41d5bd Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 08:44:43 -0800 Subject: Updated docs for 3.0.3 Release --- doc/generated/examples/caching_ex-random_1.xml | 6 +++--- doc/generated/examples/troubleshoot_Dump_2.xml | 2 +- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- doc/generated/variables.gen | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index 667ab4b..c821b48 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,9 +1,9 @@ % scons -Q -cc -o f1.o -c f1.c -cc -o f4.o -c f4.c -cc -o f2.o -c f2.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 f2.o -c f2.c cc -o prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml index 08c6f04..a621422 100644 --- a/doc/generated/examples/troubleshoot_Dump_2.xml +++ b/doc/generated/examples/troubleshoot_Dump_2.xml @@ -79,7 +79,7 @@ scons: Reading SConscript files ... 'SHCXX': '$CXX', 'SHCXXCOM': '${TEMPFILE("$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM","$SHCXXCOMSTR")}', 'SHCXXFLAGS': ['$CXXFLAGS'], - 'SHELL': 'command', + 'SHELL': None, 'SHLIBPREFIX': '', 'SHLIBSUFFIX': '.dll', 'SHOBJPREFIX': '$OBJPREFIX', diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index ed8f6d9..a60ed80 100644 --- a/doc/generated/examples/troubleshoot_explain1_3.xml +++ b/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 "/Users/bdbaddog/devel/scons/git/as_scons/src/script/scons.py", line 204, in <module> +File "/home/bdbaddog/scons/git/as_scons/src/script/scons.py", line 204, in <module> diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 436f14e..5ed8c2f 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -3298,7 +3298,7 @@ The command line used to call the Java archive tool. The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. @@ -3308,7 +3308,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET") The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. -- cgit v0.12 From 0fb914855c31d064070bc76278a95e67f60b8b67 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 08:45:52 -0800 Subject: Fix date for 3.0.3 in debian/changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e906075..7ef3a14 100755 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ scons (3.0.3) unstable; urgency=low * Maintenance Release - -- William Deegan Sat, 02 Jan 2018 19:44:18 -0700 + -- William Deegan Sat, 07 Jan 2018 19:44:18 -0700 scons (3.0.2) unstable; urgency=low -- cgit v0.12 From 1cc11c66b38e34df8609526e210cf68efee406e2 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 16:46:22 +0000 Subject: Updates for Ubuntu 18.04 LTS build machine --- bin/scons_dev_master.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py index 4fa5899..4b1160f 100644 --- a/bin/scons_dev_master.py +++ b/bin/scons_dev_master.py @@ -42,6 +42,7 @@ BUILDING_PACKAGES = [ 'python-epydoc', 'rpm', 'tar', + 'lynx' # additional packages that Bill Deegan's web page suggests #'docbook-to-man', @@ -70,11 +71,12 @@ TESTING_PACKAGES = [ 'bison', 'cssc', 'cvs', - 'hg', 'flex', 'g++', 'gcc', - 'gcj', + # not on ubuntu 18.04 + # 'gcj', + # 'hg', 'ghostscript', 'm4', 'openssh-client', -- cgit v0.12 From adb58640b798f8953611238e2d084c780826e774 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 17:02:36 +0000 Subject: Update EnsureSConsVersion test expected fail version check from version 3 to version 4 --- test/EnsureSConsVersion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EnsureSConsVersion.py b/test/EnsureSConsVersion.py index b31abfe..66543a3 100644 --- a/test/EnsureSConsVersion.py +++ b/test/EnsureSConsVersion.py @@ -50,7 +50,7 @@ Exit(0) test.write('SConstruct', """\ env = Environment() -env.EnsureSConsVersion(3,0) +env.EnsureSConsVersion(4,0) Exit(0) """) -- cgit v0.12 From 92fa2386ebcbcb1788c204a08f4e31130474dfc1 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 09:16:08 -0800 Subject: Update copyright date to 2019 --- ReleaseConfig | 2 +- SConstruct | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ReleaseConfig b/ReleaseConfig index 7ff6087..b5954df 100755 --- a/ReleaseConfig +++ b/ReleaseConfig @@ -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 diff --git a/SConstruct b/SConstruct index 22caa1d..a7eca26 100644 --- a/SConstruct +++ b/SConstruct @@ -5,7 +5,7 @@ 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 = 'January 2019' -- cgit v0.12 From 2393a1992549e05c45359fc8e9cfd0405f79f3a8 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 21:57:10 -0500 Subject: Update scons.bat to first look for scons.py and then scons so that a universal python wheel can work on windows --- src/CHANGES.txt | 9 +++++---- src/engine/MANIFEST.in | 4 ++-- src/script/scons.bat | 2 ++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 071bd59..231badb 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -11,12 +11,13 @@ RELEASE 3.0.3 - Mon, 07 Jan 2019 20:05:22 -0400 From William Deegan: - - Fixes to packaging logic. Ensuring the SCons.Tool.clangCommon module and the docbook xsl files are added - to the packages. + - 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 diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index 7456824..39aba6c 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -179,5 +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/** +#SCons/Tool/docbook/docbook-xsl-1.76.1/** +#SCons/Tool/docbook/utils/** diff --git a/src/script/scons.bat b/src/script/scons.bat index a9e777e..10b8637 100644 --- a/src/script/scons.bat +++ b/src/script/scons.bat @@ -22,6 +22,8 @@ popd @REM try the script named as the .bat file in current dir, then in Scripts subdir set scriptname=%~dp0%~n0.py if not exist "%scriptname%" set scriptname=%~dp0Scripts\%~n0.py +@REM Handle when running from wheel where the script has no .py extension +if not exist "%scriptname%" set scriptname=%~dp0%~n0 python "%scriptname%" %* endlocal & set SCONS_ERRORLEVEL=%ERRORLEVEL% -- cgit v0.12 From c06fc3c33f2dded14e4c1328353b986cd8b2ca9a Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 22:23:59 -0500 Subject: Fix datestamp for release --- src/Announce.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Announce.txt b/src/Announce.txt index b4d50f1..9e9c16b 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, 05 Jan 2019 20:05:22 -0400 +RELEASE 3.0.3 - Mon, 07 Jan 2019 20:05:22 -0400 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 -- cgit v0.12 From d6590f200c9b230fee93853f957e3390d377496b Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 7 Jan 2019 22:26:58 -0500 Subject: Update release with commit info --- src/RELEASE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 3cc5b6c..2355f47 100755 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -59,7 +59,7 @@ Contributors are listed alphabetically by their last name. git shortlog --no-merges -ns 3.0.1..HEAD - 235 William Deegan + 254 William Deegan 79 Daniel Moody 73 Mats Wichmann 17 Paweł Tomulik -- cgit v0.12