From a472691187c8589df1302478a03e9f6be08d5fdc Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 Sep 2017 08:31:20 -0700 Subject: Regenerated docs for 3.0.0 release. --- doc/generated/examples/caching_ex-random_1.xml | 4 +- doc/generated/examples/environments_ex3_1.xml | 12 +- doc/generated/examples/java_jar1_1.xml | 2 +- doc/generated/examples/sourcecode_bitkeeper_1.xml | 6 +- doc/generated/examples/sourcecode_cvs_1.xml | 6 +- doc/generated/examples/sourcecode_rcs_1.xml | 6 +- doc/generated/examples/sourcecode_sccs_1.xml | 6 +- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- .../examples/troubleshoot_stacktrace_2.xml | 2 +- doc/generated/tools.gen | 6 +- doc/generated/variables.gen | 176 +++++++++++++++++++++ doc/generated/variables.mod | 10 ++ 12 files changed, 212 insertions(+), 26 deletions(-) diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index 3798ec9..6f64f8f 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 f4.o -c f4.c cc -o f3.o -c f3.c cc -o f5.o -c f5.c cc -o f1.o -c f1.c -cc -o f2.o -c f2.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/environments_ex3_1.xml b/doc/generated/examples/environments_ex3_1.xml index 4de56be..5071c6e 100644 --- a/doc/generated/examples/environments_ex3_1.xml +++ b/doc/generated/examples/environments_ex3_1.xml @@ -1,21 +1,21 @@ % scons -Q -UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 249: invalid continuation byte: +UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 547: invalid continuation byte: File "/home/my/project/SConstruct", line 6: dbg.Program('foo', 'foo.c') File "bootstrap/src/engine/SCons/Environment.py", line 260: return MethodWrapper.__call__(self, target, source, *args, **kw) File "bootstrap/src/engine/SCons/Environment.py", line 224: return self.method(*nargs, **kwargs) - File "bootstrap/src/engine/SCons/Builder.py", line 634: + File "bootstrap/src/engine/SCons/Builder.py", line 635: return self._execute(env, target, source, OverrideWarner(kw), ekw) - File "bootstrap/src/engine/SCons/Builder.py", line 540: + File "bootstrap/src/engine/SCons/Builder.py", line 541: source = self.src_builder_sources(env, source, overwarn) - File "bootstrap/src/engine/SCons/Builder.py", line 747: + File "bootstrap/src/engine/SCons/Builder.py", line 748: tlist = bld._execute(env, None, [s], overwarn) - File "bootstrap/src/engine/SCons/Builder.py", line 556: + File "bootstrap/src/engine/SCons/Builder.py", line 557: _node_errors(self, env, tlist, slist) - File "bootstrap/src/engine/SCons/Builder.py", line 302: + File "bootstrap/src/engine/SCons/Builder.py", line 303: msg = "Two environments with different actions were specified for the same target: %s\n(action 1: %s)\n(action 2: %s)" % (t,t_contents.decode('utf-8'),contents.decode('utf-8')) File "/usr/lib/python2.7/encodings/utf_8.py", line 16: return codecs.utf_8_decode(input, errors, True) diff --git a/doc/generated/examples/java_jar1_1.xml b/doc/generated/examples/java_jar1_1.xml index de93227..daa3d1a 100644 --- a/doc/generated/examples/java_jar1_1.xml +++ b/doc/generated/examples/java_jar1_1.xml @@ -1,5 +1,5 @@ % scons -Q javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java -jar cf test.jar classes +scons: *** [test.jar] Source `classes.class' not found, needed by target `test.jar'. diff --git a/doc/generated/examples/sourcecode_bitkeeper_1.xml b/doc/generated/examples/sourcecode_bitkeeper_1.xml index a070ada..41af3a2 100644 --- a/doc/generated/examples/sourcecode_bitkeeper_1.xml +++ b/doc/generated/examples/sourcecode_bitkeeper_1.xml @@ -1,6 +1,6 @@ % scons -Q -bk get hello.c -cc -o hello.o -c hello.c -cc -o hello hello.o +AttributeError: 'SConsEnvironment' object has no attribute 'BitKeeper': + File "/home/my/project/SConstruct", line 2: + env.SourceCode('.', env.BitKeeper()) diff --git a/doc/generated/examples/sourcecode_cvs_1.xml b/doc/generated/examples/sourcecode_cvs_1.xml index 9ec7cd4..01ddb6b 100644 --- a/doc/generated/examples/sourcecode_cvs_1.xml +++ b/doc/generated/examples/sourcecode_cvs_1.xml @@ -1,6 +1,6 @@ % scons -Q -cvs -d /usr/local/CVS co hello.c -cc -o hello.o -c hello.c -cc -o hello hello.o +AttributeError: 'SConsEnvironment' object has no attribute 'CVS': + File "/home/my/project/SConstruct", line 2: + env.SourceCode('.', env.CVS('/usr/local/CVS')) diff --git a/doc/generated/examples/sourcecode_rcs_1.xml b/doc/generated/examples/sourcecode_rcs_1.xml index 5e120eb..e6b36dd 100644 --- a/doc/generated/examples/sourcecode_rcs_1.xml +++ b/doc/generated/examples/sourcecode_rcs_1.xml @@ -1,6 +1,6 @@ % scons -Q -co hello.c -cc -o hello.o -c hello.c -cc -o hello hello.o +AttributeError: 'SConsEnvironment' object has no attribute 'RCS': + File "/home/my/project/SConstruct", line 2: + env.SourceCode('.', env.RCS()) diff --git a/doc/generated/examples/sourcecode_sccs_1.xml b/doc/generated/examples/sourcecode_sccs_1.xml index 354b680..e0699d1 100644 --- a/doc/generated/examples/sourcecode_sccs_1.xml +++ b/doc/generated/examples/sourcecode_sccs_1.xml @@ -1,6 +1,6 @@ % scons -Q -sccs get hello.c -cc -o hello.o -c hello.c -cc -o hello hello.o +AttributeError: 'SConsEnvironment' object has no attribute 'SCCS': + File "/home/my/project/SConstruct", line 2: + env.SourceCode('.', env.SCCS()) diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index 36d9139..0ee52a9 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/devel/scons/scons/src/script/scons.py", line 201, in <module> +File "/home/bdbaddog/devel/scons/as_scons/src/script/scons.py", line 201, in <module> diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml index dc1292e..4b55f0d 100644 --- a/doc/generated/examples/troubleshoot_stacktrace_2.xml +++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml @@ -6,7 +6,7 @@ scons: internal stack trace: task.prepare() File "bootstrap/src/engine/SCons/Script/Main.py", line 175, in prepare return SCons.Taskmaster.OutOfDateTask.prepare(self) - File "bootstrap/src/engine/SCons/Taskmaster.py", line 195, in prepare + File "bootstrap/src/engine/SCons/Taskmaster.py", line 198, in prepare executor.prepare() File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0])) diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen index e3bc27f..f858aa4 100644 --- a/doc/generated/tools.gen +++ b/doc/generated/tools.gen @@ -150,7 +150,7 @@ for the platform on which SCons is running. Sets construction variables for D language compiler DMD. -Sets: &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;. +Sets: &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DRPATHPREFIX;, &cv-link-DRPATHSUFFIX;, &cv-link-DShLibSonameGenerator;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLIBVERSION;, &cv-link-SHDLIBVERSIONFLAGS;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;. docbook @@ -394,7 +394,7 @@ Set construction variables for the Sets construction variables for the D language compiler GDC. -Sets: &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;. +Sets: &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DRPATHPREFIX;, &cv-link-DRPATHSUFFIX;, &cv-link-DShLibSonameGenerator;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLIBVERSION;, &cv-link-SHDLIBVERSIONFLAGS;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;. gettext @@ -613,7 +613,7 @@ Sets construction variables for the Sets construction variables for the D language compiler LDC2. -Sets: &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-RPATHPREFIX;, &cv-link-RPATHSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;. +Sets: &cv-link-DC;, &cv-link-DCOM;, &cv-link-DDEBUG;, &cv-link-DDEBUGPREFIX;, &cv-link-DDEBUGSUFFIX;, &cv-link-DFILESUFFIX;, &cv-link-DFLAGPREFIX;, &cv-link-DFLAGS;, &cv-link-DFLAGSUFFIX;, &cv-link-DINCPREFIX;, &cv-link-DINCSUFFIX;, &cv-link-DLIB;, &cv-link-DLIBCOM;, &cv-link-DLIBDIRPREFIX;, &cv-link-DLIBDIRSUFFIX;, &cv-link-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &cv-link-DLIBLINKPREFIX;, &cv-link-DLIBLINKSUFFIX;, &cv-link-DLINK;, &cv-link-DLINKCOM;, &cv-link-DLINKFLAGPREFIX;, &cv-link-DLINKFLAGS;, &cv-link-DLINKFLAGSUFFIX;, &cv-link-DPATH;, &cv-link-DRPATHPREFIX;, &cv-link-DRPATHSUFFIX;, &cv-link-DShLibSonameGenerator;, &cv-link-DVERPREFIX;, &cv-link-DVERSIONS;, &cv-link-DVERSUFFIX;, &cv-link-SHDC;, &cv-link-SHDCOM;, &cv-link-SHDLIBVERSION;, &cv-link-SHDLIBVERSIONFLAGS;, &cv-link-SHDLINK;, &cv-link-SHDLINKCOM;, &cv-link-SHDLINKFLAGS;. lex diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index ab70d73..8a8dc99 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -837,6 +837,14 @@ The D compiler to use. DDEBUGPREFIX. + + + DDEBUGPREFIX. + + + + DDEBUGPREFIX. + @@ -845,6 +853,14 @@ The D compiler to use. DDEBUGSUFFIX. + + + DDEBUGSUFFIX. + + + + DDEBUGSUFFIX. + @@ -876,6 +892,14 @@ section of an RPM DFILESUFFIX. + + + DFILESUFFIX. + + + + DFILESUFFIX. + @@ -884,6 +908,14 @@ section of an RPM DFLAGPREFIX. + + + DFLAGPREFIX. + + + + DFLAGPREFIX. + @@ -908,6 +940,14 @@ section of an RPM DFLAGSUFFIX. + + + DFLAGSUFFIX. + + + + DFLAGSUFFIX. + @@ -916,6 +956,14 @@ section of an RPM DINCPREFIX. + + + DINCPREFIX. + + + + DINCPREFIX. + @@ -924,6 +972,14 @@ section of an RPM DLIBFLAGSUFFIX. + + + DLIBFLAGSUFFIX. + + + + DLIBFLAGSUFFIX. + @@ -987,6 +1043,14 @@ into a list of Dir instances relative to the target being built. DLIBLINKPREFIX. + + + DLIBLINKPREFIX. + + + + DLIBLINKPREFIX. + @@ -995,6 +1059,14 @@ into a list of Dir instances relative to the target being built. DLIBLINKSUFFIX. + + + DLIBLINKSUFFIX. + + + + DLIBLINKSUFFIX. + @@ -1003,6 +1075,14 @@ into a list of Dir instances relative to the target being built. DLIBFLAGPREFIX. + + + DLIBFLAGPREFIX. + + + + DLIBFLAGPREFIX. + @@ -1011,6 +1091,14 @@ into a list of Dir instances relative to the target being built. DLIBFLAGSUFFIX. + + + DLIBFLAGSUFFIX. + + + + DLIBFLAGSUFFIX. + @@ -1019,6 +1107,14 @@ into a list of Dir instances relative to the target being built. DLIBLINKPREFIX. + + + DLIBLINKPREFIX. + + + + DLIBLINKPREFIX. + @@ -1027,6 +1123,14 @@ into a list of Dir instances relative to the target being built. DLIBLINKSUFFIX. + + + DLIBLINKSUFFIX. + + + + DLIBLINKSUFFIX. + @@ -1067,6 +1171,14 @@ into a list of Dir instances relative to the target being built. DLINKFLAGPREFIX. + + + DLINKFLAGPREFIX. + + + + DLINKFLAGPREFIX. + @@ -1091,6 +1203,14 @@ List of linker flags. DLINKFLAGSUFFIX. + + + DLINKFLAGSUFFIX. + + + + DLINKFLAGSUFFIX. + @@ -1306,6 +1426,30 @@ for saxon and saxon-xslt, respectively. + + DRPATHPREFIX + + + DRPATHPREFIX. + + + + + DRPATHSUFFIX + + + DRPATHSUFFIX. + + + + + DShLibSonameGenerator + + + DShLibSonameGenerator. + + + DSUFFIXES @@ -1326,6 +1470,14 @@ The default list is: DVERPREFIX. + + + DVERPREFIX. + + + + DVERPREFIX. + @@ -1350,6 +1502,14 @@ The default list is: DVERSUFFIX. + + + DVERSUFFIX. + + + + DVERSUFFIX. + @@ -5840,6 +6000,22 @@ to generate shared-library objects. + + SHDLIBVERSION + + + SHDLIBVERSION. + + + + + SHDLIBVERSIONFLAGS + + + SHDLIBVERSIONFLAGS. + + + SHDLINK diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index 319ac66..6ecf6c9 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -107,6 +107,9 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DOCBOOK_XSLTPROCFLAGS"> $DOCBOOK_XSLTPROCPARAMS"> $DPATH"> +$DRPATHPREFIX"> +$DRPATHSUFFIX"> +$DShLibSonameGenerator"> $DSUFFIXES"> $DVERPREFIX"> $DVERSIONS"> @@ -445,6 +448,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $SHCXXFLAGS"> $SHDC"> $SHDCOM"> +$SHDLIBVERSION"> +$SHDLIBVERSIONFLAGS"> $SHDLINK"> $SHDLINKCOM"> $SHDLINKFLAGS"> @@ -731,6 +736,9 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DOCBOOK_XSLTPROCFLAGS"> $DOCBOOK_XSLTPROCPARAMS"> $DPATH"> +$DRPATHPREFIX"> +$DRPATHSUFFIX"> +$DShLibSonameGenerator"> $DSUFFIXES"> $DVERPREFIX"> $DVERSIONS"> @@ -1069,6 +1077,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $SHCXXFLAGS"> $SHDC"> $SHDCOM"> +$SHDLIBVERSION"> +$SHDLIBVERSIONFLAGS"> $SHDLINK"> $SHDLINKCOM"> $SHDLINKFLAGS"> -- cgit v0.12 From 57759bfeb03965586bd2b6fcf7438939207077f1 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 Sep 2017 08:38:46 -0700 Subject: Updates for 3.0.0 release --- QMTest/TestSCons.py | 2 +- README.rst | 44 ++++++++++++++++++++++---------------------- ReleaseConfig | 2 +- SConstruct | 4 ++-- debian/changelog | 4 ++-- src/Announce.txt | 2 +- src/CHANGES.txt | 12 ++++++------ src/RELEASE.txt | 2 +- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 61e5012..b5f2953 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/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.0.alpha.20170821' +default_version = '3.0.0' python_version_unsupported = (2, 6, 0) python_version_deprecated = (2, 7, 0) diff --git a/README.rst b/README.rst index faf8b10..258d6a1 100644 --- a/README.rst +++ b/README.rst @@ -168,7 +168,7 @@ Or on Windows:: By default, the above commands will do the following: -- Install the version-numbered "scons-2.5.0" and "sconsign-2.5.0" scripts in +- Install the version-numbered "scons-3.0.0" and "sconsign-3.0.0" 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. @@ -180,23 +180,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-2.5.0" and "sconsign-2.5.0" + hard links or symbolic links to the "scons-3.0.0" and "sconsign-3.0.0" scripts by specifying the "--hardlink-scons" or "--symlink-scons" options on the command line. -- Install "scons-2.5.0.bat" and "scons.bat" wrapper scripts in the Python +- Install "scons-3.0.0.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-2.5.0.bat" and "scons.bat" files installed in the default system + have "scons-3.0.0.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-2.5.0 or - C:\\Python\*\\scons-2.5.0, for example). See below for more options related to + version-numbered SCons library directory (/usr/lib/scons-3.0.0 or + C:\\Python\*\\scons-3.0.0, 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 @@ -474,7 +474,7 @@ running all of "runtest.py -a". Building Packages ================= -We use SCons (version 2.5.0 or later) to build its own packages. If you +We use SCons (version 3.0.0 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:: @@ -489,18 +489,18 @@ 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-2.5.0-1.noarch.rpm - build/dist/scons-2.5.0-1.src.rpm - build/dist/scons-2.5.0.linux-i686.tar.gz - build/dist/scons-3.0.0.alpha.20170821.tar.gz - build/dist/scons-3.0.0.alpha.20170821.win32.exe - build/dist/scons-3.0.0.alpha.20170821.zip - build/dist/scons-doc-3.0.0.alpha.20170821.tar.gz - build/dist/scons-local-3.0.0.alpha.20170821.tar.gz - build/dist/scons-local-3.0.0.alpha.20170821.zip - build/dist/scons-src-3.0.0.alpha.20170821.tar.gz - build/dist/scons-src-3.0.0.alpha.20170821.zip - build/dist/scons_3.0.0.alpha.20170614-1_all.deb + build/dist/scons-3.0.0-1.noarch.rpm + build/dist/scons-3.0.0-1.src.rpm + build/dist/scons-3.0.0.linux-i686.tar.gz + build/dist/scons-3.0.0.tar.gz + build/dist/scons-3.0.0.win32.exe + build/dist/scons-3.0.0.zip + build/dist/scons-doc-3.0.0.tar.gz + build/dist/scons-local-3.0.0.tar.gz + build/dist/scons-local-3.0.0.zip + build/dist/scons-src-3.0.0.tar.gz + build/dist/scons-src-3.0.0.zip + build/dist/scons_3.0.0-1_all.deb 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 @@ -664,7 +664,7 @@ section of small examples for getting started using SCons. Additional documentation for SCons is available at: - http://www.scons.org/documentation.php + http://www.scons.org/documentation Licensing @@ -724,7 +724,7 @@ If you find SCons helpful, please consider making a donation (of cash, software, or hardware) to support continued work on the project. Information is available at: - http://www.scons.org/donate.php + http://www.scons.org/donate.html For More Information @@ -760,5 +760,5 @@ many contributors, including but not at all limited to: \... and many others. -Copyright (c) 2001 - 2015 The SCons Foundation +Copyright (c) 2001 - 2017 The SCons Foundation diff --git a/ReleaseConfig b/ReleaseConfig index 331380a..c8473f1 100644 --- 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, 0, 'alpha', 0) +version_tuple = (3, 0, 0) # Python versions prior to unsupported_python_version cause a fatal error # when that version is used. Python versions prior to deprecate_python_version diff --git a/SConstruct b/SConstruct index 2e17382..b14fe45 100644 --- a/SConstruct +++ b/SConstruct @@ -8,7 +8,7 @@ from __future__ import print_function copyright_years = '2001 - 2017' # This gets inserted into the man pages to reflect the month of release. -month_year = 'MONTH YEAR' +month_year = 'September 2017' # # __COPYRIGHT__ @@ -46,7 +46,7 @@ import time import bootstrap project = 'scons' -default_version = '3.0.0.alpha.20170821' +default_version = '3.0.0' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() diff --git a/debian/changelog b/debian/changelog index 4e7470d..4f8dc79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -scons (__VERSION__) unstable; urgency=low +scons (3.0.0) unstable; urgency=low * Maintenance Release - -- __DEVELOPER__ __DATE__ + -- William Deegan Mon, 18 Sep 2017 08:32:04 -0700 scons (2.5.1) unstable; urgency=low diff --git a/src/Announce.txt b/src/Announce.txt index fb7d0ea..5c962c7 100644 --- 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.0.alpha.20170821 - Mon, 21 Aug 2017 16:15:02 -0700 +RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -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 2f04031..7788fdb 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -5,11 +5,11 @@ Change Log -RELEASE 3.0.0.alpha.20170821 - Mon, 21 Aug 2017 16:15:02 -0700 +RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700 NOTE: This is a major release. You should expect that some targets may rebuild when upgrading. -Significant changes in some python action signatures. Also switching between PY 2 and PY 3.5, 3.6 -may cause rebuilds. In no case should rebuilds not happen. +Significant changes in some python action signatures. Also switching between PY 2.7 and PY 3.5, 3.6 +will cause rebuilds. From William Blevins: @@ -79,6 +79,9 @@ may cause rebuilds. In no case should rebuilds not happen. "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" It can be downloaded separately at https://github.com/Microsoft/vswhere + + From Tom Tanner: + - Allow nested $( ... $) sections From Paweł Tomulik: - Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jenness @@ -115,9 +118,6 @@ may cause rebuilds. In no case should rebuilds not happen. tools, must now include the ar tool to get this builder as is required for other compiler tools. - Add clang and clang++ tools based on Paweł Tomulik's work. - - From Tom Tanner: - - Allow nested $( ... $) sections RELEASE 2.5.1 - Mon, 03 Nov 2016 13:37:42 -0400 diff --git a/src/RELEASE.txt b/src/RELEASE.txt index bbc1e42..ff0673a 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,4 +1,4 @@ - A new SCons checkpoint release, 3.0.0.alpha.20170821, is now available + A new SCons checkpoint release, 3.0.0, is now available on the SCons download page: http://www.scons.org/download.php -- cgit v0.12 From d30786ab0fba247c1ddd3b6fc4de86044561da99 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 Sep 2017 12:47:52 -0700 Subject: Add src/engine/SCons/Tool/docbook/utils/xmldepend.xsl to MANIFEST-xml.in --- SConstruct | 5 +++++ bootstrap.py | 12 +++++++++--- src/engine/MANIFEST-xml.in | 1 + src/engine/MANIFEST.in | 3 ++- 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index b14fe45..4ec3545 100644 --- a/SConstruct +++ b/SConstruct @@ -776,11 +776,16 @@ for p in [ scons ]: for sp in p['subpkgs']: ssubdir = sp['src_subdir'] isubdir = p['subinst_dirs'][sp['pkg']] + + MANIFEST_in = File(os.path.join(src, ssubdir, 'MANIFEST.in')).rstr() MANIFEST_in_list.append(MANIFEST_in) files = bootstrap.parseManifestLines(os.path.join(src, ssubdir), open(MANIFEST_in).readlines()) + raw_files.extend(files) src_files.extend([os.path.join(ssubdir, x) for x in files]) + + for f in files: r = os.path.join(sp['rpm_dir'], f) rpm_files.append(r) diff --git a/bootstrap.py b/bootstrap.py index 08df11d..086270c 100755 --- a/bootstrap.py +++ b/bootstrap.py @@ -184,9 +184,15 @@ 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')) - - files = [ scons_py ] + [os.path.join(src_engine, x) - for x in parseManifestLines(os.path.join(script_dir, src_engine), open(MANIFEST_in).readlines())] + 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 for file in files: src = find(file) diff --git a/src/engine/MANIFEST-xml.in b/src/engine/MANIFEST-xml.in index a657734..cfbfd3a 100644 --- a/src/engine/MANIFEST-xml.in +++ b/src/engine/MANIFEST-xml.in @@ -4,4 +4,5 @@ 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 --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index aecf35e..2df278e 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -74,10 +74,11 @@ SCons/Tool/docbook/__init__.py SCons/Tool/dvi.py SCons/Tool/dvipdf.py SCons/Tool/dvips.py +SCons/Tool/f03.py +SCons/Tool/f08.py SCons/Tool/f77.py SCons/Tool/f90.py SCons/Tool/f95.py -SCons/Tool/f03.py SCons/Tool/filesystem.py SCons/Tool/fortran.py SCons/Tool/FortranCommon.py -- cgit v0.12 -- cgit v0.12 From fff8e7b47258da38c3b13ae23e7fc3d3db70cf22 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 18 Sep 2017 16:47:29 -0400 Subject: 3.0.0 announcement updates --- src/Announce.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Announce.txt b/src/Announce.txt index 5c962c7..d9fb28e 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -25,7 +25,6 @@ RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700 since last release. This announcement highlights only the important changes. Please note the following important changes since release 2.5.1: - *IT IS NOT READY FOR PRODUCTION USE* This is the initial release supporting both python 3.5+ and 2.7.x and pypy There are some important changes: @@ -35,7 +34,7 @@ RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700 in Python 3 all strings are by default unicode. byte and/or bytearray should be used if you construct content for return by a custom node type's get_content() method. - - This is some (as yet unresolved issue) using Literal()'s in some context with + - There are some (as yet unresolved issue) using Literal()'s in some context with Python 3 - pypy should be supported, please report any issues to the user's mailing list. - Currently if you switch back and forth between python 2.7.x and 3.5+ you will -- cgit v0.12