From 5d13f0a369a975ca3c6f0aeaecbb57fda4b9bd27 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 20 Jan 2019 22:17:12 +0000 Subject: Update CHANGES.txt to reference fixed github issues and to highlight initial support for ARM TARGET_ARCH --- src/CHANGES.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 840359c..64f02cb 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -7,9 +7,6 @@ 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 @@ -19,6 +16,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER From Daniel Moody: - Improved support for VC14.1 and Visual Studio 2017, as well as arm and arm64 targets. + Issues #3268 & Issue #3222 + - Initial support for ARM targets with Visual Studio 2017 - Issue #3182 (You must set TARGET_ARCH for this to work) - Update TempFileMunge class to use PRINT_CMD_LINE_FUNC From Tobias Herzog -- cgit v0.12 From 90b94ae78f57ccdae4e0abcc2de5cd5ab20e80d4 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 20 Jan 2019 22:18:09 +0000 Subject: Regenerated docs for 3.0.4 release --- doc/generated/examples/caching_ex-random_1.xml | 6 +-- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- doc/generated/tools.gen | 12 ++--- doc/generated/tools.mod | 4 +- doc/generated/variables.gen | 51 ++++++++++++++++------ doc/generated/variables.mod | 6 ++- 6 files changed, 53 insertions(+), 28 deletions(-) diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index c821b48..0a432e9 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 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 f1.o -c f1.c +cc -o f4.o -c f4.c cc -o prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index a60ed80..ebc13f8 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/src/script/scons.py", line 204, in <module> +File "/home/bdeegan/devel/scons/git/as_scons/src/script/scons.py", line 204, in <module> diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen index 7ae66c5..7661110 100644 --- a/doc/generated/tools.gen +++ b/doc/generated/tools.gen @@ -778,19 +778,19 @@ Sets construction variables for the Sets: &cv-link-AS;, &cv-link-ASCOM;, &cv-link-ASFLAGS;, &cv-link-ASPPCOM;, &cv-link-ASPPFLAGS;.Uses: &cv-link-ASCOMSTR;, &cv-link-ASPPCOMSTR;. - - Packaging + + packaging -Sets construction variables for the Package Builder. +A framework for building binary and source packages. - - packaging + + Packaging -A framework for building binary and source packages. +Sets construction variables for the Package Builder. diff --git a/doc/generated/tools.mod b/doc/generated/tools.mod index 1209d74..f9bc1d7 100644 --- a/doc/generated/tools.mod +++ b/doc/generated/tools.mod @@ -78,8 +78,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. mwcc"> mwld"> nasm"> -Packaging"> packaging"> +Packaging"> pdf"> pdflatex"> pdftex"> @@ -186,8 +186,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. mwcc"> mwld"> nasm"> -Packaging"> packaging"> +Packaging"> pdf"> pdflatex"> pdftex"> diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 5ed8c2f..4e84fbc 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -4487,6 +4487,7 @@ constructor; setting it later has no effect. Valid values for Windows are +14.1, 14.0, 14.0Exp, 12.0, @@ -6719,16 +6720,6 @@ Example - - SHLIBVERSIONFLAGS - - -Extra flags added to $SHLINKCOM when building versioned -SharedLibrary. These flags are only used when $SHLIBVERSION is -set. - - - _SHLIBVERSIONFLAGS @@ -6742,6 +6733,16 @@ and some extra dynamically generated options (such as + + SHLIBVERSIONFLAGS + + +Extra flags added to $SHLINKCOM when building versioned +SharedLibrary. These flags are only used when $SHLIBVERSION is +set. + + + SHLINK @@ -7221,18 +7222,24 @@ This variable must be passed as an argument to the Environment() constructor; setting it later has no effect. This is currently only used on Windows, but in the future it will be used on other OSes as well. +If this is set and MSVC_VERSION is not set, this will search for +all installed MSVC's that support the TARGET_ARCH, selecting the +latest version for use. Valid values for Windows are x86, +arm, i386 (for 32 bits); amd64, +arm64, emt64, x86_64 (for 64 bits); and ia64 (Itanium). + For example, if you want to compile 64-bit binaries, you would set TARGET_ARCH='x86_64' in your SCons environment. @@ -7272,14 +7279,30 @@ The suffix used for tar file names. The prefix for a temporary file used -to execute lines longer than $MAXLINELENGTH. -The default is '@'. -This may be set for toolchains that use other values, -such as '-@' for the diab compiler +to store lines lines longer than $MAXLINELENGTH +as operations which call out to a shell will fail +if the line is too long, which particularly +impacts linking. +The default is '@', which works for the Microsoft +and GNU toolchains on Windows. +Set this appropriately for other toolchains, +for example '-@' for the diab compiler or '-via' for ARM toolchain. + + TEMPFILESUFFIX + + +The suffix used for the temporary file name +used for long command lines. The name should +include the dot ('.') if one is wanted as +it will not be added automatically. +The default is '.lnk'. + + + TEX diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index 7dfb208..ffe4cf1 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -503,8 +503,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $_SHLIBSONAME"> $SHLIBSUFFIX"> $SHLIBVERSION"> -$SHLIBVERSIONFLAGS"> $_SHLIBVERSIONFLAGS"> +$SHLIBVERSIONFLAGS"> $SHLINK"> $SHLINKCOM"> $SHLINKCOMSTR"> @@ -544,6 +544,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $TARGETS"> $TARSUFFIX"> $TEMPFILEPREFIX"> +$TEMPFILESUFFIX"> $TEX"> $TEXCOM"> $TEXCOMSTR"> @@ -1140,8 +1141,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $_SHLIBSONAME"> $SHLIBSUFFIX"> $SHLIBVERSION"> -$SHLIBVERSIONFLAGS"> $_SHLIBVERSIONFLAGS"> +$SHLIBVERSIONFLAGS"> $SHLINK"> $SHLINKCOM"> $SHLINKCOMSTR"> @@ -1181,6 +1182,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $TARGETS"> $TARSUFFIX"> $TEMPFILEPREFIX"> +$TEMPFILESUFFIX"> $TEX"> $TEXCOM"> $TEXCOMSTR"> -- cgit v0.12 From d936671a277346ea575a4ba1422ab06c4b8c9ad8 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 20 Jan 2019 22:48:58 +0000 Subject: Updates for 3.0.4 release --- debian/changelog | 8 ++++++- src/Announce.txt | 6 +++++ src/RELEASE.txt | 71 ++++++++++---------------------------------------------- 3 files changed, 25 insertions(+), 60 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7ef3a14..7698b1e 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ +scons (3.0.4) unstable; urgency=low + + * Maintenance Release + + -- William Deegan Sun, 20 Jan 2019 19:44:18 -0700 + scons (3.0.3) unstable; urgency=low * Maintenance Release - -- William Deegan Sat, 07 Jan 2018 19:44:18 -0700 + -- William Deegan Sat, 07 Jan 2019 19:44:18 -0700 scons (3.0.2) unstable; urgency=low diff --git a/src/Announce.txt b/src/Announce.txt index 4058aa6..7eb57ae 100755 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -24,6 +24,12 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER release and consult the CHANGES.txt file for complete a list of changes since last release. This announcement highlights only the important changes. + Please note the following important changes since release 3.0.3: + - Added TEMPFILESUFFIX to allow user to specify suffix for tempfiles used for long command lines + - Initial support for ARM architectures with Microsoft Visual Studio 2017. You must set TARGET_ARCH + to arm or arm64 to enable. + - Fixed issue detecting installs of Microsoft Visual Studio 2017 as well as Microsoft build tools 2017. + Please note the following important changes since release 2.5.1: This is the initial release supporting both python 3.5+ and 2.7.x and pypy diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 8987ee2..c5b6203 100755 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -3,71 +3,24 @@ http://www.scons.org/download.php - 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: + Here is a summary of the changes since 3.0.3: NEW FUNCTIONALITY - - List new features (presumably why a checkpoint is being released) - - DEPRECATED FUNCTIONALITY - - - List anything that's been deprecated since the last release - - CHANGED/ENHANCED EXISTING FUNCTIONALITY - - - List modifications to existing features, where the previous behavior - wouldn't actually be considered a bug + - Added TEMPFILESUFFIX to allow user to specify suffix for tempfiles used for long command lines + - Initial support for ARM architectures with Microsoft Visual Studio 2017. You must set TARGET_ARCH + to arm or arm64 to enable. 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 - - - 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 - - - List visible changes in the way SCons is developed + - Fixed issue detecting installs of Microsoft Visual Studio 2017 as well as Microsoft build tools 2017. - Thanks to CURLY, LARRY, and MOE 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.3..HEAD + 17 Daniel + 10 Mats Wichmann + 4 Daniel Moody + 4 William Deegan + 3 anatoly techtonik + 1 Tobias Herzog \ No newline at end of file -- cgit v0.12 From 3a41ed6b288cee8d085373ad7fa02894e1903864 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 20 Jan 2019 22:51:22 +0000 Subject: Updated files per ReleaseConfig for 3.0.4 release --- README.rst | 14 +++++++------- ReleaseConfig | 2 +- SConstruct | 2 +- src/Announce.txt | 2 +- src/CHANGES.txt | 2 +- src/RELEASE.txt | 2 +- testing/framework/TestSCons.py | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.rst b/README.rst index ca66d51..49b1556 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.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 + build/dist/scons-3.0.4.tar.gz + build/dist/scons-3.0.4.zip + build/dist/scons-doc-3.0.4.tar.gz + build/dist/scons-local-3.0.4.tar.gz + build/dist/scons-local-3.0.4.zip + build/dist/scons-src-3.0.4.tar.gz + build/dist/scons-src-3.0.4.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/ReleaseConfig b/ReleaseConfig index 900e8b5..01440ba 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, 4, 'alpha', 0) +version_tuple = (3, 0, 4) # 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 a7eca26..3d93d1e 100644 --- a/SConstruct +++ b/SConstruct @@ -51,7 +51,7 @@ import textwrap import bootstrap project = 'scons' -default_version = '3.0.3' +default_version = '3.0.4' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years SConsignFile() diff --git a/src/Announce.txt b/src/Announce.txt index 7eb57ae..6558faa 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.4 - Mon, 20 Jan 2019 22:49:27 +0000 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 64f02cb..43a7725 100755 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -5,7 +5,7 @@ Change Log -RELEASE VERSION/DATE TO BE FILLED IN LATER +RELEASE 3.0.4 - Mon, 20 Jan 2019 22:49:27 +0000 From Mats Wichmann: - Improve finding of Microsoft compiler: add a 'products' wildcard diff --git a/src/RELEASE.txt b/src/RELEASE.txt index c5b6203..f117758 100755 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,4 +1,4 @@ - A new SCons checkpoint release, 3.0.4.alpha.yyyymmdd, is now available + A new SCons release, 3.0.4, is now available on the SCons download page: http://www.scons.org/download.php diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py index b543c07..38ffd08 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.3' +default_version = '3.0.4' python_version_unsupported = (2, 6, 0) python_version_deprecated = (2, 7, 0) -- cgit v0.12 From 73b2c02d7088c6d6490fdede8396d88103b00482 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 23 Jan 2019 17:43:22 +0000 Subject: Changes for 3.0.4 release --- README.rst | 2 +- bin/upload-release-files.sh | 2 +- doc/man/scons.xml | 4 ++-- doc/user/copyright.xml | 2 +- src/RELEASE.txt | 5 +++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 49b1556..17bbffa 100755 --- a/README.rst +++ b/README.rst @@ -765,5 +765,5 @@ many contributors, including but not at all limited to: \... and many others. -Copyright (c) 2001 - 2018 The SCons Foundation +Copyright (c) 2001 - 2019 The SCons Foundation diff --git a/bin/upload-release-files.sh b/bin/upload-release-files.sh index 4748db1..014134a 100755 --- a/bin/upload-release-files.sh +++ b/bin/upload-release-files.sh @@ -73,7 +73,7 @@ ssh scons@scons.org " cd .. rm latest; ln -s $VERSION latest rm production; ln -s $VERSION production - for f in HTML PDF EPUB PS TEXT; do rm \$f; ln -s $VERSION/\$f \$f; done + for f in HTML PDF EPUB PS TEXT; do rm -f \$f; ln -s $VERSION/\$f \$f; done " echo '*****' echo '***** Now manually update index.php, includes/versions.php and news-raw.xhtml on scons.org.' diff --git a/doc/man/scons.xml b/doc/man/scons.xml index 805164c..0f59967 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -54,10 +54,10 @@ Steven Knight and the SCons Development Team - 2004 - 2018 + 2004 - 2019 - 2004 - 2018 + 2004 - 2019 The SCons Foundation diff --git a/doc/user/copyright.xml b/doc/user/copyright.xml index 588253c..d36ff1e 100644 --- a/doc/user/copyright.xml +++ b/doc/user/copyright.xml @@ -35,7 +35,7 @@
- SCons User's Guide Copyright (c) 2004-2018 Steven Knight + SCons User's Guide Copyright (c) 2004-2019 Steven Knight
diff --git a/src/RELEASE.txt b/src/RELEASE.txt index f117758..97401cb 100755 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -2,7 +2,8 @@ on the SCons download page: http://www.scons.org/download.php - + Or via pypi: + pip install scons Here is a summary of the changes since 3.0.3: @@ -23,4 +24,4 @@ git shortlog --no-merges -ns 3.0.3..HEAD 4 Daniel Moody 4 William Deegan 3 anatoly techtonik - 1 Tobias Herzog \ No newline at end of file + 1 Tobias Herzog -- cgit v0.12