Hello community, here is the log from the commit of package scons for openSUSE:Factory checked in at 2019-02-04 21:23:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scons (Old) and /work/SRC/openSUSE:Factory/.scons.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scons" Mon Feb 4 21:23:20 2019 rev:39 rq:667768 version:3.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/scons/scons.changes 2019-01-11 14:00:06.932124594 +0100 +++ /work/SRC/openSUSE:Factory/.scons.new.28833/scons.changes 2019-02-04 21:23:23.127625459 +0100 @@ -1,0 +2,7 @@ +Tue Jan 15 15:10:42 UTC 2019 - [email protected] + +- scons 3.0.3: + * upstream packaging fixes + * Update doc examples to work with Python 3.5+ + +------------------------------------------------------------------- Old: ---- 3.0.2.tar.gz scons-user.html-3.0.1.tar.bz2 New: ---- 3.0.3.tar.gz scons-user.html-3.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scons.spec ++++++ --- /var/tmp/diff_new_pack.f5Uofv/_old 2019-02-04 21:23:24.275625179 +0100 +++ /var/tmp/diff_new_pack.f5Uofv/_new 2019-02-04 21:23:24.275625179 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -34,7 +34,7 @@ %else Name: %{modname} %endif -Version: 3.0.2 +Version: 3.0.3 Release: 0 Summary: Replacement for Make License: MIT @@ -42,7 +42,7 @@ URL: http://www.scons.org/ Source0: https://github.com/SCons/%{modname}/archive/%{version}.tar.gz #http://www.scons.org/doc/%%{version}/HTML/scons-user.html -Source1: scons-user.html-3.0.1.tar.bz2 +Source1: scons-user.html-%{version}.tar.bz2 # Adjust to exclude all failing tests Source2: grep-filter-list.txt # Local modification ++++++ 3.0.2.tar.gz -> 3.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/README.rst new/scons-3.0.3/README.rst --- old/scons-3.0.2/README.rst 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/README.rst 2019-01-08 04:26:58.000000000 +0100 @@ -178,7 +178,7 @@ 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 @@ 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 @@ 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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/ReleaseConfig new/scons-3.0.3/ReleaseConfig --- old/scons-3.0.2/ReleaseConfig 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/ReleaseConfig 2019-01-08 04:26:58.000000000 +0100 @@ -32,7 +32,7 @@ # '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, 2) +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 @@ -51,7 +51,7 @@ #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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/SConstruct new/scons-3.0.3/SConstruct --- old/scons-3.0.2/SConstruct 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/SConstruct 2019-01-08 04:26:58.000000000 +0100 @@ -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 bootstrap project = 'scons' -default_version = '3.0.2' +default_version = '3.0.3' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years SConsignFile() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/bin/scons_dev_master.py new/scons-3.0.3/bin/scons_dev_master.py --- old/scons-3.0.2/bin/scons_dev_master.py 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/bin/scons_dev_master.py 2019-01-08 04:26:58.000000000 +0100 @@ -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', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/bootstrap.py new/scons-3.0.3/bootstrap.py --- old/scons-3.0.2/bootstrap.py 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/bootstrap.py 2019-01-08 04:26:58.000000000 +0100 @@ -178,15 +178,11 @@ 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 @@ sys.exit(subprocess.Popen(args, env=os.environ).wait()) + if __name__ == "__main__": main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/debian/changelog new/scons-3.0.3/debian/changelog --- old/scons-3.0.2/debian/changelog 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/debian/changelog 2019-01-08 04:26:58.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/doc/SConscript new/scons-3.0.3/doc/SConscript --- old/scons-3.0.2/doc/SConscript 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/doc/SConscript 2019-01-08 04:26:58.000000000 +0100 @@ -574,7 +574,9 @@ e = os.path.join('#src', 'engine') manifest_in = File(os.path.join(e, 'MANIFEST.in')).rstr() sources = bootstrap.parseManifestLines(e, open(manifest_in).readlines()) -# sources = [x for x in sources if x.find('Platform') == -1] + + # Don't omit this as we need Platform.virtualenv for the examples to be run + # sources = [x for x in sources if x.find('Platform') == -1] sources = [x for x in sources if x.find('Tool') == -1] # XXX sources = [x for x in sources if x.find('Options') == -1] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/doc/generated/examples/caching_ex-random_1.xml new/scons-3.0.3/doc/generated/examples/caching_ex-random_1.xml --- old/scons-3.0.2/doc/generated/examples/caching_ex-random_1.xml 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/doc/generated/examples/caching_ex-random_1.xml 2019-01-08 04:26:58.000000000 +0100 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/doc/generated/examples/troubleshoot_explain1_3.xml new/scons-3.0.3/doc/generated/examples/troubleshoot_explain1_3.xml --- old/scons-3.0.2/doc/generated/examples/troubleshoot_explain1_3.xml 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/doc/generated/examples/troubleshoot_explain1_3.xml 2019-01-08 04:26:58.000000000 +0100 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/doc/man/scons.xml new/scons-3.0.3/doc/man/scons.xml --- old/scons-3.0.2/doc/man/scons.xml 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/doc/man/scons.xml 2019-01-08 04:26:58.000000000 +0100 @@ -3014,7 +3014,7 @@ <literallayout class="monospaced"> print(str(DEFAULT_TARGETS[0])) -if 'foo' in map(str, DEFAULT_TARGETS): +if 'foo' in [str(t) for t in DEFAULT_TARGETS]: print("Don't forget to test the `foo' program!") </literallayout> </listitem> @@ -3028,13 +3028,13 @@ function:</para> <literallayout class="monospaced"> -print(map(str, DEFAULT_TARGETS)) # originally [] +print([str(t) for t in DEFAULT_TARGETS]) # originally [] Default('foo') -print(map(str, DEFAULT_TARGETS)) # now a node ['foo'] +print([str(t) for t in DEFAULT_TARGETS]) # now a node ['foo'] Default('bar') -print(map(str, DEFAULT_TARGETS)) # now a node ['foo', 'bar'] +print([str(t) for t in DEFAULT_TARGETS]) # now a node ['foo', 'bar'] Default(None) -print(map(str, DEFAULT_TARGETS)) # back to [] +print([str(t) for t in DEFAULT_TARGETS]) # back to [] </literallayout> <para>Consequently, be sure to use @@ -5279,11 +5279,11 @@ more than one target file or source file. The actual target and source file name(s) may be retrieved from their Node objects -via the built-in Python str() function:</para> +via the built-in Python <function>str</function> function:</para> <literallayout class="monospaced"> target_file_name = str(target) -source_file_names = map(lambda x: str(x), source) +source_file_names = [str(x) for x in source] </literallayout> <para>The function should return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/doc/user/command-line.xml new/scons-3.0.3/doc/user/command-line.xml --- old/scons-3.0.2/doc/user/command-line.xml 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/doc/user/command-line.xml 2019-01-08 04:26:58.000000000 +0100 @@ -2200,9 +2200,8 @@ internal &SCons; nodes, so you need to convert the list elements to strings if you want to print them or look for a specific target name. - Fortunately, you can do this easily - by using the Python <function>map</function> function - to run the list through <function>str</function>: + You can do this easily by calling the <function>str</function> + on the elements in a list comprehension: </para> @@ -2210,7 +2209,7 @@ <file name="SConstruct" printme="1"> prog1 = Program('prog1.c') Default(prog1) -print("DEFAULT_TARGETS is %s"%map(str, DEFAULT_TARGETS)) +print("DEFAULT_TARGETS is %s" % [str(t) for t in DEFAULT_TARGETS]) </file> <file name="prog1.c"> prog1.c @@ -2244,10 +2243,10 @@ <file name="SConstruct" printme="1"> prog1 = Program('prog1.c') Default(prog1) -print("DEFAULT_TARGETS is now %s"%map(str, DEFAULT_TARGETS)) +print("DEFAULT_TARGETS is now %s" % [str(t) for t in DEFAULT_TARGETS]) prog2 = Program('prog2.c') Default(prog2) -print("DEFAULT_TARGETS is now %s"%map(str, DEFAULT_TARGETS)) +print("DEFAULT_TARGETS is now %s" % [str(t) for t in DEFAULT_TARGETS]) </file> <file name="prog1.c"> prog1.c @@ -2338,7 +2337,7 @@ prog1 = Program('prog1.c') Program('prog2.c') Default(prog1) -print ("BUILD_TARGETS is %s"%map(str, BUILD_TARGETS)) +print ("BUILD_TARGETS is %s" % [str(t) for t in BUILD_TARGETS]) </file> <file name="prog1.c"> prog1.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/doc/user/main.xml new/scons-3.0.3/doc/user/main.xml --- old/scons-3.0.2/doc/user/main.xml 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/doc/user/main.xml 2019-01-08 04:26:58.000000000 +0100 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/src/Announce.txt new/scons-3.0.3/src/Announce.txt --- old/scons-3.0.2/src/Announce.txt 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/src/Announce.txt 2019-01-08 04:26:58.000000000 +0100 @@ -18,7 +18,7 @@ effectively, please go to http://scons.org/lists.html#users to sign up for the scons-users mailing list. -RELEASE 3.0.2 - Mon, 31 Dec 2018 16:00:12 -0700 +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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/src/CHANGES.txt new/scons-3.0.3/src/CHANGES.txt --- old/scons-3.0.2/src/CHANGES.txt 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/src/CHANGES.txt 2019-01-08 04:26:58.000000000 +0100 @@ -5,6 +5,21 @@ Change Log +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 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 From Bernard Blackham: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/src/README.txt new/scons-3.0.3/src/README.txt --- old/scons-3.0.2/src/README.txt 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/src/README.txt 2019-01-08 04:26:58.000000000 +0100 @@ -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 @@ 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 @@ 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 @@ -- 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 @@ \... and many others. -Copyright (c) 2001 - 2015 The SCons Foundation +Copyright (c) 2001 - 2019 The SCons Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/src/RELEASE.txt new/scons-3.0.3/src/RELEASE.txt --- old/scons-3.0.2/src/RELEASE.txt 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/src/RELEASE.txt 2019-01-08 04:26:58.000000000 +0100 @@ -1,4 +1,5 @@ - A new SCons release, 3.0.2, is now available on the SCons download page: + + A new SCons release, 3.0.3, is now available on the SCons download page: https://scons.org/pages/download.html @@ -38,25 +39,29 @@ - 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. + FIXES - 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 + 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. - Thanks to Bernard Blackham, William Deegan, Ray Donnelly, Andrew Featherstone, Arda Fu, - Philipp Maierhöfer, Matthew Marinets, Fredrik Medley, Daniel Moody, Gary Oberbrunner, + 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. git shortlog --no-merges -ns 3.0.1..HEAD - 226 William Deegan + 254 William Deegan 79 Daniel Moody - 72 Mats Wichmann + 73 Mats Wichmann 17 Paweł Tomulik 16 Andrew Featherstone 8 grbd @@ -76,6 +81,3 @@ 1 Ray Donnelly 1 Zachary Tessler 1 cclauss - -__COPYRIGHT__ -__FILE__ __REVISION__ __DATE__ __DEVELOPER__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/src/engine/MANIFEST-xml.in new/scons-3.0.3/src/engine/MANIFEST-xml.in --- old/scons-3.0.2/src/engine/MANIFEST-xml.in 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/src/engine/MANIFEST-xml.in 1970-01-01 01:00:00.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/src/engine/MANIFEST.in new/scons-3.0.3/src/engine/MANIFEST.in --- old/scons-3.0.2/src/engine/MANIFEST.in 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/src/engine/MANIFEST.in 2019-01-08 04:26:58.000000000 +0100 @@ -65,6 +65,7 @@ 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/msginit.py SCons/Tool/msgmerge.py SCons/Tool/xgettext.py +#SCons/Tool/docbook/docbook-xsl-1.76.1/** +#SCons/Tool/docbook/utils/** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/src/script/scons.bat new/scons-3.0.3/src/script/scons.bat --- old/scons-3.0.2/src/script/scons.bat 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/src/script/scons.bat 2019-01-08 04:26:58.000000000 +0100 @@ -22,6 +22,8 @@ @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% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/src/setup.py new/scons-3.0.3/src/setup.py --- old/scons-3.0.2/src/setup.py 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/src/setup.py 2019-01-08 04:26:58.000000000 +0100 @@ -20,6 +20,17 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +from __future__ import print_function + + +import distutils.command.build_scripts +import distutils.command.install_scripts +import distutils.command.install_lib +import distutils.command.install_data +import distutils.command.install +import distutils.core +import distutils +# import setuptools """ NOTE: Installed SCons is not importable like usual Python packages. It is executed explicitly with command line scripts. This allows multiple @@ -32,7 +43,6 @@ below is dedicated to make it happen on various platforms. """ -from __future__ import print_function __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" @@ -66,16 +76,6 @@ else: is_win32 = 1 -import setuptools -import distutils -import distutils.core -import distutils.command.install -import distutils.command.install_data -import distutils.command.install_lib -import distutils.command.install_scripts -import distutils.command.build_scripts -import distutils.msvccompiler - _install = distutils.command.install.install _install_data = distutils.command.install_data.install_data @@ -166,7 +166,7 @@ self.no_scons_script = 0 self.no_version_script = 0 self.install_bat = 0 - self.no_install_bat = not is_win32 + self.no_install_bat = False # not is_win32 self.install_man = 0 self.no_install_man = is_win32 self.standard_lib = 0 @@ -326,8 +326,8 @@ scons = os.path.join(self.install_dir, base) scons_ver = scons + '-' + Version if is_win32: - scons += '.py' - scons_ver += '.py' + scons = scons + '.py' + scons_ver = scons_ver + '.py' create_version_script(src, scons_ver) create_basename_script(src, scons, scons_ver) @@ -355,7 +355,8 @@ # Use symbolic versions of permissions so this script doesn't fail to parse under python3.x exec_and_read_permission = stat.S_IXOTH | stat.S_IXUSR | stat.S_IXGRP | stat.S_IROTH | stat.S_IRUSR | stat.S_IRGRP mode_mask = 4095 # Octal 07777 used because python3 has different octal syntax than python 2 - mode = ((os.stat(file)[stat.ST_MODE]) | exec_and_read_permission) & mode_mask + mode = ((os.stat(file)[stat.ST_MODE]) | + exec_and_read_permission) & mode_mask # log.info("changing mode of %s to %o", file, mode) os.chmod(file, mode) # --- /distutils copy/paste --- @@ -413,8 +414,8 @@ 'version': Version, 'description': description, 'long_description': long_description, - 'author': 'Steven Knight', - 'author_email': '[email protected]', + 'author': 'William Deegan', + 'author_email': '[email protected]', 'url': "http://www.scons.org/";, 'packages': ["SCons", "SCons.compat", @@ -423,7 +424,9 @@ "SCons.Scanner", "SCons.Script", "SCons.Tool", + "SCons.Tool.clangCommon", "SCons.Tool.docbook", + 'SCons.Tool.clangCommon', "SCons.Tool.MSCommon", "SCons.Tool.packaging", "SCons.Variables", @@ -504,7 +507,7 @@ 'install_lib': install_lib, 'install_data': install_data, 'install_scripts': install_scripts, - 'build_scripts': build_scripts} + 'build_scripts': build_scripts}, } distutils.core.setup(**arguments) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/test/EnsureSConsVersion.py new/scons-3.0.3/test/EnsureSConsVersion.py --- old/scons-3.0.2/test/EnsureSConsVersion.py 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/test/EnsureSConsVersion.py 2019-01-08 04:26:58.000000000 +0100 @@ -50,7 +50,7 @@ test.write('SConstruct', """\ env = Environment() -env.EnsureSConsVersion(3,0) +env.EnsureSConsVersion(4,0) Exit(0) """) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scons-3.0.2/testing/framework/TestSCons.py new/scons-3.0.3/testing/framework/TestSCons.py --- old/scons-3.0.2/testing/framework/TestSCons.py 2019-01-01 20:21:03.000000000 +0100 +++ new/scons-3.0.3/testing/framework/TestSCons.py 2019-01-08 04:26:58.000000000 +0100 @@ -35,7 +35,7 @@ # 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) ++++++ scons-user.html-3.0.1.tar.bz2 -> scons-user.html-3.0.3.tar.bz2 ++++++ ++++ 21540 lines of diff (skipped)
