From 06eb0b02185a061e8fb43fe7763a8cf3650ca088 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 14 Jun 2017 10:31:07 -0400 Subject: Fix doc breakage for D tools. Refer to Russel Windsor for full fix. Several cvars were referred to but deleted in [ 4157:a305db2fec15 Russel Winder 2017-04-21 10:55 First cut at proper documentation for the D tools. ] --- doc/generated/builders.gen | 85 ++++++++- doc/generated/builders.mod | 4 + doc/generated/tools.gen | 18 +- doc/generated/tools.mod | 4 +- doc/generated/variables.gen | 404 ++++++++++++++++++++++++++---------------- doc/generated/variables.mod | 16 +- src/engine/SCons/Tool/dmd.xml | 144 +++++++++++++++ 7 files changed, 490 insertions(+), 185 deletions(-) diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen index b19d82d..d851c93 100644 --- a/doc/generated/builders.gen +++ b/doc/generated/builders.gen @@ -934,22 +934,24 @@ compilation error messages displayed in the Visual Studio console output window. This can be remedied by adding the Visual C/C++ /FC compiler option to the $CCFLAGS variable so that the compiler will print the full path name of any files that cause compilation errors. - Example usage: barsrcs = ['bar.cpp'], -barincs = ['bar.h'], + Example usage: + +barsrcs = ['bar.cpp'] +barincs = ['bar.h'] barlocalincs = ['StdAfx.h'] barresources = ['bar.rc','resource.h'] barmisc = ['bar_readme.txt'] dll = env.SharedLibrary(target = 'bar.dll', source = barsrcs) - +buildtarget = [s for s in dll if str(s).endswith('dll')] env.MSVSProject(target = 'Bar' + env['MSVSPROJECTSUFFIX'], srcs = barsrcs, incs = barincs, localincs = barlocalincs, resources = barresources, misc = barmisc, - buildtarget = dll, + buildtarget = buildtarget, variant = 'Release') Starting with version 2.4 of @@ -1744,6 +1746,81 @@ env.Program(target = 'foo', source = ['foo.o', 'bar.c', 'baz.f']) + + + ProgramAllAtOnce() + + + env.ProgramAllAtOnce() + + + + Builds an executable from D sources without first creating individual + objects for each file. + + + D sources can be compiled file-by-file as C and C++ source are, and + D is integrated into the scons Object and Program builders for + this model of build. D codes can though do whole source + meta-programming (some of the testing frameworks do this). For this + it is imperative that all sources are compiled and linked in a single call of + the D compiler. This builder serves that purpose. + + + env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d']) + + + This command will compile the modules mod_a, mod_b, and mod_c in a + single compilation process without first creating object files for + the modules. Some of the D compilers will create executable.o others + will not. + + + + Builds an executable from D sources without first creating individual + objects for each file. + + + D sources can be compiled file-by-file as C and C++ source are, and + D is integrated into the scons Object and Program builders for + this model of build. D codes can though do whole source + meta-programming (some of the testing frameworks do this). For this + it is imperative that all sources are compiled and linked in a single call of + the D compiler. This builder serves that purpose. + + + env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d']) + + + This command will compile the modules mod_a, mod_b, and mod_c in a + single compilation process without first creating object files for + the modules. Some of the D compilers will create executable.o others + will not. + + + + Builds an executable from D sources without first creating individual + objects for each file. + + + D sources can be compiled file-by-file as C and C++ source are, and + D is integrated into the scons Object and Program builders for + this model of build. D codes can though do whole source + meta-programming (some of the testing frameworks do this). For this + it is imperative that all sources are compiled and linked in a single call of + the D compiler. This builder serves that purpose. + + + env.ProgramAllAtOnce('executable', ['mod_a.d, mod_b.d', 'mod_c.d']) + + + This command will compile the modules mod_a, mod_b, and mod_c in a + single compilation process without first creating object files for + the modules. Some of the D compilers will create executable.o others + will not. + + + RES() diff --git a/doc/generated/builders.mod b/doc/generated/builders.mod index 50591b4..ae60653 100644 --- a/doc/generated/builders.mod +++ b/doc/generated/builders.mod @@ -45,6 +45,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. POTUpdate"> POUpdate"> Program"> +ProgramAllAtOnce"> RES"> RMIC"> RPCGenClient"> @@ -100,6 +101,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. env.POTUpdate"> env.POUpdate"> env.Program"> +env.ProgramAllAtOnce"> env.RES"> env.RMIC"> env.RPCGenClient"> @@ -165,6 +167,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. POTUpdate"> POUpdate"> Program"> +ProgramAllAtOnce"> RES"> RMIC"> RPCGenClient"> @@ -220,6 +223,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. env.POTUpdate"> env.POUpdate"> env.Program"> +env.ProgramAllAtOnce"> env.RES"> env.RMIC"> env.RPCGenClient"> diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen index f31b3f3..d4b346d 100644 --- a/doc/generated/tools.gen +++ b/doc/generated/tools.gen @@ -134,7 +134,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-DLINKFLAGS;, &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;, &cv-link-_DDEBUGFLAGS;, &cv-link-_DFLAGS;, &cv-link-_DINCFLAGS;, &cv-link-_DLIBDIRFLAGS;, &cv-link-_DLIBFLAGS;, &cv-link-_DLIBFLAGS;, &cv-link-_DVERFLAGS;, &cv-link-_RPATH;. +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;. docbook @@ -378,7 +378,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-DLIBFLAGPREFIX;, &cv-link-DLIBFLAGSUFFIX;, &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;, &cv-link-_DDEBUGFLAGS;, &cv-link-_DFLAGS;, &cv-link-_DINCFLAGS;, &cv-link-_DLIBFLAGS;, &cv-link-_DVERFLAGS;, &cv-link-_RPATH;. +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;. gettext @@ -597,7 +597,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;, &cv-link-_DDEBUGFLAGS;, &cv-link-_DFLAGS;, &cv-link-_DINCFLAGS;, &cv-link-_DLIBDIRFLAGS;, &cv-link-_DLIBFLAGS;, &cv-link-_DLIBFLAGS;, &cv-link-_DVERFLAGS;, &cv-link-_RPATH;. +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;. lex @@ -762,19 +762,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 bf552c3..ee387ad 100644 --- a/doc/generated/tools.mod +++ b/doc/generated/tools.mod @@ -76,8 +76,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. mwcc"> mwld"> nasm"> -Packaging"> packaging"> +Packaging"> pdf"> pdflatex"> pdftex"> @@ -182,8 +182,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 d2bced9..e31fde1 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -781,7 +781,15 @@ depending on the specific C++ compiler being used. DC -DC. +The D compiler to use. + + + +The D compiler to use. + + + +The D compiler to use. @@ -789,7 +797,21 @@ DC. DCOM -DCOM. + The command line used to compile a D file to an object file. + Any options specified in the $DFLAGS construction variable + is included on this command line. + + + + The command line used to compile a D file to an object file. + Any options specified in the $DFLAGS construction variable + is included on this command line. + + + + The command line used to compile a D file to an object file. + Any options specified in the $DFLAGS construction variable + is included on this command line. @@ -797,33 +819,33 @@ DCOM. DDEBUG -DDEBUG. + List of debug tags to enable when compiling. - - - - _DDEBUGFLAGS - + -_DDEBUGFLAGS. + List of debug tags to enable when compiling. + + + + List of debug tags to enable when compiling. DDEBUGPREFIX - -DDEBUGPREFIX. - - + + DDEBUGPREFIX. + + DDEBUGSUFFIX - -DDEBUGSUFFIX. - - + + DDEBUGSUFFIX. + + DESCRIPTION @@ -851,66 +873,58 @@ section of an RPM DFILESUFFIX - -DFILESUFFIX. - - + + DFILESUFFIX. + + DFLAGPREFIX - -DFLAGPREFIX. - - - - - _DFLAGS - - -_DFLAGS. - - + + DFLAGPREFIX. + + DFLAGS -DFLAGS. + General options that are passed to the D compiler. - - - - DFLAGSUFFIX - + -DFLAGSUFFIX. + General options that are passed to the D compiler. - - - - _DINCFLAGS - + -_DINCFLAGS. + General options that are passed to the D compiler. + + DFLAGSUFFIX + + + DFLAGSUFFIX. + + + DINCPREFIX - -DINCPREFIX. - - + + DINCPREFIX. + + DINCSUFFIX - -DINCSUFFIX. - - + + DLIBFLAGSUFFIX. + + Dir @@ -939,7 +953,15 @@ into a list of Dir instances relative to the target being built. DLIB -DLIB. + Name of the lib tool to use for D codes. + + + + Name of the lib tool to use for D codes. + + + + Name of the lib tool to use for D codes. @@ -947,79 +969,79 @@ DLIB. DLIBCOM -DLIBCOM. + The command line to use when creating libraries. - - - - _DLIBDIRFLAGS - + + + The command line to use when creating libraries. + + -_DLIBDIRFLAGS. + The command line to use when creating libraries. DLIBDIRPREFIX - -DLIBDIRPREFIX. - - + + DLIBLINKPREFIX. + + DLIBDIRSUFFIX - -DLIBDIRSUFFIX. - - + + DLIBLINKSUFFIX. + + DLIBFLAGPREFIX - -DLIBFLAGPREFIX. - - - - - _DLIBFLAGS - - -_DLIBFLAGS. - - + + DLIBFLAGPREFIX. + + DLIBFLAGSUFFIX - -DLIBFLAGSUFFIX. - - + + DLIBFLAGSUFFIX. + + DLIBLINKPREFIX - -DLIBLINKPREFIX. - - + + DLIBLINKPREFIX. + + DLIBLINKSUFFIX - -DLIBLINKSUFFIX. - - + + DLIBLINKSUFFIX. + + DLINK -DLINK. + Name of the linker to use for linking systems including D sources. + + + + Name of the linker to use for linking systems including D sources. + + + + Name of the linker to use for linking systems including D sources. @@ -1027,33 +1049,49 @@ DLINK. DLINKCOM -DLINKCOM. + The command line to use when linking systems including D sources. + + + + The command line to use when linking systems including D sources. + + + + The command line to use when linking systems including D sources. DLINKFLAGPREFIX - -DLINKFLAGPREFIX. - - + + DLINKFLAGPREFIX. + + DLINKFLAGS -DLINKFLAGS. +List of linker flags. + + + +List of linker flags. + + + +List of linker flags. DLINKFLAGSUFFIX - -DLINKFLAGSUFFIX. - - + + DLINKFLAGSUFFIX. + + DOCBOOK_DEFAULT_XSL_EPUB @@ -1256,7 +1294,15 @@ for saxon and saxon-xslt, respectively. DPATH -DPATH. + List of paths to search for import modules. + + + + List of paths to search for import modules. + + + + List of paths to search for import modules. @@ -1274,37 +1320,37 @@ The default list is: - - _DVERFLAGS - - -_DVERFLAGS. - - - DVERPREFIX - -DVERPREFIX. - - + + DVERPREFIX. + + DVERSIONS -DVERSIONS. + List of version tags to enable when compiling. + + + + List of version tags to enable when compiling. + + + + List of version tags to enable when compiling. DVERSUFFIX - -DVERSUFFIX. - - + + DVERSUFFIX. + + DVIPDF @@ -2734,6 +2780,15 @@ is -dNOPAUSE -dBATCH -sDEVICE=pdfwrite HOST_ARCH + The name of the host hardware architecture used to create the Environment. + If a platform is specified when creating the Environment, then + that Platform's logic will handle setting this value. + This value is immutable, and should not be changed by the user after + the Environment is initialized. + Currently only set for Win32. + + + Sets the host architecture for Visual Studio compiler. If not set, default to the detected host architecture: note that this may depend on the python you are using. @@ -2749,16 +2804,7 @@ Valid values are the same as for This is currently only used on Windows, but in the future it will be used on other OSes as well. - - - The name of the host hardware architecture used to create the Environment. - If a platform is specified when creating the Environment, then - that Platform's logic will handle setting this value. - This value is immutable, and should not be changed by the user after - the Environment is initialized. - Currently only set for Win32. - - + HOST_OS @@ -5738,7 +5784,18 @@ to generate shared-library objects. SHDC -SHDC. + The name of the compiler to use when compiling D source + destined to be in a shared objects. + + + + The name of the compiler to use when compiling D source + destined to be in a shared objects. + + + + The name of the compiler to use when compiling D source + destined to be in a shared objects. @@ -5746,7 +5803,15 @@ SHDC. SHDCOM -SHDCOM. + The command line to use when compiling code to be part of shared objects. + + + + The command line to use when compiling code to be part of shared objects. + + + + The command line to use when compiling code to be part of shared objects. @@ -5754,7 +5819,18 @@ SHDCOM. SHDLINK -SHDLINK. + The linker to use when creating shared objects for code bases + include D sources. + + + + The linker to use when creating shared objects for code bases + include D sources. + + + + The linker to use when creating shared objects for code bases + include D sources. @@ -5762,7 +5838,15 @@ SHDLINK. SHDLINKCOM -SHDLINKCOM. + The command line to use when generating shared objects. + + + + The command line to use when generating shared objects. + + + + The command line to use when generating shared objects. @@ -5770,7 +5854,15 @@ SHDLINKCOM. SHDLINKFLAGS -SHDLINKFLAGS. + The list of flags to use when generating a shared object. + + + + The list of flags to use when generating a shared object. + + + + The list of flags to use when generating a shared object. @@ -6317,16 +6409,6 @@ Example - - SHLIBVERSIONFLAGS - - -Extra flags added to $SHLINKCOM when building versioned -SharedLibrary. These flags are only used when $SHLIBVERSION is -set. - - - _SHLIBVERSIONFLAGS @@ -6340,6 +6422,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 @@ -6802,6 +6894,13 @@ that may not be set or used in a construction environment. TARGET_ARCH + The name of the target hardware architecture for the compiled objects + created by this Environment. + This defaults to the value of HOST_ARCH, and the user can override it. + Currently only set for Win32. + + + Sets the target architecture for Visual Studio compiler (i.e. the arch of the binaries generated by the compiler). If not set, default to $HOST_ARCH, or, if that is unset, to the architecture of the @@ -6826,14 +6925,7 @@ and ia64 (Itanium). For example, if you want to compile 64-bit binaries, you would set TARGET_ARCH='x86_64' in your SCons environment. - - - The name of the target hardware architecture for the compiled objects - created by this Environment. - This defaults to the value of HOST_ARCH, and the user can override it. - Currently only set for Win32. - - + TARGET_OS diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index d176319..9d834de 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -60,28 +60,23 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DC"> $DCOM"> $DDEBUG"> -$_DDEBUGFLAGS"> $DDEBUGPREFIX"> $DDEBUGSUFFIX"> $DESCRIPTION"> $DESCRIPTION_lang"> $DFILESUFFIX"> $DFLAGPREFIX"> -$_DFLAGS"> $DFLAGS"> $DFLAGSUFFIX"> -$_DINCFLAGS"> $DINCPREFIX"> $DINCSUFFIX"> $Dir"> $Dirs"> $DLIB"> $DLIBCOM"> -$_DLIBDIRFLAGS"> $DLIBDIRPREFIX"> $DLIBDIRSUFFIX"> $DLIBFLAGPREFIX"> -$_DLIBFLAGS"> $DLIBFLAGSUFFIX"> $DLIBLINKPREFIX"> $DLIBLINKSUFFIX"> @@ -113,7 +108,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DOCBOOK_XSLTPROCPARAMS"> $DPATH"> $DSUFFIXES"> -$_DVERFLAGS"> $DVERPREFIX"> $DVERSIONS"> $DVERSUFFIX"> @@ -496,8 +490,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $_SHLIBSONAME"> $SHLIBSUFFIX"> $SHLIBVERSION"> -$SHLIBVERSIONFLAGS"> $_SHLIBVERSIONFLAGS"> +$SHLIBVERSIONFLAGS"> $SHLINK"> $SHLINKCOM"> $SHLINKCOMSTR"> @@ -689,28 +683,23 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DC"> $DCOM"> $DDEBUG"> -$_DDEBUGFLAGS"> $DDEBUGPREFIX"> $DDEBUGSUFFIX"> $DESCRIPTION"> $DESCRIPTION_lang"> $DFILESUFFIX"> $DFLAGPREFIX"> -$_DFLAGS"> $DFLAGS"> $DFLAGSUFFIX"> -$_DINCFLAGS"> $DINCPREFIX"> $DINCSUFFIX"> $Dir"> $Dirs"> $DLIB"> $DLIBCOM"> -$_DLIBDIRFLAGS"> $DLIBDIRPREFIX"> $DLIBDIRSUFFIX"> $DLIBFLAGPREFIX"> -$_DLIBFLAGS"> $DLIBFLAGSUFFIX"> $DLIBLINKPREFIX"> $DLIBLINKSUFFIX"> @@ -742,7 +731,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DOCBOOK_XSLTPROCPARAMS"> $DPATH"> $DSUFFIXES"> -$_DVERFLAGS"> $DVERPREFIX"> $DVERSIONS"> $DVERSUFFIX"> @@ -1125,8 +1113,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $_SHLIBSONAME"> $SHLIBSUFFIX"> $SHLIBVERSION"> -$SHLIBVERSIONFLAGS"> $_SHLIBVERSIONFLAGS"> +$SHLIBVERSIONFLAGS"> $SHLINK"> $SHLINKCOM"> $SHLINKCOMSTR"> diff --git a/src/engine/SCons/Tool/dmd.xml b/src/engine/SCons/Tool/dmd.xml index dbbe9eb..8fb22ce 100644 --- a/src/engine/SCons/Tool/dmd.xml +++ b/src/engine/SCons/Tool/dmd.xml @@ -160,6 +160,8 @@ List of linker flags. + + @@ -202,6 +204,148 @@ List of linker flags. + + + + + DVERSUFFIX. + + + + + + + + DVERPREFIX. + + + + + + + + DLINKFLAGSUFFIX. + + + + + + + + DLINKFLAGPREFIX. + + + + + + + + DLIBLINKSUFFIX. + + + + + + + + DLIBLINKPREFIX. + + + + + + + + DLIBFLAGSUFFIX. + + + + + + + + DLIBFLAGPREFIX. + + + + + + + + DLIBLINKSUFFIX. + + + + + + + + DLIBLINKPREFIX. + + + + + + + + DLIBFLAGSUFFIX. + + + + + + + + + DINCPREFIX. + + + + + + + + DFLAGSUFFIX. + + + + + + + + DFLAGPREFIX. + + + + + + + + DFILESUFFIX. + + + + + + + + DDEBUGPREFIX. + + + + + + + + DDEBUGSUFFIX. + + + + + + + + -- cgit v0.12 From eb7c5bbec6d86cbab0a95e95a93c78bf54a37232 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 14 Jun 2017 10:41:03 -0400 Subject: updates to example outputs --- doc/generated/examples/EnumVariable_map_1.xml | 2 +- doc/generated/examples/addmethod_ex1_1.xml | 2 +- doc/generated/examples/addmethod_ex2_1.xml | 2 +- doc/generated/examples/addmethod_ex2_2.xml | 2 +- doc/generated/examples/alias_ex1_1.xml | 2 +- doc/generated/examples/alias_ex2_1.xml | 8 ++++---- doc/generated/examples/buildersbuiltin_ex1_1.xml | 2 +- doc/generated/examples/buildersbuiltin_ex2_1.xml | 2 +- doc/generated/examples/buildersbuiltin_ex3_1.xml | 2 +- doc/generated/examples/buildersbuiltin_ex4_1.xml | 2 +- doc/generated/examples/buildersbuiltin_libs_1.xml | 2 +- doc/generated/examples/buildersbuiltin_libs_2.xml | 2 +- doc/generated/examples/builderscommands_ex1_1.xml | 2 +- doc/generated/examples/builderscommands_ex2_1.xml | 2 +- doc/generated/examples/builderswriting_MY_EMITTER_1.xml | 2 +- doc/generated/examples/builderswriting_ex1_1.xml | 2 +- doc/generated/examples/builderswriting_ex2_1.xml | 1 + doc/generated/examples/builderswriting_ex3_1.xml | 2 +- doc/generated/examples/builderswriting_ex4_1.xml | 2 +- doc/generated/examples/builderswriting_ex5_1.xml | 2 +- doc/generated/examples/builderswriting_ex6_1.xml | 2 +- doc/generated/examples/builderswriting_ex7_1.xml | 2 +- doc/generated/examples/caching_ex-random_1.xml | 4 ++-- doc/generated/examples/caching_ex1_1.xml | 6 +++--- doc/generated/examples/caching_ex1_2.xml | 6 +++--- doc/generated/examples/caching_ex1_4.xml | 10 +++++----- doc/generated/examples/caching_ex1_5.xml | 10 +++++----- doc/generated/examples/commandline_ARGLIST_1.xml | 4 ++-- doc/generated/examples/commandline_ARGUMENTS_1.xml | 8 ++++---- doc/generated/examples/commandline_AddOption_1.xml | 2 +- doc/generated/examples/commandline_AddOption_2.xml | 2 +- doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml | 6 +++--- doc/generated/examples/commandline_BoolVariable_1.xml | 2 +- doc/generated/examples/commandline_BoolVariable_2.xml | 2 +- doc/generated/examples/commandline_BoolVariable_3.xml | 2 +- doc/generated/examples/commandline_BoolVariable_4.xml | 2 +- doc/generated/examples/commandline_BoolVariable_5.xml | 1 + doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml | 4 ++-- doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml | 2 +- doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml | 2 +- doc/generated/examples/commandline_Default1_1.xml | 6 +++--- doc/generated/examples/commandline_Default1_2.xml | 2 +- doc/generated/examples/commandline_Default2_1.xml | 4 ++-- doc/generated/examples/commandline_Default3_1.xml | 6 +++--- doc/generated/examples/commandline_Default4_1.xml | 4 ++-- doc/generated/examples/commandline_EnumVariable_1.xml | 6 +++--- doc/generated/examples/commandline_EnumVariable_2.xml | 1 + doc/generated/examples/commandline_EnumVariable_3.xml | 3 +++ doc/generated/examples/commandline_EnumVariable_ic1_1.xml | 8 ++++---- doc/generated/examples/commandline_EnumVariable_ic2_1.xml | 6 +++--- doc/generated/examples/commandline_ListVariable_1.xml | 4 ++-- doc/generated/examples/commandline_ListVariable_2.xml | 4 ++-- doc/generated/examples/commandline_ListVariable_3.xml | 1 + doc/generated/examples/commandline_PackageVariable_1.xml | 8 ++++---- doc/generated/examples/commandline_PathVariable_1.xml | 4 ++-- doc/generated/examples/commandline_PathVariable_2.xml | 1 + doc/generated/examples/commandline_SCONSFLAGS_1.xml | 4 ++-- doc/generated/examples/commandline_SetOption_1.xml | 2 +- doc/generated/examples/commandline_SetOption_2.xml | 2 +- doc/generated/examples/commandline_SetOption_3.xml | 4 ++-- doc/generated/examples/commandline_UnknownVariables_1.xml | 2 +- doc/generated/examples/commandline_Variables1_1.xml | 2 +- doc/generated/examples/commandline_Variables_Help_1.xml | 2 +- doc/generated/examples/commandline_Variables_custom_py_1_1.xml | 2 +- doc/generated/examples/commandline_Variables_custom_py_2_1.xml | 2 +- doc/generated/examples/depends_AlwaysBuild_1.xml | 4 ++-- doc/generated/examples/depends_AlwaysBuild_2.xml | 4 ++-- doc/generated/examples/depends_Requires_1.xml | 8 ++++---- doc/generated/examples/depends_ex1_1.xml | 4 ++-- doc/generated/examples/depends_ex1_2.xml | 4 ++-- doc/generated/examples/depends_ex1_3.xml | 4 ++-- doc/generated/examples/depends_ex1_4.xml | 4 ++-- doc/generated/examples/depends_ex1_5.xml | 4 ++-- doc/generated/examples/depends_ex1_6.xml | 4 ++-- doc/generated/examples/depends_ex1_7.xml | 4 ++-- doc/generated/examples/depends_ex1_8.xml | 4 ++-- doc/generated/examples/depends_ex5_1.xml | 2 +- doc/generated/examples/depends_ex5_2.xml | 2 +- doc/generated/examples/depends_ignore_explicit_1.xml | 6 +++--- doc/generated/examples/depends_include_1.xml | 6 +++--- doc/generated/examples/depends_macroinc_1.xml | 4 ++-- doc/generated/examples/depends_match_1.xml | 4 ++-- doc/generated/examples/depends_mixing_1.xml | 4 ++-- doc/generated/examples/depends_newer_1.xml | 4 ++-- doc/generated/examples/depends_no-Requires_1.xml | 6 +++--- doc/generated/examples/depends_parsedep_1.xml | 4 ++-- doc/generated/examples/environments_Append-nonexistent_1.xml | 2 +- doc/generated/examples/environments_Prepend-nonexistent_1.xml | 2 +- doc/generated/examples/environments_Replace-nonexistent_1.xml | 2 +- doc/generated/examples/environments_Replace1_1.xml | 2 +- doc/generated/examples/environments_Replace2_1.xml | 2 +- doc/generated/examples/environments_ex1_1.xml | 2 +- doc/generated/examples/environments_ex2_1.xml | 2 +- doc/generated/examples/environments_ex3_1.xml | 7 ++++--- doc/generated/examples/environments_ex4_1.xml | 2 +- doc/generated/examples/environments_ex5_1.xml | 2 +- doc/generated/examples/environments_ex6_1.xml | 2 +- doc/generated/examples/environments_ex6b_1.xml | 2 +- doc/generated/examples/environments_ex6b_2.xml | 2 +- doc/generated/examples/environments_ex8_1.xml | 2 +- doc/generated/examples/environments_ex9_1.xml | 2 +- doc/generated/examples/environments_missing1_1.xml | 2 +- doc/generated/examples/environments_missing2_1.xml | 1 + doc/generated/examples/environments_missing3_1.xml | 2 +- doc/generated/examples/factories_Chmod_1.xml | 2 +- doc/generated/examples/factories_Copy1_1.xml | 2 +- doc/generated/examples/factories_Copy2_1.xml | 2 +- doc/generated/examples/factories_Copy3_1.xml | 2 +- doc/generated/examples/factories_Delete1_1.xml | 2 +- doc/generated/examples/factories_Delete2_1.xml | 2 +- doc/generated/examples/factories_Execute_1.xml | 2 +- doc/generated/examples/factories_Mkdir_1.xml | 2 +- doc/generated/examples/factories_Move_1.xml | 2 +- doc/generated/examples/factories_Touch_1.xml | 2 +- doc/generated/examples/fileremoval_clean-ex1_1.xml | 4 ++-- doc/generated/examples/fileremoval_noclean-ex1_1.xml | 4 ++-- doc/generated/examples/fileremoval_precious-ex1_1.xml | 2 +- doc/generated/examples/hierarchy_Return_1.xml | 2 +- doc/generated/examples/hierarchy_ex1_1.xml | 2 +- doc/generated/examples/hierarchy_ex2_1.xml | 2 +- doc/generated/examples/hierarchy_ex3_1.xml | 2 +- doc/generated/examples/install_ex1_1.xml | 4 ++-- doc/generated/examples/install_ex2_1.xml | 4 ++-- doc/generated/examples/install_ex3_1.xml | 2 +- doc/generated/examples/install_ex4_1.xml | 2 +- doc/generated/examples/install_ex5_1.xml | 2 +- doc/generated/examples/java_JAVACLASSDIR_1.xml | 2 +- doc/generated/examples/java_RMIC_1.xml | 2 +- doc/generated/examples/java_jar1_1.xml | 2 +- doc/generated/examples/java_jar2_1.xml | 2 +- doc/generated/examples/java_java-classes_1.xml | 4 ++-- doc/generated/examples/java_java-classes_2.xml | 4 ++-- doc/generated/examples/java_java_1.xml | 2 +- doc/generated/examples/java_javah_1.xml | 2 +- doc/generated/examples/java_javah_file_1.xml | 2 +- doc/generated/examples/lesssimple_ex2_1.xml | 2 +- doc/generated/examples/lesssimple_ex3_1.xml | 2 +- doc/generated/examples/lesssimple_ex3_2.xml | 2 +- doc/generated/examples/lesssimple_ex4_1.xml | 2 +- doc/generated/examples/lesssimple_ex5_1.xml | 2 +- doc/generated/examples/lesssimple_target_1.xml | 2 +- doc/generated/examples/lesssimple_target_2.xml | 2 +- doc/generated/examples/libraries_SharedLibrary_1.xml | 2 +- doc/generated/examples/libraries_SharedLibrary_2.xml | 2 +- doc/generated/examples/libraries_ex1_1.xml | 2 +- doc/generated/examples/libraries_ex1_2.xml | 2 +- doc/generated/examples/libraries_ex2_1.xml | 2 +- doc/generated/examples/libraries_ex2_2.xml | 2 +- doc/generated/examples/libraries_ex3_1.xml | 2 +- doc/generated/examples/libraries_ex3_2.xml | 2 +- doc/generated/examples/libraries_objects_1.xml | 2 +- doc/generated/examples/mergeflags_MergeFlags1_1.xml | 2 ++ doc/generated/examples/mergeflags_MergeFlags2_1.xml | 2 ++ doc/generated/examples/mergeflags_MergeFlags3_1.xml | 2 ++ doc/generated/examples/misc_Exit_1.xml | 4 ++-- doc/generated/examples/misc_FindFile1a_1.xml | 2 +- doc/generated/examples/misc_FindFile1b_1.xml | 2 +- doc/generated/examples/misc_FindFile1d_1.xml | 2 +- doc/generated/examples/misc_FindFile2_1.xml | 2 +- doc/generated/examples/misc_FindFile2_2.xml | 2 +- doc/generated/examples/misc_FindFile3_1.xml | 2 +- doc/generated/examples/misc_Flatten1_1.xml | 2 +- doc/generated/examples/misc_Flatten2_1.xml | 1 + doc/generated/examples/nodes_GetBuildPath_1.xml | 2 +- doc/generated/examples/nodes_ex1_1.xml | 2 +- doc/generated/examples/nodes_ex1_2.xml | 2 +- doc/generated/examples/nodes_exists_1.xml | 2 +- doc/generated/examples/nodes_print_1.xml | 2 +- doc/generated/examples/nodes_print_2.xml | 2 +- doc/generated/examples/output_Progress-TARGET_1.xml | 2 +- doc/generated/examples/output_ex1_1.xml | 2 +- doc/generated/examples/output_ex2_1.xml | 2 +- doc/generated/examples/output_ex2_2.xml | 2 +- doc/generated/examples/output_gbf2_1.xml | 4 ++-- doc/generated/examples/parseflags_ex1_1.xml | 2 ++ doc/generated/examples/parseflags_ex1_2.xml | 2 ++ doc/generated/examples/parseflags_ex2_1.xml | 2 ++ doc/generated/examples/parseflags_ex3_1.xml | 2 ++ doc/generated/examples/parseflags_ex4_1.xml | 2 ++ doc/generated/examples/repositories_CPPPATH3_1.xml | 2 +- doc/generated/examples/repositories_CPPPATH_1.xml | 2 +- doc/generated/examples/repositories_ex1_1.xml | 2 +- doc/generated/examples/repositories_ex2_1.xml | 2 +- doc/generated/examples/repositories_ex3_1.xml | 2 +- doc/generated/examples/repositories_ex4_1.xml | 2 +- doc/generated/examples/repositories_quote1_1.xml | 2 +- doc/generated/examples/separate_builddir_1.xml | 2 +- doc/generated/examples/separate_builddir_sconscript_1.xml | 2 +- doc/generated/examples/separate_duplicate0_1.xml | 2 +- doc/generated/examples/separate_ex1_1.xml | 2 +- doc/generated/examples/separate_glob_builddir_sconscript_1.xml | 2 +- doc/generated/examples/sideeffect_parallel_1.xml | 2 +- doc/generated/examples/sideeffect_shared_1.xml | 2 +- doc/generated/examples/sideeffect_simple_1.xml | 2 ++ doc/generated/examples/simple_Object_1.xml | 2 +- doc/generated/examples/simple_Object_2.xml | 2 +- doc/generated/examples/simple_clean_1.xml | 4 ++-- doc/generated/examples/simple_clean_2.xml | 4 ++-- doc/generated/examples/simple_declarative_1.xml | 2 +- doc/generated/examples/simple_ex1_1.xml | 2 +- doc/generated/examples/simple_ex1_2.xml | 2 +- doc/generated/examples/simple_ex1_3.xml | 2 +- doc/generated/examples/simple_ex1_4.xml | 2 +- doc/generated/examples/simple_java_1.xml | 2 +- doc/generated/examples/sourcecode_bitkeeper_1.xml | 2 +- doc/generated/examples/sourcecode_cvs_1.xml | 2 +- doc/generated/examples/sourcecode_rcs_1.xml | 2 +- doc/generated/examples/sourcecode_sccs_1.xml | 2 +- doc/generated/examples/tasks_ex1_1.xml | 2 +- doc/generated/examples/troubleshoot_Dump_1.xml | 2 +- doc/generated/examples/troubleshoot_Dump_2.xml | 2 +- doc/generated/examples/troubleshoot_Dump_ENV_1.xml | 2 +- doc/generated/examples/troubleshoot_Dump_ENV_2.xml | 2 +- doc/generated/examples/troubleshoot_explain1_1.xml | 6 +++--- doc/generated/examples/troubleshoot_explain1_2.xml | 2 +- doc/generated/examples/troubleshoot_explain1_3.xml | 4 ++-- doc/generated/examples/troubleshoot_explain2_1.xml | 4 ++-- doc/generated/examples/troubleshoot_explain3_1.xml | 4 ++-- doc/generated/examples/troubleshoot_findlibs_1.xml | 2 +- doc/generated/examples/troubleshoot_stacktrace_1.xml | 1 + doc/generated/examples/troubleshoot_stacktrace_2.xml | 3 ++- doc/generated/examples/troubleshoot_taskmastertrace_1.xml | 2 +- doc/generated/examples/troubleshoot_tree1_1.xml | 2 +- doc/generated/examples/troubleshoot_tree1_2.xml | 2 +- doc/generated/examples/troubleshoot_tree1_3.xml | 2 +- doc/generated/examples/troubleshoot_tree1_4.xml | 2 +- doc/generated/examples/troubleshoot_tree1_5.xml | 2 +- doc/generated/examples/troubleshoot_tree1_6.xml | 2 +- doc/generated/examples/troubleshoot_tree2_1.xml | 2 +- doc/generated/examples/troubleshoot_tree2_2.xml | 2 +- doc/generated/examples/variants_ex_1.xml | 2 +- doc/generated/examples/variants_ex_2.xml | 2 +- 232 files changed, 330 insertions(+), 299 deletions(-) diff --git a/doc/generated/examples/EnumVariable_map_1.xml b/doc/generated/examples/EnumVariable_map_1.xml index 4380be0..657b142 100644 --- a/doc/generated/examples/EnumVariable_map_1.xml +++ b/doc/generated/examples/EnumVariable_map_1.xml @@ -1,4 +1,4 @@ % scons -Q COLOR=navy foo.o -cc -o foo.o -c -DCOLOR="blue" foo.c +[?1034hcc -o foo.o -c -DCOLOR="blue" foo.c diff --git a/doc/generated/examples/addmethod_ex1_1.xml b/doc/generated/examples/addmethod_ex1_1.xml index 84dfd20..febdb62 100644 --- a/doc/generated/examples/addmethod_ex1_1.xml +++ b/doc/generated/examples/addmethod_ex1_1.xml @@ -1,6 +1,6 @@ % scons -Q / -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o Install file: "hello" as "/usr/bin/hello" Install file: "hello" as "install/bin/hello" diff --git a/doc/generated/examples/addmethod_ex2_1.xml b/doc/generated/examples/addmethod_ex2_1.xml index 3930341..2485697 100644 --- a/doc/generated/examples/addmethod_ex2_1.xml +++ b/doc/generated/examples/addmethod_ex2_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o test_stuff.o -c test_stuff.c +[?1034hcc -o test_stuff.o -c test_stuff.c cc -o tests/test_stuff test_stuff.o diff --git a/doc/generated/examples/addmethod_ex2_2.xml b/doc/generated/examples/addmethod_ex2_2.xml index 15ae6e0..d2c8984 100644 --- a/doc/generated/examples/addmethod_ex2_2.xml +++ b/doc/generated/examples/addmethod_ex2_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -rc /fores.res res.rc +[?1034hrc /fores.res res.rc cl /Fotest_stuff.obj /c test_stuff.c /nologo link /nologo /OUT:tests\test_stuff.exe test_stuff.obj res.res embedManifestExeCheck(target, source, env) diff --git a/doc/generated/examples/alias_ex1_1.xml b/doc/generated/examples/alias_ex1_1.xml index 3ee3f1b..78215b2 100644 --- a/doc/generated/examples/alias_ex1_1.xml +++ b/doc/generated/examples/alias_ex1_1.xml @@ -1,6 +1,6 @@ % scons -Q install -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o Install file: "hello" as "/usr/bin/hello" diff --git a/doc/generated/examples/alias_ex2_1.xml b/doc/generated/examples/alias_ex2_1.xml index 3fa7dfd..ac31b8a 100644 --- a/doc/generated/examples/alias_ex2_1.xml +++ b/doc/generated/examples/alias_ex2_1.xml @@ -1,22 +1,22 @@ % scons -Q install-bin -cc -o foo.o -c foo.c +[?1034hcc -o foo.o -c foo.c cc -o foo foo.o Install file: "foo" as "/usr/bin/foo" % scons -Q install-lib -cc -o bar.o -c bar.c +[?1034hcc -o bar.o -c bar.c ar rc libbar.a bar.o ranlib libbar.a Install file: "libbar.a" as "/usr/lib/libbar.a" % scons -Q -c / -Removed foo.o +[?1034hRemoved foo.o Removed foo Removed /usr/bin/foo Removed bar.o Removed libbar.a Removed /usr/lib/libbar.a % scons -Q install -cc -o foo.o -c foo.c +[?1034hcc -o foo.o -c foo.c cc -o foo foo.o Install file: "foo" as "/usr/bin/foo" cc -o bar.o -c bar.c diff --git a/doc/generated/examples/buildersbuiltin_ex1_1.xml b/doc/generated/examples/buildersbuiltin_ex1_1.xml index 74cc779..a875fba 100644 --- a/doc/generated/examples/buildersbuiltin_ex1_1.xml +++ b/doc/generated/examples/buildersbuiltin_ex1_1.xml @@ -1,5 +1,5 @@ % scons -Q . -tar -c -f out1.tar file1 file2 +[?1034htar -c -f out1.tar file1 file2 tar -c -f out2.tar directory diff --git a/doc/generated/examples/buildersbuiltin_ex2_1.xml b/doc/generated/examples/buildersbuiltin_ex2_1.xml index 6c66d7b..a019372 100644 --- a/doc/generated/examples/buildersbuiltin_ex2_1.xml +++ b/doc/generated/examples/buildersbuiltin_ex2_1.xml @@ -1,4 +1,4 @@ % scons -Q . -tar -c -z -f out.tar.gz directory +[?1034htar -c -z -f out.tar.gz directory diff --git a/doc/generated/examples/buildersbuiltin_ex3_1.xml b/doc/generated/examples/buildersbuiltin_ex3_1.xml index 4d281e5..1842916 100644 --- a/doc/generated/examples/buildersbuiltin_ex3_1.xml +++ b/doc/generated/examples/buildersbuiltin_ex3_1.xml @@ -1,4 +1,4 @@ % scons -Q . -tar -c -z -f out.tgz directory +[?1034htar -c -z -f out.tgz directory diff --git a/doc/generated/examples/buildersbuiltin_ex4_1.xml b/doc/generated/examples/buildersbuiltin_ex4_1.xml index 856f024..90a8f6e 100644 --- a/doc/generated/examples/buildersbuiltin_ex4_1.xml +++ b/doc/generated/examples/buildersbuiltin_ex4_1.xml @@ -1,4 +1,4 @@ % scons -Q . -zip(["out.zip"], ["file1", "file2"]) +[?1034hzip(["out.zip"], ["file1", "file2"]) diff --git a/doc/generated/examples/buildersbuiltin_libs_1.xml b/doc/generated/examples/buildersbuiltin_libs_1.xml index 8e1ee49..0610155 100644 --- a/doc/generated/examples/buildersbuiltin_libs_1.xml +++ b/doc/generated/examples/buildersbuiltin_libs_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o goodbye.o -c goodbye.c +[?1034hcc -o goodbye.o -c goodbye.c cc -o hello.o -c hello.c cc -o hello hello.o goodbye.o -L/usr/dir1 -Ldir2 -lfoo1 -lfoo2 diff --git a/doc/generated/examples/buildersbuiltin_libs_2.xml b/doc/generated/examples/buildersbuiltin_libs_2.xml index 41a9c1e..6786cca 100644 --- a/doc/generated/examples/buildersbuiltin_libs_2.xml +++ b/doc/generated/examples/buildersbuiltin_libs_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -cl /Fogoodbye.obj /c goodbye.c /nologo +[?1034hcl /Fogoodbye.obj /c goodbye.c /nologo cl /Fohello.obj /c hello.c /nologo link /nologo /OUT:hello.exe /LIBPATH:\usr\dir1 /LIBPATH:dir2 foo1.lib foo2.lib hello.obj goodbye.obj embedManifestExeCheck(target, source, env) diff --git a/doc/generated/examples/builderscommands_ex1_1.xml b/doc/generated/examples/builderscommands_ex1_1.xml index 8782773..d9af418 100644 --- a/doc/generated/examples/builderscommands_ex1_1.xml +++ b/doc/generated/examples/builderscommands_ex1_1.xml @@ -1,4 +1,4 @@ % scons -Q -sed 's/x/y/' < foo.in > foo.out +[?1034hsed 's/x/y/' < foo.in > foo.out diff --git a/doc/generated/examples/builderscommands_ex2_1.xml b/doc/generated/examples/builderscommands_ex2_1.xml index 3fc1dde..dc689d0 100644 --- a/doc/generated/examples/builderscommands_ex2_1.xml +++ b/doc/generated/examples/builderscommands_ex2_1.xml @@ -1,4 +1,4 @@ % scons -Q -build(["foo.out"], ["foo.in"]) +[?1034hbuild(["foo.out"], ["foo.in"]) diff --git a/doc/generated/examples/builderswriting_MY_EMITTER_1.xml b/doc/generated/examples/builderswriting_MY_EMITTER_1.xml index 440b105..4dc10f5 100644 --- a/doc/generated/examples/builderswriting_MY_EMITTER_1.xml +++ b/doc/generated/examples/builderswriting_MY_EMITTER_1.xml @@ -1,5 +1,5 @@ % scons -Q -my_command file1.input modify1.in > file1.foo +[?1034hmy_command file1.input modify1.in > file1.foo my_command file2.input modify2.in > file2.foo diff --git a/doc/generated/examples/builderswriting_ex1_1.xml b/doc/generated/examples/builderswriting_ex1_1.xml index cefcfa2..d2ba489 100644 --- a/doc/generated/examples/builderswriting_ex1_1.xml +++ b/doc/generated/examples/builderswriting_ex1_1.xml @@ -1,4 +1,4 @@ % scons -Q -foobuild < file.input > file.foo +[?1034hfoobuild < file.input > file.foo diff --git a/doc/generated/examples/builderswriting_ex2_1.xml b/doc/generated/examples/builderswriting_ex2_1.xml index 445dfb0..254cfc0 100644 --- a/doc/generated/examples/builderswriting_ex2_1.xml +++ b/doc/generated/examples/builderswriting_ex2_1.xml @@ -3,4 +3,5 @@ AttributeError: 'SConsEnvironment' object has no attribute 'Program': File "/home/my/project/SConstruct", line 4: env.Program('hello.c') +[?1034h diff --git a/doc/generated/examples/builderswriting_ex3_1.xml b/doc/generated/examples/builderswriting_ex3_1.xml index 2d8bcac..0b2f504 100644 --- a/doc/generated/examples/builderswriting_ex3_1.xml +++ b/doc/generated/examples/builderswriting_ex3_1.xml @@ -1,6 +1,6 @@ % scons -Q -foobuild < file.input > file.foo +[?1034hfoobuild < file.input > file.foo cc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/builderswriting_ex4_1.xml b/doc/generated/examples/builderswriting_ex4_1.xml index cc71b19..04b511b 100644 --- a/doc/generated/examples/builderswriting_ex4_1.xml +++ b/doc/generated/examples/builderswriting_ex4_1.xml @@ -1,5 +1,5 @@ % scons -Q -foobuild < file1.input > file1.foo +[?1034hfoobuild < file1.input > file1.foo foobuild < file2.input > file2.foo diff --git a/doc/generated/examples/builderswriting_ex5_1.xml b/doc/generated/examples/builderswriting_ex5_1.xml index d0aa83b..b1430bd 100644 --- a/doc/generated/examples/builderswriting_ex5_1.xml +++ b/doc/generated/examples/builderswriting_ex5_1.xml @@ -1,4 +1,4 @@ % scons -Q -build_function(["file.foo"], ["file.input"]) +[?1034hbuild_function(["file.foo"], ["file.input"]) diff --git a/doc/generated/examples/builderswriting_ex6_1.xml b/doc/generated/examples/builderswriting_ex6_1.xml index cefcfa2..d2ba489 100644 --- a/doc/generated/examples/builderswriting_ex6_1.xml +++ b/doc/generated/examples/builderswriting_ex6_1.xml @@ -1,4 +1,4 @@ % scons -Q -foobuild < file.input > file.foo +[?1034hfoobuild < file.input > file.foo diff --git a/doc/generated/examples/builderswriting_ex7_1.xml b/doc/generated/examples/builderswriting_ex7_1.xml index f14d598..25c2950 100644 --- a/doc/generated/examples/builderswriting_ex7_1.xml +++ b/doc/generated/examples/builderswriting_ex7_1.xml @@ -1,4 +1,4 @@ % scons -Q -foobuild file.foo new_target - file.input new_source +[?1034hfoobuild file.foo new_target - file.input new_source diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index d3ac996..8d5ccb4 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 +[?1034hcc -o f3.o -c f3.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 prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/examples/caching_ex1_1.xml b/doc/generated/examples/caching_ex1_1.xml index 38eaf82..8701e3a 100644 --- a/doc/generated/examples/caching_ex1_1.xml +++ b/doc/generated/examples/caching_ex1_1.xml @@ -1,11 +1,11 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q -c -Removed hello.o +[?1034hRemoved hello.o Removed hello % scons -Q -Retrieved `hello.o' from cache +[?1034hRetrieved `hello.o' from cache Retrieved `hello' from cache diff --git a/doc/generated/examples/caching_ex1_2.xml b/doc/generated/examples/caching_ex1_2.xml index 2f0bcde..a31e69b 100644 --- a/doc/generated/examples/caching_ex1_2.xml +++ b/doc/generated/examples/caching_ex1_2.xml @@ -1,11 +1,11 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q -c -Removed hello.o +[?1034hRemoved hello.o Removed hello % scons -Q --cache-show -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/caching_ex1_4.xml b/doc/generated/examples/caching_ex1_4.xml index 922f1b6..46a2642 100644 --- a/doc/generated/examples/caching_ex1_4.xml +++ b/doc/generated/examples/caching_ex1_4.xml @@ -1,17 +1,17 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q -c -Removed hello.o +[?1034hRemoved hello.o Removed hello % scons -Q -Retrieved `hello.o' from cache +[?1034hRetrieved `hello.o' from cache Retrieved `hello' from cache % scons -Q -c -Removed hello.o +[?1034hRemoved hello.o Removed hello % scons -Q --cache-disable -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/caching_ex1_5.xml b/doc/generated/examples/caching_ex1_5.xml index 968727f..69804dc 100644 --- a/doc/generated/examples/caching_ex1_5.xml +++ b/doc/generated/examples/caching_ex1_5.xml @@ -1,15 +1,15 @@ % scons -Q --cache-disable -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q -c -Removed hello.o +[?1034hRemoved hello.o Removed hello % scons -Q --cache-disable -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q --cache-force -scons: `.' is up to date. +[?1034hscons: `.' is up to date. % scons -Q -scons: `.' is up to date. +[?1034hscons: `.' is up to date. diff --git a/doc/generated/examples/commandline_ARGLIST_1.xml b/doc/generated/examples/commandline_ARGLIST_1.xml index e094bc0..86a6d9c 100644 --- a/doc/generated/examples/commandline_ARGLIST_1.xml +++ b/doc/generated/examples/commandline_ARGLIST_1.xml @@ -1,6 +1,6 @@ % scons -Q define=FOO -cc -o prog.o -c -DFOO prog.c +[?1034hcc -o prog.o -c -DFOO prog.c % scons -Q define=FOO define=BAR -cc -o prog.o -c -DFOO -DBAR prog.c +[?1034hcc -o prog.o -c -DFOO -DBAR prog.c diff --git a/doc/generated/examples/commandline_ARGUMENTS_1.xml b/doc/generated/examples/commandline_ARGUMENTS_1.xml index 6aa4ed2..7bde474 100644 --- a/doc/generated/examples/commandline_ARGUMENTS_1.xml +++ b/doc/generated/examples/commandline_ARGUMENTS_1.xml @@ -1,12 +1,12 @@ % scons -Q debug=0 -cc -o prog.o -c prog.c +[?1034hcc -o prog.o -c prog.c cc -o prog prog.o % scons -Q debug=0 -scons: `.' is up to date. +[?1034hscons: `.' is up to date. % scons -Q debug=1 -cc -o prog.o -c -g prog.c +[?1034hcc -o prog.o -c -g prog.c cc -o prog prog.o % scons -Q debug=1 -scons: `.' is up to date. +[?1034hscons: `.' is up to date. diff --git a/doc/generated/examples/commandline_AddOption_1.xml b/doc/generated/examples/commandline_AddOption_1.xml index 55df25a..d221713 100644 --- a/doc/generated/examples/commandline_AddOption_1.xml +++ b/doc/generated/examples/commandline_AddOption_1.xml @@ -1,4 +1,4 @@ % scons -Q -n -Install file: "foo.in" as "/usr/bin/foo.in" +[?1034hInstall file: "foo.in" as "/usr/bin/foo.in" diff --git a/doc/generated/examples/commandline_AddOption_2.xml b/doc/generated/examples/commandline_AddOption_2.xml index 7d0b978..979bb70 100644 --- a/doc/generated/examples/commandline_AddOption_2.xml +++ b/doc/generated/examples/commandline_AddOption_2.xml @@ -1,4 +1,4 @@ % scons -Q -n --prefix=/tmp/install -Install file: "foo.in" as "/tmp/install/usr/bin/foo.in" +[?1034hInstall file: "foo.in" as "/tmp/install/usr/bin/foo.in" diff --git a/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml b/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml index bd51961..8d23d0b 100644 --- a/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml +++ b/doc/generated/examples/commandline_BUILD_TARGETS_1_1.xml @@ -1,14 +1,14 @@ % scons -Q -BUILD_TARGETS is ['prog1'] +[?1034hBUILD_TARGETS is ['prog1'] cc -o prog1.o -c prog1.c cc -o prog1 prog1.o % scons -Q prog2 -BUILD_TARGETS is ['prog2'] +[?1034hBUILD_TARGETS is ['prog2'] cc -o prog2.o -c prog2.c cc -o prog2 prog2.o % scons -Q -c . -BUILD_TARGETS is ['.'] +[?1034hBUILD_TARGETS is ['.'] Removed prog1.o Removed prog1 Removed prog2.o diff --git a/doc/generated/examples/commandline_BoolVariable_1.xml b/doc/generated/examples/commandline_BoolVariable_1.xml index e4c1792..5cffe9e 100644 --- a/doc/generated/examples/commandline_BoolVariable_1.xml +++ b/doc/generated/examples/commandline_BoolVariable_1.xml @@ -1,4 +1,4 @@ % scons -Q RELEASE=yes foo.o -cc -o foo.o -c -DRELEASE_BUILD=True foo.c +[?1034hcc -o foo.o -c -DRELEASE_BUILD=True foo.c diff --git a/doc/generated/examples/commandline_BoolVariable_2.xml b/doc/generated/examples/commandline_BoolVariable_2.xml index dc1e068..d988ce9 100644 --- a/doc/generated/examples/commandline_BoolVariable_2.xml +++ b/doc/generated/examples/commandline_BoolVariable_2.xml @@ -1,4 +1,4 @@ % scons -Q RELEASE=t foo.o -cc -o foo.o -c -DRELEASE_BUILD=True foo.c +[?1034hcc -o foo.o -c -DRELEASE_BUILD=True foo.c diff --git a/doc/generated/examples/commandline_BoolVariable_3.xml b/doc/generated/examples/commandline_BoolVariable_3.xml index 0750fb5..9616e94 100644 --- a/doc/generated/examples/commandline_BoolVariable_3.xml +++ b/doc/generated/examples/commandline_BoolVariable_3.xml @@ -1,4 +1,4 @@ % scons -Q RELEASE=no foo.o -cc -o foo.o -c -DRELEASE_BUILD=False foo.c +[?1034hcc -o foo.o -c -DRELEASE_BUILD=False foo.c diff --git a/doc/generated/examples/commandline_BoolVariable_4.xml b/doc/generated/examples/commandline_BoolVariable_4.xml index 84e4639..b49a303 100644 --- a/doc/generated/examples/commandline_BoolVariable_4.xml +++ b/doc/generated/examples/commandline_BoolVariable_4.xml @@ -1,4 +1,4 @@ % scons -Q RELEASE=f foo.o -cc -o foo.o -c -DRELEASE_BUILD=False foo.c +[?1034hcc -o foo.o -c -DRELEASE_BUILD=False foo.c diff --git a/doc/generated/examples/commandline_BoolVariable_5.xml b/doc/generated/examples/commandline_BoolVariable_5.xml index 81f1d4e..f987aac 100644 --- a/doc/generated/examples/commandline_BoolVariable_5.xml +++ b/doc/generated/examples/commandline_BoolVariable_5.xml @@ -4,4 +4,5 @@ scons: *** Error converting option: RELEASE Invalid value for boolean option: bad_value File "/home/my/project/SConstruct", line 4, in <module> +[?1034h diff --git a/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml b/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml index 1812f74..096223d 100644 --- a/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml +++ b/doc/generated/examples/commandline_COMMAND_LINE_TARGETS_1.xml @@ -1,9 +1,9 @@ % scons -Q -cc -o foo.o -c foo.c +[?1034hcc -o foo.o -c foo.c cc -o foo foo.o % scons -Q bar -Don't forget to copy `bar' to the archive! +[?1034hDon't forget to copy `bar' to the archive! cc -o bar.o -c bar.c cc -o bar bar.o diff --git a/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml b/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml index f92f160..529aecb 100644 --- a/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml +++ b/doc/generated/examples/commandline_DEFAULT_TARGETS_1_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... DEFAULT_TARGETS is ['prog1'] scons: done reading SConscript files. scons: Building targets ... diff --git a/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml b/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml index 01e953b..d275158 100644 --- a/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml +++ b/doc/generated/examples/commandline_DEFAULT_TARGETS_2_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... DEFAULT_TARGETS is now ['prog1'] DEFAULT_TARGETS is now ['prog1', 'prog2'] scons: done reading SConscript files. diff --git a/doc/generated/examples/commandline_Default1_1.xml b/doc/generated/examples/commandline_Default1_1.xml index 18008d8..9d8ca6c 100644 --- a/doc/generated/examples/commandline_Default1_1.xml +++ b/doc/generated/examples/commandline_Default1_1.xml @@ -1,10 +1,10 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q -scons: `hello' is up to date. +[?1034hscons: `hello' is up to date. % scons -Q goodbye -cc -o goodbye.o -c goodbye.c +[?1034hcc -o goodbye.o -c goodbye.c cc -o goodbye goodbye.o diff --git a/doc/generated/examples/commandline_Default1_2.xml b/doc/generated/examples/commandline_Default1_2.xml index 0f1a93e..842b9fa 100644 --- a/doc/generated/examples/commandline_Default1_2.xml +++ b/doc/generated/examples/commandline_Default1_2.xml @@ -1,6 +1,6 @@ % scons -Q . -cc -o goodbye.o -c goodbye.c +[?1034hcc -o goodbye.o -c goodbye.c cc -o goodbye goodbye.o cc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/commandline_Default2_1.xml b/doc/generated/examples/commandline_Default2_1.xml index 606ed67..c62e80c 100644 --- a/doc/generated/examples/commandline_Default2_1.xml +++ b/doc/generated/examples/commandline_Default2_1.xml @@ -1,10 +1,10 @@ % scons -Q -cc -o prog1.o -c prog1.c +[?1034hcc -o prog1.o -c prog1.c cc -o prog1 prog1.o cc -o prog3.o -c prog3.c cc -o prog3 prog3.o % scons -Q . -cc -o prog2.o -c prog2.c +[?1034hcc -o prog2.o -c prog2.c cc -o prog2 prog2.o diff --git a/doc/generated/examples/commandline_Default3_1.xml b/doc/generated/examples/commandline_Default3_1.xml index d18575c..cff7a20 100644 --- a/doc/generated/examples/commandline_Default3_1.xml +++ b/doc/generated/examples/commandline_Default3_1.xml @@ -1,12 +1,12 @@ % scons -Q -cc -o prog1/foo.o -c prog1/foo.c +[?1034hcc -o prog1/foo.o -c prog1/foo.c cc -o prog1/main.o -c prog1/main.c cc -o prog1/main prog1/main.o prog1/foo.o % scons -Q -scons: `prog1' is up to date. +[?1034hscons: `prog1' is up to date. % scons -Q . -cc -o prog2/bar.o -c prog2/bar.c +[?1034hcc -o prog2/bar.o -c prog2/bar.c cc -o prog2/main.o -c prog2/main.c cc -o prog2/main prog2/main.o prog2/bar.o diff --git a/doc/generated/examples/commandline_Default4_1.xml b/doc/generated/examples/commandline_Default4_1.xml index 35e0b10..098d90e 100644 --- a/doc/generated/examples/commandline_Default4_1.xml +++ b/doc/generated/examples/commandline_Default4_1.xml @@ -1,9 +1,9 @@ % scons -Q scons: *** No targets specified and no Default() targets found. Stop. -Found nothing to build +[?1034hFound nothing to build % scons -Q . -cc -o prog1.o -c prog1.c +[?1034hcc -o prog1.o -c prog1.c cc -o prog1 prog1.o cc -o prog2.o -c prog2.c cc -o prog2 prog2.o diff --git a/doc/generated/examples/commandline_EnumVariable_1.xml b/doc/generated/examples/commandline_EnumVariable_1.xml index d658f69..31943ea 100644 --- a/doc/generated/examples/commandline_EnumVariable_1.xml +++ b/doc/generated/examples/commandline_EnumVariable_1.xml @@ -1,8 +1,8 @@ % scons -Q COLOR=red foo.o -cc -o foo.o -c -DCOLOR="red" foo.c +[?1034hcc -o foo.o -c -DCOLOR="red" foo.c % scons -Q COLOR=blue foo.o -cc -o foo.o -c -DCOLOR="blue" foo.c +[?1034hcc -o foo.o -c -DCOLOR="blue" foo.c % scons -Q COLOR=green foo.o -cc -o foo.o -c -DCOLOR="green" foo.c +[?1034hcc -o foo.o -c -DCOLOR="green" foo.c diff --git a/doc/generated/examples/commandline_EnumVariable_2.xml b/doc/generated/examples/commandline_EnumVariable_2.xml index a8a18df..1e28144 100644 --- a/doc/generated/examples/commandline_EnumVariable_2.xml +++ b/doc/generated/examples/commandline_EnumVariable_2.xml @@ -3,4 +3,5 @@ scons: *** Invalid value for option COLOR: magenta. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> +[?1034h diff --git a/doc/generated/examples/commandline_EnumVariable_3.xml b/doc/generated/examples/commandline_EnumVariable_3.xml index bb9a6d5..73510cb 100644 --- a/doc/generated/examples/commandline_EnumVariable_3.xml +++ b/doc/generated/examples/commandline_EnumVariable_3.xml @@ -3,12 +3,15 @@ scons: *** Invalid value for option COLOR: Red. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> +[?1034h % scons -Q COLOR=BLUE foo.o scons: *** Invalid value for option COLOR: BLUE. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> +[?1034h % scons -Q COLOR=nAvY foo.o scons: *** Invalid value for option COLOR: nAvY. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> +[?1034h diff --git a/doc/generated/examples/commandline_EnumVariable_ic1_1.xml b/doc/generated/examples/commandline_EnumVariable_ic1_1.xml index db786e5..0c8b86a 100644 --- a/doc/generated/examples/commandline_EnumVariable_ic1_1.xml +++ b/doc/generated/examples/commandline_EnumVariable_ic1_1.xml @@ -1,10 +1,10 @@ % scons -Q COLOR=Red foo.o -cc -o foo.o -c -DCOLOR="Red" foo.c +[?1034hcc -o foo.o -c -DCOLOR="Red" foo.c % scons -Q COLOR=BLUE foo.o -cc -o foo.o -c -DCOLOR="BLUE" foo.c +[?1034hcc -o foo.o -c -DCOLOR="BLUE" foo.c % scons -Q COLOR=nAvY foo.o -cc -o foo.o -c -DCOLOR="blue" foo.c +[?1034hcc -o foo.o -c -DCOLOR="blue" foo.c % scons -Q COLOR=green foo.o -cc -o foo.o -c -DCOLOR="green" foo.c +[?1034hcc -o foo.o -c -DCOLOR="green" foo.c diff --git a/doc/generated/examples/commandline_EnumVariable_ic2_1.xml b/doc/generated/examples/commandline_EnumVariable_ic2_1.xml index 5596608..4298d03 100644 --- a/doc/generated/examples/commandline_EnumVariable_ic2_1.xml +++ b/doc/generated/examples/commandline_EnumVariable_ic2_1.xml @@ -1,8 +1,8 @@ % scons -Q COLOR=Red foo.o -cc -o foo.o -c -DCOLOR="red" foo.c +[?1034hcc -o foo.o -c -DCOLOR="red" foo.c % scons -Q COLOR=nAvY foo.o -cc -o foo.o -c -DCOLOR="blue" foo.c +[?1034hcc -o foo.o -c -DCOLOR="blue" foo.c % scons -Q COLOR=GREEN foo.o -cc -o foo.o -c -DCOLOR="green" foo.c +[?1034hcc -o foo.o -c -DCOLOR="green" foo.c diff --git a/doc/generated/examples/commandline_ListVariable_1.xml b/doc/generated/examples/commandline_ListVariable_1.xml index 6e245a3..f88280c 100644 --- a/doc/generated/examples/commandline_ListVariable_1.xml +++ b/doc/generated/examples/commandline_ListVariable_1.xml @@ -1,6 +1,6 @@ % scons -Q COLORS=red,blue foo.o -cc -o foo.o -c -DCOLORS="red blue" foo.c +[?1034hcc -o foo.o -c -DCOLORS="red blue" foo.c % scons -Q COLORS=blue,green,red foo.o -cc -o foo.o -c -DCOLORS="blue green red" foo.c +[?1034hcc -o foo.o -c -DCOLORS="blue green red" foo.c diff --git a/doc/generated/examples/commandline_ListVariable_2.xml b/doc/generated/examples/commandline_ListVariable_2.xml index b964669..e287f2a 100644 --- a/doc/generated/examples/commandline_ListVariable_2.xml +++ b/doc/generated/examples/commandline_ListVariable_2.xml @@ -1,6 +1,6 @@ % scons -Q COLORS=all foo.o -cc -o foo.o -c -DCOLORS="red green blue" foo.c +[?1034hcc -o foo.o -c -DCOLORS="red green blue" foo.c % scons -Q COLORS=none foo.o -cc -o foo.o -c -DCOLORS="" foo.c +[?1034hcc -o foo.o -c -DCOLORS="" foo.c diff --git a/doc/generated/examples/commandline_ListVariable_3.xml b/doc/generated/examples/commandline_ListVariable_3.xml index ae13d8b..d15105c 100644 --- a/doc/generated/examples/commandline_ListVariable_3.xml +++ b/doc/generated/examples/commandline_ListVariable_3.xml @@ -4,4 +4,5 @@ scons: *** Error converting option: COLORS Invalid value(s) for option: magenta File "/home/my/project/SConstruct", line 5, in <module> +[?1034h diff --git a/doc/generated/examples/commandline_PackageVariable_1.xml b/doc/generated/examples/commandline_PackageVariable_1.xml index b83fd80..8c14ab8 100644 --- a/doc/generated/examples/commandline_PackageVariable_1.xml +++ b/doc/generated/examples/commandline_PackageVariable_1.xml @@ -1,10 +1,10 @@ % scons -Q foo.o -cc -o foo.o -c -DPACKAGE="/opt/location" foo.c +[?1034hcc -o foo.o -c -DPACKAGE="/opt/location" foo.c % scons -Q PACKAGE=/usr/local/location foo.o -cc -o foo.o -c -DPACKAGE="/usr/local/location" foo.c +[?1034hcc -o foo.o -c -DPACKAGE="/usr/local/location" foo.c % scons -Q PACKAGE=yes foo.o -cc -o foo.o -c -DPACKAGE="True" foo.c +[?1034hcc -o foo.o -c -DPACKAGE="True" foo.c % scons -Q PACKAGE=no foo.o -cc -o foo.o -c -DPACKAGE="False" foo.c +[?1034hcc -o foo.o -c -DPACKAGE="False" foo.c diff --git a/doc/generated/examples/commandline_PathVariable_1.xml b/doc/generated/examples/commandline_PathVariable_1.xml index 81693b9..346b284 100644 --- a/doc/generated/examples/commandline_PathVariable_1.xml +++ b/doc/generated/examples/commandline_PathVariable_1.xml @@ -1,6 +1,6 @@ % scons -Q foo.o -cc -o foo.o -c -DCONFIG_FILE="/etc/my_config" foo.c +[?1034hcc -o foo.o -c -DCONFIG_FILE="/etc/my_config" foo.c % scons -Q CONFIG=/usr/local/etc/other_config foo.o -scons: `foo.o' is up to date. +[?1034hscons: `foo.o' is up to date. diff --git a/doc/generated/examples/commandline_PathVariable_2.xml b/doc/generated/examples/commandline_PathVariable_2.xml index 7dde5b1..c05dfb3 100644 --- a/doc/generated/examples/commandline_PathVariable_2.xml +++ b/doc/generated/examples/commandline_PathVariable_2.xml @@ -3,4 +3,5 @@ scons: *** Path for option CONFIG does not exist: /does/not/exist File "/home/my/project/SConstruct", line 6, in <module> +[?1034h diff --git a/doc/generated/examples/commandline_SCONSFLAGS_1.xml b/doc/generated/examples/commandline_SCONSFLAGS_1.xml index 35e366c..9497ade 100644 --- a/doc/generated/examples/commandline_SCONSFLAGS_1.xml +++ b/doc/generated/examples/commandline_SCONSFLAGS_1.xml @@ -1,11 +1,11 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... ... [build output] ... scons: done building targets. % export SCONSFLAGS="-Q" % scons - ... [build output] ... +[?1034h ... [build output] ... diff --git a/doc/generated/examples/commandline_SetOption_1.xml b/doc/generated/examples/commandline_SetOption_1.xml index bac0cf4..d1acfb3 100644 --- a/doc/generated/examples/commandline_SetOption_1.xml +++ b/doc/generated/examples/commandline_SetOption_1.xml @@ -1,5 +1,5 @@ % scons -Q -running with -j 2 +[?1034hrunning with -j 2 scons: `.' is up to date. diff --git a/doc/generated/examples/commandline_SetOption_2.xml b/doc/generated/examples/commandline_SetOption_2.xml index b00e073..89736b3 100644 --- a/doc/generated/examples/commandline_SetOption_2.xml +++ b/doc/generated/examples/commandline_SetOption_2.xml @@ -1,6 +1,6 @@ % export NUM_CPU="4" % scons -Q -running with -j 4 +[?1034hrunning with -j 4 scons: `.' is up to date. diff --git a/doc/generated/examples/commandline_SetOption_3.xml b/doc/generated/examples/commandline_SetOption_3.xml index df42ff0..675feff 100644 --- a/doc/generated/examples/commandline_SetOption_3.xml +++ b/doc/generated/examples/commandline_SetOption_3.xml @@ -1,9 +1,9 @@ % scons -Q -j 7 -running with -j 7 +[?1034hrunning with -j 7 scons: `.' is up to date. % export NUM_CPU="4" % scons -Q -j 3 -running with -j 3 +[?1034hrunning with -j 3 scons: `.' is up to date. diff --git a/doc/generated/examples/commandline_UnknownVariables_1.xml b/doc/generated/examples/commandline_UnknownVariables_1.xml index 272a954..40e83d2 100644 --- a/doc/generated/examples/commandline_UnknownVariables_1.xml +++ b/doc/generated/examples/commandline_UnknownVariables_1.xml @@ -1,4 +1,4 @@ % scons -Q NOT_KNOWN=foo -Unknown variables: ['NOT_KNOWN'] +[?1034hUnknown variables: ['NOT_KNOWN'] diff --git a/doc/generated/examples/commandline_Variables1_1.xml b/doc/generated/examples/commandline_Variables1_1.xml index 512ae65..017c9c1 100644 --- a/doc/generated/examples/commandline_Variables1_1.xml +++ b/doc/generated/examples/commandline_Variables1_1.xml @@ -1,6 +1,6 @@ % scons -Q RELEASE=1 -cc -o bar.o -c -DRELEASE_BUILD=1 bar.c +[?1034hcc -o bar.o -c -DRELEASE_BUILD=1 bar.c cc -o foo.o -c -DRELEASE_BUILD=1 foo.c cc -o foo foo.o bar.o diff --git a/doc/generated/examples/commandline_Variables_Help_1.xml b/doc/generated/examples/commandline_Variables_Help_1.xml index db171eb..3284799 100644 --- a/doc/generated/examples/commandline_Variables_Help_1.xml +++ b/doc/generated/examples/commandline_Variables_Help_1.xml @@ -1,6 +1,6 @@ % scons -Q -h - +[?1034h RELEASE: Set to 1 to build for release default: 0 actual: 0 diff --git a/doc/generated/examples/commandline_Variables_custom_py_1_1.xml b/doc/generated/examples/commandline_Variables_custom_py_1_1.xml index 4ef4d48..bdadb9a 100644 --- a/doc/generated/examples/commandline_Variables_custom_py_1_1.xml +++ b/doc/generated/examples/commandline_Variables_custom_py_1_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o bar.o -c -DRELEASE_BUILD=1 bar.c +[?1034hcc -o bar.o -c -DRELEASE_BUILD=1 bar.c cc -o foo.o -c -DRELEASE_BUILD=1 foo.c cc -o foo foo.o bar.o diff --git a/doc/generated/examples/commandline_Variables_custom_py_2_1.xml b/doc/generated/examples/commandline_Variables_custom_py_2_1.xml index 5961d0a..1980631 100644 --- a/doc/generated/examples/commandline_Variables_custom_py_2_1.xml +++ b/doc/generated/examples/commandline_Variables_custom_py_2_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o bar.o -c -DRELEASE_BUILD=0 bar.c +[?1034hcc -o bar.o -c -DRELEASE_BUILD=0 bar.c cc -o foo.o -c -DRELEASE_BUILD=0 foo.c cc -o foo foo.o bar.o diff --git a/doc/generated/examples/depends_AlwaysBuild_1.xml b/doc/generated/examples/depends_AlwaysBuild_1.xml index 86700fe..25e4ad2 100644 --- a/doc/generated/examples/depends_AlwaysBuild_1.xml +++ b/doc/generated/examples/depends_AlwaysBuild_1.xml @@ -1,7 +1,7 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q -cc -o hello hello.o +[?1034hcc -o hello hello.o diff --git a/doc/generated/examples/depends_AlwaysBuild_2.xml b/doc/generated/examples/depends_AlwaysBuild_2.xml index d1bdd6d..a238d9d 100644 --- a/doc/generated/examples/depends_AlwaysBuild_2.xml +++ b/doc/generated/examples/depends_AlwaysBuild_2.xml @@ -1,7 +1,7 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q hello.o -scons: `hello.o' is up to date. +[?1034hscons: `hello.o' is up to date. diff --git a/doc/generated/examples/depends_Requires_1.xml b/doc/generated/examples/depends_Requires_1.xml index 04bfc35..6ec2942 100644 --- a/doc/generated/examples/depends_Requires_1.xml +++ b/doc/generated/examples/depends_Requires_1.xml @@ -1,20 +1,20 @@ % scons -Q hello -cc -o version.o -c version.c +[?1034hcc -o version.o -c version.c cc -o hello.o -c hello.c cc -o hello version.o hello.o % sleep 1 % scons -Q hello -cc -o version.o -c version.c +[?1034hcc -o version.o -c version.c scons: `hello' is up to date. % sleep 1 % [CHANGE THE CONTENTS OF hello.c] % scons -Q hello -cc -o version.o -c version.c +[?1034hcc -o version.o -c version.c cc -o hello.o -c hello.c cc -o hello version.o hello.o % sleep 1 % scons -Q hello -cc -o version.o -c version.c +[?1034hcc -o version.o -c version.c scons: `hello' is up to date. diff --git a/doc/generated/examples/depends_ex1_1.xml b/doc/generated/examples/depends_ex1_1.xml index 25355c9..aa72efc 100644 --- a/doc/generated/examples/depends_ex1_1.xml +++ b/doc/generated/examples/depends_ex1_1.xml @@ -1,7 +1,7 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q -scons: `.' is up to date. +[?1034hscons: `.' is up to date. diff --git a/doc/generated/examples/depends_ex1_2.xml b/doc/generated/examples/depends_ex1_2.xml index 09ecc73..456cfe8 100644 --- a/doc/generated/examples/depends_ex1_2.xml +++ b/doc/generated/examples/depends_ex1_2.xml @@ -1,7 +1,7 @@ % scons -Q hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q hello -scons: `hello' is up to date. +[?1034hscons: `hello' is up to date. diff --git a/doc/generated/examples/depends_ex1_3.xml b/doc/generated/examples/depends_ex1_3.xml index 20062df..801b3af 100644 --- a/doc/generated/examples/depends_ex1_3.xml +++ b/doc/generated/examples/depends_ex1_3.xml @@ -1,8 +1,8 @@ % scons -Q hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % touch hello.c % scons -Q hello -scons: `hello' is up to date. +[?1034hscons: `hello' is up to date. diff --git a/doc/generated/examples/depends_ex1_4.xml b/doc/generated/examples/depends_ex1_4.xml index 31aa5bd..7a87b29 100644 --- a/doc/generated/examples/depends_ex1_4.xml +++ b/doc/generated/examples/depends_ex1_4.xml @@ -1,9 +1,9 @@ % scons -Q hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % [CHANGE THE CONTENTS OF hello.c] % scons -Q hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/depends_ex1_5.xml b/doc/generated/examples/depends_ex1_5.xml index 776bda2..f5517e8 100644 --- a/doc/generated/examples/depends_ex1_5.xml +++ b/doc/generated/examples/depends_ex1_5.xml @@ -1,9 +1,9 @@ % scons -Q hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % [CHANGE A COMMENT IN hello.c] % scons -Q hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c scons: `hello' is up to date. diff --git a/doc/generated/examples/depends_ex1_6.xml b/doc/generated/examples/depends_ex1_6.xml index 7493627..4993702 100644 --- a/doc/generated/examples/depends_ex1_6.xml +++ b/doc/generated/examples/depends_ex1_6.xml @@ -1,7 +1,7 @@ % scons -Q --implicit-cache hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q hello -scons: `hello' is up to date. +[?1034hscons: `hello' is up to date. diff --git a/doc/generated/examples/depends_ex1_7.xml b/doc/generated/examples/depends_ex1_7.xml index 22b56d3..b806781 100644 --- a/doc/generated/examples/depends_ex1_7.xml +++ b/doc/generated/examples/depends_ex1_7.xml @@ -1,7 +1,7 @@ % scons -Q --implicit-deps-changed hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q hello -scons: `hello' is up to date. +[?1034hscons: `hello' is up to date. diff --git a/doc/generated/examples/depends_ex1_8.xml b/doc/generated/examples/depends_ex1_8.xml index d60db97..a071add 100644 --- a/doc/generated/examples/depends_ex1_8.xml +++ b/doc/generated/examples/depends_ex1_8.xml @@ -1,7 +1,7 @@ % scons -Q --implicit-deps-unchanged hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q hello -scons: `hello' is up to date. +[?1034hscons: `hello' is up to date. diff --git a/doc/generated/examples/depends_ex5_1.xml b/doc/generated/examples/depends_ex5_1.xml index e81cb0c..6535020 100644 --- a/doc/generated/examples/depends_ex5_1.xml +++ b/doc/generated/examples/depends_ex5_1.xml @@ -1,5 +1,5 @@ % scons -Q hello -cc -o hello.o -c -Iinclude -I/home/project/inc hello.c +[?1034hcc -o hello.o -c -Iinclude -I/home/project/inc hello.c cc -o hello hello.o diff --git a/doc/generated/examples/depends_ex5_2.xml b/doc/generated/examples/depends_ex5_2.xml index ea78590..fc0239b 100644 --- a/doc/generated/examples/depends_ex5_2.xml +++ b/doc/generated/examples/depends_ex5_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q hello.exe -cl /Fohello.obj /c hello.c /nologo /Iinclude /I\home\project\inc +[?1034hcl /Fohello.obj /c hello.c /nologo /Iinclude /I\home\project\inc link /nologo /OUT:hello.exe hello.obj embedManifestExeCheck(target, source, env) diff --git a/doc/generated/examples/depends_ignore_explicit_1.xml b/doc/generated/examples/depends_ignore_explicit_1.xml index a45a852..15c5a69 100644 --- a/doc/generated/examples/depends_ignore_explicit_1.xml +++ b/doc/generated/examples/depends_ignore_explicit_1.xml @@ -1,9 +1,9 @@ % scons -Q -scons: `.' is up to date. +[?1034hscons: `.' is up to date. % scons -Q hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q hello -scons: `hello' is up to date. +[?1034hscons: `hello' is up to date. diff --git a/doc/generated/examples/depends_include_1.xml b/doc/generated/examples/depends_include_1.xml index e22bd03..e34f5ec 100644 --- a/doc/generated/examples/depends_include_1.xml +++ b/doc/generated/examples/depends_include_1.xml @@ -1,11 +1,11 @@ % scons -Q hello -cc -o hello.o -c -I. hello.c +[?1034hcc -o hello.o -c -I. hello.c cc -o hello hello.o % scons -Q hello -scons: `hello' is up to date. +[?1034hscons: `hello' is up to date. % [CHANGE THE CONTENTS OF hello.h] % scons -Q hello -cc -o hello.o -c -I. hello.c +[?1034hcc -o hello.o -c -I. hello.c cc -o hello hello.o diff --git a/doc/generated/examples/depends_macroinc_1.xml b/doc/generated/examples/depends_macroinc_1.xml index 95d4e0b..ae40fe6 100644 --- a/doc/generated/examples/depends_macroinc_1.xml +++ b/doc/generated/examples/depends_macroinc_1.xml @@ -1,8 +1,8 @@ % scons -Q -cc -o hello.o -c -I. hello.c +[?1034hcc -o hello.o -c -I. hello.c cc -o hello hello.o % [CHANGE CONTENTS OF foo.h] % scons -Q -scons: `.' is up to date. +[?1034hscons: `.' is up to date. diff --git a/doc/generated/examples/depends_match_1.xml b/doc/generated/examples/depends_match_1.xml index 7dc3831..9c92424 100644 --- a/doc/generated/examples/depends_match_1.xml +++ b/doc/generated/examples/depends_match_1.xml @@ -1,7 +1,7 @@ % scons -Q hello.o -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c % touch -t 198901010000 hello.c % scons -Q hello.o -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c diff --git a/doc/generated/examples/depends_mixing_1.xml b/doc/generated/examples/depends_mixing_1.xml index 258dc90..4990049 100644 --- a/doc/generated/examples/depends_mixing_1.xml +++ b/doc/generated/examples/depends_mixing_1.xml @@ -1,11 +1,11 @@ % scons -Q -cc -o program1.o -c -I. program1.c +[?1034hcc -o program1.o -c -I. program1.c cc -o prog-MD5 program1.o cc -o program2.o -c -I. program2.c cc -o prog-timestamp program2.o % touch inc.h % scons -Q -cc -o program2.o -c -I. program2.c +[?1034hcc -o program2.o -c -I. program2.c cc -o prog-timestamp program2.o diff --git a/doc/generated/examples/depends_newer_1.xml b/doc/generated/examples/depends_newer_1.xml index 28cb427..f50d149 100644 --- a/doc/generated/examples/depends_newer_1.xml +++ b/doc/generated/examples/depends_newer_1.xml @@ -1,7 +1,7 @@ % scons -Q hello.o -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c % touch hello.c % scons -Q hello.o -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c diff --git a/doc/generated/examples/depends_no-Requires_1.xml b/doc/generated/examples/depends_no-Requires_1.xml index 8e2729f..31be030 100644 --- a/doc/generated/examples/depends_no-Requires_1.xml +++ b/doc/generated/examples/depends_no-Requires_1.xml @@ -1,14 +1,14 @@ % scons -Q hello -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o version.o -c version.c cc -o hello hello.o version.o % sleep 1 % scons -Q hello -cc -o version.o -c version.c +[?1034hcc -o version.o -c version.c cc -o hello hello.o version.o % sleep 1 % scons -Q hello -cc -o version.o -c version.c +[?1034hcc -o version.o -c version.c cc -o hello hello.o version.o diff --git a/doc/generated/examples/depends_parsedep_1.xml b/doc/generated/examples/depends_parsedep_1.xml index 910930b1..0f1004a 100644 --- a/doc/generated/examples/depends_parsedep_1.xml +++ b/doc/generated/examples/depends_parsedep_1.xml @@ -1,8 +1,8 @@ % scons -Q -cc -o hello.o -c -MD -MF hello.d -I. hello.c +[?1034hcc -o hello.o -c -MD -MF hello.d -I. hello.c cc -o hello hello.o % [CHANGE CONTENTS OF foo.h] % scons -Q -cc -o hello.o -c -MD -MF hello.d -I. hello.c +[?1034hcc -o hello.o -c -MD -MF hello.d -I. hello.c diff --git a/doc/generated/examples/environments_Append-nonexistent_1.xml b/doc/generated/examples/environments_Append-nonexistent_1.xml index bb15965..2a0aad1 100644 --- a/doc/generated/examples/environments_Append-nonexistent_1.xml +++ b/doc/generated/examples/environments_Append-nonexistent_1.xml @@ -1,5 +1,5 @@ % scons -Q -NEW_VARIABLE = added +[?1034hNEW_VARIABLE = added scons: `.' is up to date. diff --git a/doc/generated/examples/environments_Prepend-nonexistent_1.xml b/doc/generated/examples/environments_Prepend-nonexistent_1.xml index bb15965..2a0aad1 100644 --- a/doc/generated/examples/environments_Prepend-nonexistent_1.xml +++ b/doc/generated/examples/environments_Prepend-nonexistent_1.xml @@ -1,5 +1,5 @@ % scons -Q -NEW_VARIABLE = added +[?1034hNEW_VARIABLE = added scons: `.' is up to date. diff --git a/doc/generated/examples/environments_Replace-nonexistent_1.xml b/doc/generated/examples/environments_Replace-nonexistent_1.xml index c4480b5..08aa35f 100644 --- a/doc/generated/examples/environments_Replace-nonexistent_1.xml +++ b/doc/generated/examples/environments_Replace-nonexistent_1.xml @@ -1,5 +1,5 @@ % scons -Q -NEW_VARIABLE = xyzzy +[?1034hNEW_VARIABLE = xyzzy scons: `.' is up to date. diff --git a/doc/generated/examples/environments_Replace1_1.xml b/doc/generated/examples/environments_Replace1_1.xml index 54f4976..04fa66f 100644 --- a/doc/generated/examples/environments_Replace1_1.xml +++ b/doc/generated/examples/environments_Replace1_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o foo.o -c -DDEFINE2 foo.c +[?1034hcc -o foo.o -c -DDEFINE2 foo.c cc -o foo foo.o diff --git a/doc/generated/examples/environments_Replace2_1.xml b/doc/generated/examples/environments_Replace2_1.xml index 9ad257b..5fdb033 100644 --- a/doc/generated/examples/environments_Replace2_1.xml +++ b/doc/generated/examples/environments_Replace2_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... CCFLAGS = -DDEFINE1 CCFLAGS = -DDEFINE2 scons: done reading SConscript files. diff --git a/doc/generated/examples/environments_ex1_1.xml b/doc/generated/examples/environments_ex1_1.xml index 84d22b8..d854515 100644 --- a/doc/generated/examples/environments_ex1_1.xml +++ b/doc/generated/examples/environments_ex1_1.xml @@ -1,5 +1,5 @@ % scons -Q -gcc -o foo.o -c -O2 foo.c +[?1034hgcc -o foo.o -c -O2 foo.c gcc -o foo foo.o diff --git a/doc/generated/examples/environments_ex2_1.xml b/doc/generated/examples/environments_ex2_1.xml index eb86c9e..30bd609 100644 --- a/doc/generated/examples/environments_ex2_1.xml +++ b/doc/generated/examples/environments_ex2_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o bar.o -c -g bar.c +[?1034hcc -o bar.o -c -g bar.c cc -o bar bar.o cc -o foo.o -c -O2 foo.c cc -o foo foo.o diff --git a/doc/generated/examples/environments_ex3_1.xml b/doc/generated/examples/environments_ex3_1.xml index 0679aec..8d2f735 100644 --- a/doc/generated/examples/environments_ex3_1.xml +++ b/doc/generated/examples/environments_ex3_1.xml @@ -7,16 +7,17 @@ UnicodeDecodeError: 'utf8' codec can't decode byte 0xc2 in position 249: invalid 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 632: + File "bootstrap/src/engine/SCons/Builder.py", line 634: return self._execute(env, target, source, OverrideWarner(kw), ekw) File "bootstrap/src/engine/SCons/Builder.py", line 540: source = self.src_builder_sources(env, source, overwarn) - File "bootstrap/src/engine/SCons/Builder.py", line 745: + File "bootstrap/src/engine/SCons/Builder.py", line 747: tlist = bld._execute(env, None, [s], overwarn) File "bootstrap/src/engine/SCons/Builder.py", line 556: _node_errors(self, env, tlist, slist) File "bootstrap/src/engine/SCons/Builder.py", line 302: 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: + File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/encodings/utf_8.py", line 16: return codecs.utf_8_decode(input, errors, True) +[?1034h diff --git a/doc/generated/examples/environments_ex4_1.xml b/doc/generated/examples/environments_ex4_1.xml index 286f46f..2e92c78 100644 --- a/doc/generated/examples/environments_ex4_1.xml +++ b/doc/generated/examples/environments_ex4_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o foo-dbg.o -c -g foo.c +[?1034hcc -o foo-dbg.o -c -g foo.c cc -o foo-dbg foo-dbg.o cc -o foo-opt.o -c -O2 foo.c cc -o foo-opt foo-opt.o diff --git a/doc/generated/examples/environments_ex5_1.xml b/doc/generated/examples/environments_ex5_1.xml index d6f0094..c12d3ab 100644 --- a/doc/generated/examples/environments_ex5_1.xml +++ b/doc/generated/examples/environments_ex5_1.xml @@ -1,6 +1,6 @@ % scons -Q -gcc -o foo.o -c foo.c +[?1034hgcc -o foo.o -c foo.c gcc -o foo foo.o gcc -o foo-dbg.o -c -g foo.c gcc -o foo-dbg foo-dbg.o diff --git a/doc/generated/examples/environments_ex6_1.xml b/doc/generated/examples/environments_ex6_1.xml index af8667f..47b99c2 100644 --- a/doc/generated/examples/environments_ex6_1.xml +++ b/doc/generated/examples/environments_ex6_1.xml @@ -1,5 +1,5 @@ % scons -Q -CC is: cc +[?1034hCC is: cc scons: `.' is up to date. diff --git a/doc/generated/examples/environments_ex6b_1.xml b/doc/generated/examples/environments_ex6b_1.xml index 47a499a..6234233 100644 --- a/doc/generated/examples/environments_ex6b_1.xml +++ b/doc/generated/examples/environments_ex6b_1.xml @@ -1,6 +1,6 @@ % scons -Q -key = OBJSUFFIX, value = .o +[?1034hkey = OBJSUFFIX, value = .o key = LIBSUFFIX, value = .a key = PROGSUFFIX, value = scons: `.' is up to date. diff --git a/doc/generated/examples/environments_ex6b_2.xml b/doc/generated/examples/environments_ex6b_2.xml index 73a6d19..33f5e57 100644 --- a/doc/generated/examples/environments_ex6b_2.xml +++ b/doc/generated/examples/environments_ex6b_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -key = OBJSUFFIX, value = .obj +[?1034hkey = OBJSUFFIX, value = .obj key = LIBSUFFIX, value = .lib key = PROGSUFFIX, value = .exe scons: `.' is up to date. diff --git a/doc/generated/examples/environments_ex8_1.xml b/doc/generated/examples/environments_ex8_1.xml index 68ebac4..adfeb26 100644 --- a/doc/generated/examples/environments_ex8_1.xml +++ b/doc/generated/examples/environments_ex8_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o foo.o -c -DMY_VALUE -DLAST foo.c +[?1034hcc -o foo.o -c -DMY_VALUE -DLAST foo.c cc -o foo foo.o diff --git a/doc/generated/examples/environments_ex9_1.xml b/doc/generated/examples/environments_ex9_1.xml index 3e31c3f..502caa8 100644 --- a/doc/generated/examples/environments_ex9_1.xml +++ b/doc/generated/examples/environments_ex9_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o foo.o -c -DFIRST -DMY_VALUE foo.c +[?1034hcc -o foo.o -c -DFIRST -DMY_VALUE foo.c cc -o foo foo.o diff --git a/doc/generated/examples/environments_missing1_1.xml b/doc/generated/examples/environments_missing1_1.xml index edf136f..8795e5f 100644 --- a/doc/generated/examples/environments_missing1_1.xml +++ b/doc/generated/examples/environments_missing1_1.xml @@ -1,5 +1,5 @@ % scons -Q -value is: -><- +[?1034hvalue is: -><- scons: `.' is up to date. diff --git a/doc/generated/examples/environments_missing2_1.xml b/doc/generated/examples/environments_missing2_1.xml index ffb308c..9a83824 100644 --- a/doc/generated/examples/environments_missing2_1.xml +++ b/doc/generated/examples/environments_missing2_1.xml @@ -3,4 +3,5 @@ scons: *** NameError `MISSING' trying to evaluate `$MISSING' File "/home/my/project/SConstruct", line 3, in <module> +[?1034h diff --git a/doc/generated/examples/environments_missing3_1.xml b/doc/generated/examples/environments_missing3_1.xml index edf136f..8795e5f 100644 --- a/doc/generated/examples/environments_missing3_1.xml +++ b/doc/generated/examples/environments_missing3_1.xml @@ -1,5 +1,5 @@ % scons -Q -value is: -><- +[?1034hvalue is: -><- scons: `.' is up to date. diff --git a/doc/generated/examples/factories_Chmod_1.xml b/doc/generated/examples/factories_Chmod_1.xml index a324ed4..1663b30 100644 --- a/doc/generated/examples/factories_Chmod_1.xml +++ b/doc/generated/examples/factories_Chmod_1.xml @@ -1,5 +1,5 @@ % scons -Q -Copy("file.out", "file.in") +[?1034hCopy("file.out", "file.in") Chmod("file.out", 0755) diff --git a/doc/generated/examples/factories_Copy1_1.xml b/doc/generated/examples/factories_Copy1_1.xml index 852412f..01ced08 100644 --- a/doc/generated/examples/factories_Copy1_1.xml +++ b/doc/generated/examples/factories_Copy1_1.xml @@ -1,4 +1,4 @@ % scons -Q -Copy("file.out", "file.in") +[?1034hCopy("file.out", "file.in") diff --git a/doc/generated/examples/factories_Copy2_1.xml b/doc/generated/examples/factories_Copy2_1.xml index 852412f..01ced08 100644 --- a/doc/generated/examples/factories_Copy2_1.xml +++ b/doc/generated/examples/factories_Copy2_1.xml @@ -1,4 +1,4 @@ % scons -Q -Copy("file.out", "file.in") +[?1034hCopy("file.out", "file.in") diff --git a/doc/generated/examples/factories_Copy3_1.xml b/doc/generated/examples/factories_Copy3_1.xml index bcb41ff..6876b29 100644 --- a/doc/generated/examples/factories_Copy3_1.xml +++ b/doc/generated/examples/factories_Copy3_1.xml @@ -1,6 +1,6 @@ % scons -Q -Copy("tempfile", "file.in") +[?1034hCopy("tempfile", "file.in") modify tempfile Copy("file.out", "tempfile") diff --git a/doc/generated/examples/factories_Delete1_1.xml b/doc/generated/examples/factories_Delete1_1.xml index e9a287e..f2bcdc4 100644 --- a/doc/generated/examples/factories_Delete1_1.xml +++ b/doc/generated/examples/factories_Delete1_1.xml @@ -1,6 +1,6 @@ % scons -Q -Delete("tempfile") +[?1034hDelete("tempfile") Copy("tempfile", "file.in") modify tempfile Copy("file.out", "tempfile") diff --git a/doc/generated/examples/factories_Delete2_1.xml b/doc/generated/examples/factories_Delete2_1.xml index 2be3c3a..069fa1c 100644 --- a/doc/generated/examples/factories_Delete2_1.xml +++ b/doc/generated/examples/factories_Delete2_1.xml @@ -1,5 +1,5 @@ % scons -Q -Delete("file.out") +[?1034hDelete("file.out") Copy("file.out", "file.in") diff --git a/doc/generated/examples/factories_Execute_1.xml b/doc/generated/examples/factories_Execute_1.xml index a7ae0c7..82a0c5a 100644 --- a/doc/generated/examples/factories_Execute_1.xml +++ b/doc/generated/examples/factories_Execute_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... Mkdir("/tmp/my_temp_directory") scons: done reading SConscript files. scons: Building targets ... diff --git a/doc/generated/examples/factories_Mkdir_1.xml b/doc/generated/examples/factories_Mkdir_1.xml index ea3d79d..2c4962e 100644 --- a/doc/generated/examples/factories_Mkdir_1.xml +++ b/doc/generated/examples/factories_Mkdir_1.xml @@ -1,6 +1,6 @@ % scons -Q -Delete("tempdir") +[?1034hDelete("tempdir") Mkdir("tempdir") Copy("tempdir/file.in", "file.in") process tempdir diff --git a/doc/generated/examples/factories_Move_1.xml b/doc/generated/examples/factories_Move_1.xml index a5e4ccd..b797692 100644 --- a/doc/generated/examples/factories_Move_1.xml +++ b/doc/generated/examples/factories_Move_1.xml @@ -1,6 +1,6 @@ % scons -Q -Copy("tempfile", "file.in") +[?1034hCopy("tempfile", "file.in") modify tempfile Move("file.out", "tempfile") diff --git a/doc/generated/examples/factories_Touch_1.xml b/doc/generated/examples/factories_Touch_1.xml index 7417fa4..1ae08b6 100644 --- a/doc/generated/examples/factories_Touch_1.xml +++ b/doc/generated/examples/factories_Touch_1.xml @@ -1,5 +1,5 @@ % scons -Q -Copy("file.out", "file.in") +[?1034hCopy("file.out", "file.in") Touch("file.out") diff --git a/doc/generated/examples/fileremoval_clean-ex1_1.xml b/doc/generated/examples/fileremoval_clean-ex1_1.xml index c76a7e5..07ee186 100644 --- a/doc/generated/examples/fileremoval_clean-ex1_1.xml +++ b/doc/generated/examples/fileremoval_clean-ex1_1.xml @@ -1,7 +1,7 @@ % scons -Q -build -o foo.out foo.in +[?1034hbuild -o foo.out foo.in % scons -Q -c -Removed foo.out +[?1034hRemoved foo.out Removed foo.log diff --git a/doc/generated/examples/fileremoval_noclean-ex1_1.xml b/doc/generated/examples/fileremoval_noclean-ex1_1.xml index 45bd878..9726156 100644 --- a/doc/generated/examples/fileremoval_noclean-ex1_1.xml +++ b/doc/generated/examples/fileremoval_noclean-ex1_1.xml @@ -1,11 +1,11 @@ % scons -Q -cc -o f1.o -c f1.c +[?1034hcc -o f1.o -c f1.c cc -o f2.o -c f2.c cc -o f3.o -c f3.c ar rc libfoo.a f1.o f2.o f3.o % scons -c -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Cleaning targets ... Removed f1.o diff --git a/doc/generated/examples/fileremoval_precious-ex1_1.xml b/doc/generated/examples/fileremoval_precious-ex1_1.xml index 36e5a25..86f1ea7 100644 --- a/doc/generated/examples/fileremoval_precious-ex1_1.xml +++ b/doc/generated/examples/fileremoval_precious-ex1_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o f1.o -c f1.c +[?1034hcc -o f1.o -c f1.c cc -o f2.o -c f2.c cc -o f3.o -c f3.c ar rc libfoo.a f1.o f2.o f3.o diff --git a/doc/generated/examples/hierarchy_Return_1.xml b/doc/generated/examples/hierarchy_Return_1.xml index e5ab7f7..e869a2e 100644 --- a/doc/generated/examples/hierarchy_Return_1.xml +++ b/doc/generated/examples/hierarchy_Return_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o bar/bar.o -c bar/bar.c +[?1034hcc -o bar/bar.o -c bar/bar.c cc -o foo/foo.o -c foo/foo.c ar rc libprog.a foo/foo.o bar/bar.o ranlib libprog.a diff --git a/doc/generated/examples/hierarchy_ex1_1.xml b/doc/generated/examples/hierarchy_ex1_1.xml index bb5cc7b..ad890e0 100644 --- a/doc/generated/examples/hierarchy_ex1_1.xml +++ b/doc/generated/examples/hierarchy_ex1_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o prog1/foo1.o -c prog1/foo1.c +[?1034hcc -o prog1/foo1.o -c prog1/foo1.c cc -o prog1/foo2.o -c prog1/foo2.c cc -o prog1/main.o -c prog1/main.c cc -o prog1/prog1 prog1/main.o prog1/foo1.o prog1/foo2.o diff --git a/doc/generated/examples/hierarchy_ex2_1.xml b/doc/generated/examples/hierarchy_ex2_1.xml index 800a921..5581784 100644 --- a/doc/generated/examples/hierarchy_ex2_1.xml +++ b/doc/generated/examples/hierarchy_ex2_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o lib/foo1.o -c lib/foo1.c +[?1034hcc -o lib/foo1.o -c lib/foo1.c cc -o src/prog/foo2.o -c src/prog/foo2.c cc -o src/prog/main.o -c src/prog/main.c cc -o src/prog/prog src/prog/main.o lib/foo1.o src/prog/foo2.o diff --git a/doc/generated/examples/hierarchy_ex3_1.xml b/doc/generated/examples/hierarchy_ex3_1.xml index 473c9f4..7d408c2 100644 --- a/doc/generated/examples/hierarchy_ex3_1.xml +++ b/doc/generated/examples/hierarchy_ex3_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o src/prog/foo2.o -c src/prog/foo2.c +[?1034hcc -o src/prog/foo2.o -c src/prog/foo2.c cc -o src/prog/main.o -c src/prog/main.c cc -o /usr/joe/lib/foo1.o -c /usr/joe/lib/foo1.c cc -o src/prog/prog src/prog/main.o /usr/joe/lib/foo1.o src/prog/foo2.o diff --git a/doc/generated/examples/install_ex1_1.xml b/doc/generated/examples/install_ex1_1.xml index 776f7e8..7df8618 100644 --- a/doc/generated/examples/install_ex1_1.xml +++ b/doc/generated/examples/install_ex1_1.xml @@ -1,7 +1,7 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q /usr/bin -Install file: "hello" as "/usr/bin/hello" +[?1034hInstall file: "hello" as "/usr/bin/hello" diff --git a/doc/generated/examples/install_ex2_1.xml b/doc/generated/examples/install_ex2_1.xml index 98de9c4..f05e500 100644 --- a/doc/generated/examples/install_ex2_1.xml +++ b/doc/generated/examples/install_ex2_1.xml @@ -1,7 +1,7 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o % scons -Q install -Install file: "hello" as "/usr/bin/hello" +[?1034hInstall file: "hello" as "/usr/bin/hello" diff --git a/doc/generated/examples/install_ex3_1.xml b/doc/generated/examples/install_ex3_1.xml index e306111..10299fd 100644 --- a/doc/generated/examples/install_ex3_1.xml +++ b/doc/generated/examples/install_ex3_1.xml @@ -1,6 +1,6 @@ % scons -Q install -cc -o goodbye.o -c goodbye.c +[?1034hcc -o goodbye.o -c goodbye.c cc -o goodbye goodbye.o Install file: "goodbye" as "/usr/bin/goodbye" cc -o hello.o -c hello.c diff --git a/doc/generated/examples/install_ex4_1.xml b/doc/generated/examples/install_ex4_1.xml index 36cd90c..af9ed3a 100644 --- a/doc/generated/examples/install_ex4_1.xml +++ b/doc/generated/examples/install_ex4_1.xml @@ -1,6 +1,6 @@ % scons -Q install -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o Install file: "hello" as "/usr/bin/hello-new" diff --git a/doc/generated/examples/install_ex5_1.xml b/doc/generated/examples/install_ex5_1.xml index 89f7c56..3ba111d 100644 --- a/doc/generated/examples/install_ex5_1.xml +++ b/doc/generated/examples/install_ex5_1.xml @@ -1,6 +1,6 @@ % scons -Q install -cc -o goodbye.o -c goodbye.c +[?1034hcc -o goodbye.o -c goodbye.c cc -o goodbye goodbye.o Install file: "goodbye" as "/usr/bin/goodbye-new" cc -o hello.o -c hello.c diff --git a/doc/generated/examples/java_JAVACLASSDIR_1.xml b/doc/generated/examples/java_JAVACLASSDIR_1.xml index 5e0709a..0ff651d 100644 --- a/doc/generated/examples/java_JAVACLASSDIR_1.xml +++ b/doc/generated/examples/java_JAVACLASSDIR_1.xml @@ -1,5 +1,5 @@ % scons -Q -javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java +[?1034hjavac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java javah -d native -classpath classes pkg.sub.Example1 pkg.sub.Example2 pkg.sub.Example3 diff --git a/doc/generated/examples/java_RMIC_1.xml b/doc/generated/examples/java_RMIC_1.xml index 4db895e..b16f894 100644 --- a/doc/generated/examples/java_RMIC_1.xml +++ b/doc/generated/examples/java_RMIC_1.xml @@ -1,5 +1,5 @@ % scons -Q -javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java +[?1034hjavac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java rmic -d outdir -classpath classes pkg.sub.Example1 pkg.sub.Example2 diff --git a/doc/generated/examples/java_jar1_1.xml b/doc/generated/examples/java_jar1_1.xml index de93227..d91429d 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 +[?1034hjavac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java jar cf test.jar classes diff --git a/doc/generated/examples/java_jar2_1.xml b/doc/generated/examples/java_jar2_1.xml index 9e942e2..a515df8 100644 --- a/doc/generated/examples/java_jar2_1.xml +++ b/doc/generated/examples/java_jar2_1.xml @@ -1,6 +1,6 @@ % scons -Q -javac -d classes -sourcepath prog1 prog1/Example1.java prog1/Example2.java +[?1034hjavac -d classes -sourcepath prog1 prog1/Example1.java prog1/Example2.java javac -d classes -sourcepath prog2 prog2/Example3.java prog2/Example4.java jar cf prog1.jar -C classes Example1.class -C classes Example2.class jar cf prog2.jar -C classes Example3.class -C classes Example4.class diff --git a/doc/generated/examples/java_java-classes_1.xml b/doc/generated/examples/java_java-classes_1.xml index 6f02f5f..67e2c3f 100644 --- a/doc/generated/examples/java_java-classes_1.xml +++ b/doc/generated/examples/java_java-classes_1.xml @@ -1,6 +1,6 @@ % scons -Q -javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java +[?1034hjavac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java % scons -Q classes -scons: `classes' is up to date. +[?1034hscons: `classes' is up to date. diff --git a/doc/generated/examples/java_java-classes_2.xml b/doc/generated/examples/java_java-classes_2.xml index 31f6028..f68082e 100644 --- a/doc/generated/examples/java_java-classes_2.xml +++ b/doc/generated/examples/java_java-classes_2.xml @@ -1,8 +1,8 @@ % scons -Q -javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java +[?1034hjavac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java % scons -Q -c classes -Removed classes/Example1.class +[?1034hRemoved classes/Example1.class Removed classes/AdditionalClass1.class Removed classes/Example2$Inner2.class Removed classes/Example2.class diff --git a/doc/generated/examples/java_java_1.xml b/doc/generated/examples/java_java_1.xml index 551a5d4..f740867 100644 --- a/doc/generated/examples/java_java_1.xml +++ b/doc/generated/examples/java_java_1.xml @@ -1,4 +1,4 @@ % scons -Q -javac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java +[?1034hjavac -d classes -sourcepath src src/Example1.java src/Example2.java src/Example3.java diff --git a/doc/generated/examples/java_javah_1.xml b/doc/generated/examples/java_javah_1.xml index 5e0709a..0ff651d 100644 --- a/doc/generated/examples/java_javah_1.xml +++ b/doc/generated/examples/java_javah_1.xml @@ -1,5 +1,5 @@ % scons -Q -javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java +[?1034hjavac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java javah -d native -classpath classes pkg.sub.Example1 pkg.sub.Example2 pkg.sub.Example3 diff --git a/doc/generated/examples/java_javah_file_1.xml b/doc/generated/examples/java_javah_file_1.xml index 163a53d..ed65b48 100644 --- a/doc/generated/examples/java_javah_file_1.xml +++ b/doc/generated/examples/java_javah_file_1.xml @@ -1,5 +1,5 @@ % scons -Q -javac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java +[?1034hjavac -d classes -sourcepath src/pkg/sub src/pkg/sub/Example1.java src/pkg/sub/Example2.java src/pkg/sub/Example3.java javah -o native.h -classpath classes pkg.sub.Example1 pkg.sub.Example2 pkg.sub.Example3 diff --git a/doc/generated/examples/lesssimple_ex2_1.xml b/doc/generated/examples/lesssimple_ex2_1.xml index 6093f0c..b212b8b 100644 --- a/doc/generated/examples/lesssimple_ex2_1.xml +++ b/doc/generated/examples/lesssimple_ex2_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o file1.o -c file1.c +[?1034hcc -o file1.o -c file1.c cc -o file2.o -c file2.c cc -o prog.o -c prog.c cc -o prog prog.o file1.o file2.o diff --git a/doc/generated/examples/lesssimple_ex3_1.xml b/doc/generated/examples/lesssimple_ex3_1.xml index b3ac2f0..6df4fee 100644 --- a/doc/generated/examples/lesssimple_ex3_1.xml +++ b/doc/generated/examples/lesssimple_ex3_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o file1.o -c file1.c +[?1034hcc -o file1.o -c file1.c cc -o file2.o -c file2.c cc -o prog.o -c prog.c cc -o program prog.o file1.o file2.o diff --git a/doc/generated/examples/lesssimple_ex3_2.xml b/doc/generated/examples/lesssimple_ex3_2.xml index 835f048..0ada0ec 100644 --- a/doc/generated/examples/lesssimple_ex3_2.xml +++ b/doc/generated/examples/lesssimple_ex3_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -cl /Fofile1.obj /c file1.c /nologo +[?1034hcl /Fofile1.obj /c file1.c /nologo cl /Fofile2.obj /c file2.c /nologo cl /Foprog.obj /c prog.c /nologo link /nologo /OUT:program.exe prog.obj file1.obj file2.obj diff --git a/doc/generated/examples/lesssimple_ex4_1.xml b/doc/generated/examples/lesssimple_ex4_1.xml index 87af41d..34e1210 100644 --- a/doc/generated/examples/lesssimple_ex4_1.xml +++ b/doc/generated/examples/lesssimple_ex4_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o bar1.o -c bar1.c +[?1034hcc -o bar1.o -c bar1.c cc -o bar2.o -c bar2.c cc -o bar bar1.o bar2.o cc -o foo.o -c foo.c diff --git a/doc/generated/examples/lesssimple_ex5_1.xml b/doc/generated/examples/lesssimple_ex5_1.xml index 0043e11..0256456 100644 --- a/doc/generated/examples/lesssimple_ex5_1.xml +++ b/doc/generated/examples/lesssimple_ex5_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o bar1.o -c bar1.c +[?1034hcc -o bar1.o -c bar1.c cc -o bar2.o -c bar2.c cc -o common1.o -c common1.c cc -o common2.o -c common2.c diff --git a/doc/generated/examples/lesssimple_target_1.xml b/doc/generated/examples/lesssimple_target_1.xml index a958acb..45d3064 100644 --- a/doc/generated/examples/lesssimple_target_1.xml +++ b/doc/generated/examples/lesssimple_target_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o new_hello hello.o diff --git a/doc/generated/examples/lesssimple_target_2.xml b/doc/generated/examples/lesssimple_target_2.xml index ef7b241..ec25cc2 100644 --- a/doc/generated/examples/lesssimple_target_2.xml +++ b/doc/generated/examples/lesssimple_target_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -cl /Fohello.obj /c hello.c /nologo +[?1034hcl /Fohello.obj /c hello.c /nologo link /nologo /OUT:new_hello.exe hello.obj embedManifestExeCheck(target, source, env) diff --git a/doc/generated/examples/libraries_SharedLibrary_1.xml b/doc/generated/examples/libraries_SharedLibrary_1.xml index 2300891..1e316ec 100644 --- a/doc/generated/examples/libraries_SharedLibrary_1.xml +++ b/doc/generated/examples/libraries_SharedLibrary_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o f1.os -c f1.c +[?1034hcc -o f1.os -c f1.c cc -o f2.os -c f2.c cc -o f3.os -c f3.c cc -o libfoo.so -shared f1.os f2.os f3.os diff --git a/doc/generated/examples/libraries_SharedLibrary_2.xml b/doc/generated/examples/libraries_SharedLibrary_2.xml index b6b484d..a0586d9 100644 --- a/doc/generated/examples/libraries_SharedLibrary_2.xml +++ b/doc/generated/examples/libraries_SharedLibrary_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -cl /Fof1.obj /c f1.c /nologo +[?1034hcl /Fof1.obj /c f1.c /nologo cl /Fof2.obj /c f2.c /nologo cl /Fof3.obj /c f3.c /nologo link /nologo /dll /out:foo.dll /implib:foo.lib f1.obj f2.obj f3.obj diff --git a/doc/generated/examples/libraries_ex1_1.xml b/doc/generated/examples/libraries_ex1_1.xml index bfd69b4..7c1a49d 100644 --- a/doc/generated/examples/libraries_ex1_1.xml +++ b/doc/generated/examples/libraries_ex1_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o f1.o -c f1.c +[?1034hcc -o f1.o -c f1.c cc -o f2.o -c f2.c cc -o f3.o -c f3.c ar rc libfoo.a f1.o f2.o f3.o diff --git a/doc/generated/examples/libraries_ex1_2.xml b/doc/generated/examples/libraries_ex1_2.xml index 912e7ad..462dc04 100644 --- a/doc/generated/examples/libraries_ex1_2.xml +++ b/doc/generated/examples/libraries_ex1_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -cl /Fof1.obj /c f1.c /nologo +[?1034hcl /Fof1.obj /c f1.c /nologo cl /Fof2.obj /c f2.c /nologo cl /Fof3.obj /c f3.c /nologo lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj diff --git a/doc/generated/examples/libraries_ex2_1.xml b/doc/generated/examples/libraries_ex2_1.xml index c43f7e9..c9462d4 100644 --- a/doc/generated/examples/libraries_ex2_1.xml +++ b/doc/generated/examples/libraries_ex2_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o f1.o -c f1.c +[?1034hcc -o f1.o -c f1.c cc -o f2.o -c f2.c cc -o f3.o -c f3.c ar rc libfoo.a f1.o f2.o f3.o diff --git a/doc/generated/examples/libraries_ex2_2.xml b/doc/generated/examples/libraries_ex2_2.xml index 84b4d75..1dba3b8 100644 --- a/doc/generated/examples/libraries_ex2_2.xml +++ b/doc/generated/examples/libraries_ex2_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -cl /Fof1.obj /c f1.c /nologo +[?1034hcl /Fof1.obj /c f1.c /nologo cl /Fof2.obj /c f2.c /nologo cl /Fof3.obj /c f3.c /nologo lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj diff --git a/doc/generated/examples/libraries_ex3_1.xml b/doc/generated/examples/libraries_ex3_1.xml index 9dd6ca9..f685376 100644 --- a/doc/generated/examples/libraries_ex3_1.xml +++ b/doc/generated/examples/libraries_ex3_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o prog.o -c prog.c +[?1034hcc -o prog.o -c prog.c cc -o prog prog.o -L/usr/lib -L/usr/local/lib -lm diff --git a/doc/generated/examples/libraries_ex3_2.xml b/doc/generated/examples/libraries_ex3_2.xml index e5ec4ce..714ec3e 100644 --- a/doc/generated/examples/libraries_ex3_2.xml +++ b/doc/generated/examples/libraries_ex3_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -cl /Foprog.obj /c prog.c /nologo +[?1034hcl /Foprog.obj /c prog.c /nologo link /nologo /OUT:prog.exe /LIBPATH:\usr\lib /LIBPATH:\usr\local\lib m.lib prog.obj embedManifestExeCheck(target, source, env) diff --git a/doc/generated/examples/libraries_objects_1.xml b/doc/generated/examples/libraries_objects_1.xml index 5d732da..fa80326 100644 --- a/doc/generated/examples/libraries_objects_1.xml +++ b/doc/generated/examples/libraries_objects_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o f1.o -c f1.c +[?1034hcc -o f1.o -c f1.c cc -o f3.o -c f3.c ar rc libfoo.a f1.o f2.o f3.o f4.o ranlib libfoo.a diff --git a/doc/generated/examples/mergeflags_MergeFlags1_1.xml b/doc/generated/examples/mergeflags_MergeFlags1_1.xml index 8a0c336..1697d6c 100644 --- a/doc/generated/examples/mergeflags_MergeFlags1_1.xml +++ b/doc/generated/examples/mergeflags_MergeFlags1_1.xml @@ -7,4 +7,6 @@ ^ SyntaxError: invalid syntax + +[?1034h diff --git a/doc/generated/examples/mergeflags_MergeFlags2_1.xml b/doc/generated/examples/mergeflags_MergeFlags2_1.xml index 1312c47..aabdc46 100644 --- a/doc/generated/examples/mergeflags_MergeFlags2_1.xml +++ b/doc/generated/examples/mergeflags_MergeFlags2_1.xml @@ -7,4 +7,6 @@ ^ SyntaxError: invalid syntax + +[?1034h diff --git a/doc/generated/examples/mergeflags_MergeFlags3_1.xml b/doc/generated/examples/mergeflags_MergeFlags3_1.xml index 8a0c336..1697d6c 100644 --- a/doc/generated/examples/mergeflags_MergeFlags3_1.xml +++ b/doc/generated/examples/mergeflags_MergeFlags3_1.xml @@ -7,4 +7,6 @@ ^ SyntaxError: invalid syntax + +[?1034h diff --git a/doc/generated/examples/misc_Exit_1.xml b/doc/generated/examples/misc_Exit_1.xml index 6af378f..8f4e0d5 100644 --- a/doc/generated/examples/misc_Exit_1.xml +++ b/doc/generated/examples/misc_Exit_1.xml @@ -1,7 +1,7 @@ % scons -Q FUTURE=1 -The FUTURE option is not supported yet! +[?1034hThe FUTURE option is not supported yet! % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/misc_FindFile1a_1.xml b/doc/generated/examples/misc_FindFile1a_1.xml index eca0328..5d95aaf 100644 --- a/doc/generated/examples/misc_FindFile1a_1.xml +++ b/doc/generated/examples/misc_FindFile1a_1.xml @@ -1,6 +1,6 @@ % scons -Q -None +[?1034hNone <class 'SCons.Node.FS.File'> exists scons: `.' is up to date. diff --git a/doc/generated/examples/misc_FindFile1b_1.xml b/doc/generated/examples/misc_FindFile1b_1.xml index 894b483..9ce02e5 100644 --- a/doc/generated/examples/misc_FindFile1b_1.xml +++ b/doc/generated/examples/misc_FindFile1b_1.xml @@ -1,6 +1,6 @@ % scons -Q -nonesuch.h: None +[?1034hnonesuch.h: None config.h: config.h private.h: src/include/private.h dist.h: include/dist.h diff --git a/doc/generated/examples/misc_FindFile1d_1.xml b/doc/generated/examples/misc_FindFile1d_1.xml index 5ab499f..224cb60 100644 --- a/doc/generated/examples/misc_FindFile1d_1.xml +++ b/doc/generated/examples/misc_FindFile1d_1.xml @@ -1,6 +1,6 @@ % scons -Q -sub1/multiple +[?1034hsub1/multiple sub2/multiple sub3/multiple scons: `.' is up to date. diff --git a/doc/generated/examples/misc_FindFile2_1.xml b/doc/generated/examples/misc_FindFile2_1.xml index 149c5d5..4f088db 100644 --- a/doc/generated/examples/misc_FindFile2_1.xml +++ b/doc/generated/examples/misc_FindFile2_1.xml @@ -1,6 +1,6 @@ % scons -Q -leaf +[?1034hleaf derived cat > derived leaf diff --git a/doc/generated/examples/misc_FindFile2_2.xml b/doc/generated/examples/misc_FindFile2_2.xml index 149c5d5..4f088db 100644 --- a/doc/generated/examples/misc_FindFile2_2.xml +++ b/doc/generated/examples/misc_FindFile2_2.xml @@ -1,6 +1,6 @@ % scons -Q -leaf +[?1034hleaf derived cat > derived leaf diff --git a/doc/generated/examples/misc_FindFile3_1.xml b/doc/generated/examples/misc_FindFile3_1.xml index 2c09fed..3b3e093 100644 --- a/doc/generated/examples/misc_FindFile3_1.xml +++ b/doc/generated/examples/misc_FindFile3_1.xml @@ -1,5 +1,5 @@ % scons -Q -build/leaf +[?1034hbuild/leaf scons: `.' is up to date. diff --git a/doc/generated/examples/misc_Flatten1_1.xml b/doc/generated/examples/misc_Flatten1_1.xml index 54720bb..804dbc2 100644 --- a/doc/generated/examples/misc_Flatten1_1.xml +++ b/doc/generated/examples/misc_Flatten1_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o prog1.o -c prog1.c +[?1034hcc -o prog1.o -c prog1.c cc -o prog2.o -c -DFOO prog2.c cc -o prog1 prog1.o prog2.o diff --git a/doc/generated/examples/misc_Flatten2_1.xml b/doc/generated/examples/misc_Flatten2_1.xml index 66161ec..9237519 100644 --- a/doc/generated/examples/misc_Flatten2_1.xml +++ b/doc/generated/examples/misc_Flatten2_1.xml @@ -3,4 +3,5 @@ AttributeError: 'NodeList' object has no attribute 'abspath': File "/home/my/project/SConstruct", line 8: print(object_file.abspath) +[?1034h diff --git a/doc/generated/examples/nodes_GetBuildPath_1.xml b/doc/generated/examples/nodes_GetBuildPath_1.xml index 376f65e..0000f23 100644 --- a/doc/generated/examples/nodes_GetBuildPath_1.xml +++ b/doc/generated/examples/nodes_GetBuildPath_1.xml @@ -1,5 +1,5 @@ % scons -Q -['foo.c', 'sub/dir/value'] +[?1034h['foo.c', 'sub/dir/value'] scons: `.' is up to date. diff --git a/doc/generated/examples/nodes_ex1_1.xml b/doc/generated/examples/nodes_ex1_1.xml index e7eb8c4..858e82e 100644 --- a/doc/generated/examples/nodes_ex1_1.xml +++ b/doc/generated/examples/nodes_ex1_1.xml @@ -1,6 +1,6 @@ % scons -Q -cc -o goodbye.o -c -DGOODBYE goodbye.c +[?1034hcc -o goodbye.o -c -DGOODBYE goodbye.c cc -o hello.o -c -DHELLO hello.c cc -o hello hello.o goodbye.o diff --git a/doc/generated/examples/nodes_ex1_2.xml b/doc/generated/examples/nodes_ex1_2.xml index a1ed1fb..db54d14 100644 --- a/doc/generated/examples/nodes_ex1_2.xml +++ b/doc/generated/examples/nodes_ex1_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -cl /Fogoodbye.obj /c goodbye.c -DGOODBYE +[?1034hcl /Fogoodbye.obj /c goodbye.c -DGOODBYE cl /Fohello.obj /c hello.c -DHELLO link /nologo /OUT:hello.exe hello.obj goodbye.obj embedManifestExeCheck(target, source, env) diff --git a/doc/generated/examples/nodes_exists_1.xml b/doc/generated/examples/nodes_exists_1.xml index a290b1c..4508298 100644 --- a/doc/generated/examples/nodes_exists_1.xml +++ b/doc/generated/examples/nodes_exists_1.xml @@ -1,6 +1,6 @@ % scons -Q -hello does not exist! +[?1034hhello does not exist! cc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/nodes_print_1.xml b/doc/generated/examples/nodes_print_1.xml index 11a3f45..33e5702 100644 --- a/doc/generated/examples/nodes_print_1.xml +++ b/doc/generated/examples/nodes_print_1.xml @@ -1,6 +1,6 @@ % scons -Q -The object file is: hello.o +[?1034hThe object file is: hello.o The program file is: hello cc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/nodes_print_2.xml b/doc/generated/examples/nodes_print_2.xml index a62b522..c948a78 100644 --- a/doc/generated/examples/nodes_print_2.xml +++ b/doc/generated/examples/nodes_print_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q -The object file is: hello.obj +[?1034hThe object file is: hello.obj The program file is: hello.exe cl /Fohello.obj /c hello.c /nologo link /nologo /OUT:hello.exe hello.obj diff --git a/doc/generated/examples/output_Progress-TARGET_1.xml b/doc/generated/examples/output_Progress-TARGET_1.xml index b233c6e..78a8e68 100644 --- a/doc/generated/examples/output_Progress-TARGET_1.xml +++ b/doc/generated/examples/output_Progress-TARGET_1.xml @@ -1,6 +1,6 @@ % scons -Q -Evaluating SConstruct +[?1034hEvaluating SConstruct Evaluating f1.c Evaluating f1.o cc -o f1.o -c f1.c diff --git a/doc/generated/examples/output_ex1_1.xml b/doc/generated/examples/output_ex1_1.xml index 535960b..f83cfb9 100644 --- a/doc/generated/examples/output_ex1_1.xml +++ b/doc/generated/examples/output_ex1_1.xml @@ -1,6 +1,6 @@ % scons -h -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. Type: 'scons program' to build the production program, diff --git a/doc/generated/examples/output_ex2_1.xml b/doc/generated/examples/output_ex2_1.xml index e951c3a..a877dbf 100644 --- a/doc/generated/examples/output_ex2_1.xml +++ b/doc/generated/examples/output_ex2_1.xml @@ -1,6 +1,6 @@ C:\>scons -h -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. Type: 'scons program' to build the production program. diff --git a/doc/generated/examples/output_ex2_2.xml b/doc/generated/examples/output_ex2_2.xml index 8dca6c3..5a6be24 100644 --- a/doc/generated/examples/output_ex2_2.xml +++ b/doc/generated/examples/output_ex2_2.xml @@ -1,6 +1,6 @@ % scons -h -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. Type: 'scons program' to build the production program. diff --git a/doc/generated/examples/output_gbf2_1.xml b/doc/generated/examples/output_gbf2_1.xml index c31b41a..ee5906c 100644 --- a/doc/generated/examples/output_gbf2_1.xml +++ b/doc/generated/examples/output_gbf2_1.xml @@ -1,9 +1,9 @@ % scons -Q -scons: `.' is up to date. +[?1034hscons: `.' is up to date. Build succeeded. % scons -Q fail=1 scons: *** [target] Source `source' not found, needed by target `target'. -FAILED!!!! +[?1034hFAILED!!!! Failed building target: Source `source' not found, needed by target `target'. diff --git a/doc/generated/examples/parseflags_ex1_1.xml b/doc/generated/examples/parseflags_ex1_1.xml index 79cdad6..6e5e720 100644 --- a/doc/generated/examples/parseflags_ex1_1.xml +++ b/doc/generated/examples/parseflags_ex1_1.xml @@ -7,4 +7,6 @@ ^ SyntaxError: invalid syntax + +[?1034h diff --git a/doc/generated/examples/parseflags_ex1_2.xml b/doc/generated/examples/parseflags_ex1_2.xml index b9c9cd2..ccd4b57 100644 --- a/doc/generated/examples/parseflags_ex1_2.xml +++ b/doc/generated/examples/parseflags_ex1_2.xml @@ -7,4 +7,6 @@ ^ SyntaxError: invalid syntax + +[?1034h diff --git a/doc/generated/examples/parseflags_ex2_1.xml b/doc/generated/examples/parseflags_ex2_1.xml index 79cdad6..6e5e720 100644 --- a/doc/generated/examples/parseflags_ex2_1.xml +++ b/doc/generated/examples/parseflags_ex2_1.xml @@ -7,4 +7,6 @@ ^ SyntaxError: invalid syntax + +[?1034h diff --git a/doc/generated/examples/parseflags_ex3_1.xml b/doc/generated/examples/parseflags_ex3_1.xml index 79cdad6..6e5e720 100644 --- a/doc/generated/examples/parseflags_ex3_1.xml +++ b/doc/generated/examples/parseflags_ex3_1.xml @@ -7,4 +7,6 @@ ^ SyntaxError: invalid syntax + +[?1034h diff --git a/doc/generated/examples/parseflags_ex4_1.xml b/doc/generated/examples/parseflags_ex4_1.xml index 79cdad6..6e5e720 100644 --- a/doc/generated/examples/parseflags_ex4_1.xml +++ b/doc/generated/examples/parseflags_ex4_1.xml @@ -7,4 +7,6 @@ ^ SyntaxError: invalid syntax + +[?1034h diff --git a/doc/generated/examples/repositories_CPPPATH3_1.xml b/doc/generated/examples/repositories_CPPPATH3_1.xml index d53ffdb..57af257 100644 --- a/doc/generated/examples/repositories_CPPPATH3_1.xml +++ b/doc/generated/examples/repositories_CPPPATH3_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o hello.o -c -Idir1 -I/r1/dir1 -I/r2/dir1 -Idir2 -I/r1/dir2 -I/r2/dir2 -Idir3 -I/r1/dir3 -I/r2/dir3 hello.c +[?1034hcc -o hello.o -c -Idir1 -I/r1/dir1 -I/r2/dir1 -Idir2 -I/r1/dir2 -I/r2/dir2 -Idir3 -I/r1/dir3 -I/r2/dir3 hello.c cc -o hello hello.o diff --git a/doc/generated/examples/repositories_CPPPATH_1.xml b/doc/generated/examples/repositories_CPPPATH_1.xml index 6c5a2d1..7e701f2 100644 --- a/doc/generated/examples/repositories_CPPPATH_1.xml +++ b/doc/generated/examples/repositories_CPPPATH_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o hello.o -c -I. -I/usr/repository1 hello.c +[?1034hcc -o hello.o -c -I. -I/usr/repository1 hello.c cc -o hello hello.o diff --git a/doc/generated/examples/repositories_ex1_1.xml b/doc/generated/examples/repositories_ex1_1.xml index a21fdc8..18ce76b 100644 --- a/doc/generated/examples/repositories_ex1_1.xml +++ b/doc/generated/examples/repositories_ex1_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o hello.o -c hello.c +[?1034hcc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/repositories_ex2_1.xml b/doc/generated/examples/repositories_ex2_1.xml index 819c936..beee012 100644 --- a/doc/generated/examples/repositories_ex2_1.xml +++ b/doc/generated/examples/repositories_ex2_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o hello.o -c /usr/repository1/hello.c +[?1034hcc -o hello.o -c /usr/repository1/hello.c cc -o hello hello.o diff --git a/doc/generated/examples/repositories_ex3_1.xml b/doc/generated/examples/repositories_ex3_1.xml index 76d69cd..9c1011f 100644 --- a/doc/generated/examples/repositories_ex3_1.xml +++ b/doc/generated/examples/repositories_ex3_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o hello.o -c /usr/repository2/hello.c +[?1034hcc -o hello.o -c /usr/repository2/hello.c cc -o hello hello.o diff --git a/doc/generated/examples/repositories_ex4_1.xml b/doc/generated/examples/repositories_ex4_1.xml index 8911683..2b68208 100644 --- a/doc/generated/examples/repositories_ex4_1.xml +++ b/doc/generated/examples/repositories_ex4_1.xml @@ -1,7 +1,7 @@ % cd /usr/repository1 % scons -Q -cc -o file1.o -c file1.c +[?1034hcc -o file1.o -c file1.c cc -o file2.o -c file2.c cc -o hello.o -c hello.c cc -o hello hello.o file1.o file2.o diff --git a/doc/generated/examples/repositories_quote1_1.xml b/doc/generated/examples/repositories_quote1_1.xml index d2ba624..02f387f 100644 --- a/doc/generated/examples/repositories_quote1_1.xml +++ b/doc/generated/examples/repositories_quote1_1.xml @@ -1,5 +1,5 @@ % scons -Q -cc -o hello.o -c -I. -I/usr/repository1 /usr/repository1/hello.c +[?1034hcc -o hello.o -c -I. -I/usr/repository1 /usr/repository1/hello.c cc -o hello hello.o diff --git a/doc/generated/examples/separate_builddir_1.xml b/doc/generated/examples/separate_builddir_1.xml index a763172..5cba77c 100644 --- a/doc/generated/examples/separate_builddir_1.xml +++ b/doc/generated/examples/separate_builddir_1.xml @@ -2,7 +2,7 @@ % ls src hello.c % scons -Q -cc -o build/hello.o -c build/hello.c +[?1034hcc -o build/hello.o -c build/hello.c cc -o build/hello build/hello.o % ls build hello hello.c hello.o diff --git a/doc/generated/examples/separate_builddir_sconscript_1.xml b/doc/generated/examples/separate_builddir_sconscript_1.xml index 5694a56..d78fadb 100644 --- a/doc/generated/examples/separate_builddir_sconscript_1.xml +++ b/doc/generated/examples/separate_builddir_sconscript_1.xml @@ -2,7 +2,7 @@ % ls src SConscript hello.c % scons -Q -cc -o build/hello.o -c build/hello.c +[?1034hcc -o build/hello.o -c build/hello.c cc -o build/hello build/hello.o % ls build SConscript hello hello.c hello.o diff --git a/doc/generated/examples/separate_duplicate0_1.xml b/doc/generated/examples/separate_duplicate0_1.xml index 207c5d7..a21e32b 100644 --- a/doc/generated/examples/separate_duplicate0_1.xml +++ b/doc/generated/examples/separate_duplicate0_1.xml @@ -2,7 +2,7 @@ % ls src hello.c % scons -Q -cc -o build/hello.o -c src/hello.c +[?1034hcc -o build/hello.o -c src/hello.c cc -o build/hello build/hello.o % ls build hello hello.o diff --git a/doc/generated/examples/separate_ex1_1.xml b/doc/generated/examples/separate_ex1_1.xml index 5694a56..d78fadb 100644 --- a/doc/generated/examples/separate_ex1_1.xml +++ b/doc/generated/examples/separate_ex1_1.xml @@ -2,7 +2,7 @@ % ls src SConscript hello.c % scons -Q -cc -o build/hello.o -c build/hello.c +[?1034hcc -o build/hello.o -c build/hello.c cc -o build/hello build/hello.o % ls build SConscript hello hello.c hello.o diff --git a/doc/generated/examples/separate_glob_builddir_sconscript_1.xml b/doc/generated/examples/separate_glob_builddir_sconscript_1.xml index 7cdb420..d4e69c7 100644 --- a/doc/generated/examples/separate_glob_builddir_sconscript_1.xml +++ b/doc/generated/examples/separate_glob_builddir_sconscript_1.xml @@ -2,7 +2,7 @@ % ls src SConscript f1.c f2.c f2.h % scons -Q -cc -o build/f1.o -c build/f1.c +[?1034hcc -o build/f1.o -c build/f1.c cc -o build/f2.o -c build/f2.c cc -o build/hello build/f1.o build/f2.o % ls build diff --git a/doc/generated/examples/sideeffect_parallel_1.xml b/doc/generated/examples/sideeffect_parallel_1.xml index 9478c52..6f5ee14 100644 --- a/doc/generated/examples/sideeffect_parallel_1.xml +++ b/doc/generated/examples/sideeffect_parallel_1.xml @@ -1,5 +1,5 @@ % scons -Q --jobs=2 -echo > file1.out data1 +[?1034hecho > file1.out data1 echo > file2.out data2 diff --git a/doc/generated/examples/sideeffect_shared_1.xml b/doc/generated/examples/sideeffect_shared_1.xml index 2abb806..34c8b94 100644 --- a/doc/generated/examples/sideeffect_shared_1.xml +++ b/doc/generated/examples/sideeffect_shared_1.xml @@ -1,5 +1,5 @@ % scons -Q --jobs=2 -./build --log logfile.txt file1.in file1.out +[?1034h./build --log logfile.txt file1.in file1.out ./build --log logfile.txt file2.in file2.out diff --git a/doc/generated/examples/sideeffect_simple_1.xml b/doc/generated/examples/sideeffect_simple_1.xml index e88630c..361c97a 100644 --- a/doc/generated/examples/sideeffect_simple_1.xml +++ b/doc/generated/examples/sideeffect_simple_1.xml @@ -7,4 +7,6 @@ ^ SyntaxError: invalid syntax + +[?1034h diff --git a/doc/generated/examples/simple_Object_1.xml b/doc/generated/examples/simple_Object_1.xml index 6d5c80d..7b98f8d 100644 --- a/doc/generated/examples/simple_Object_1.xml +++ b/doc/generated/examples/simple_Object_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... cc -o hello.o -c hello.c diff --git a/doc/generated/examples/simple_Object_2.xml b/doc/generated/examples/simple_Object_2.xml index 3686006..86f816d 100644 --- a/doc/generated/examples/simple_Object_2.xml +++ b/doc/generated/examples/simple_Object_2.xml @@ -1,6 +1,6 @@ C:\>scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... cl /Fohello.obj /c hello.c /nologo diff --git a/doc/generated/examples/simple_clean_1.xml b/doc/generated/examples/simple_clean_1.xml index 21adbe7..fffdb38 100644 --- a/doc/generated/examples/simple_clean_1.xml +++ b/doc/generated/examples/simple_clean_1.xml @@ -1,13 +1,13 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... cc -o hello.o -c hello.c cc -o hello hello.o scons: done building targets. % scons -c -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Cleaning targets ... Removed hello.o diff --git a/doc/generated/examples/simple_clean_2.xml b/doc/generated/examples/simple_clean_2.xml index 26f3c37..b0ec400 100644 --- a/doc/generated/examples/simple_clean_2.xml +++ b/doc/generated/examples/simple_clean_2.xml @@ -1,6 +1,6 @@ C:\>scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... cl /Fohello.obj /c hello.c /nologo @@ -8,7 +8,7 @@ link /nologo /OUT:hello.exe hello.obj embedManifestExeCheck(target, source, env) scons: done building targets. C:\>scons -c -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Cleaning targets ... Removed hello.obj diff --git a/doc/generated/examples/simple_declarative_1.xml b/doc/generated/examples/simple_declarative_1.xml index 01061cf..4733089 100644 --- a/doc/generated/examples/simple_declarative_1.xml +++ b/doc/generated/examples/simple_declarative_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... Calling Program('hello.c') Calling Program('goodbye.c') Finished calling Program() diff --git a/doc/generated/examples/simple_ex1_1.xml b/doc/generated/examples/simple_ex1_1.xml index 5833ede..e3b9262 100644 --- a/doc/generated/examples/simple_ex1_1.xml +++ b/doc/generated/examples/simple_ex1_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... cc -o hello.o -c hello.c diff --git a/doc/generated/examples/simple_ex1_2.xml b/doc/generated/examples/simple_ex1_2.xml index f0e07a1..91257dd 100644 --- a/doc/generated/examples/simple_ex1_2.xml +++ b/doc/generated/examples/simple_ex1_2.xml @@ -1,6 +1,6 @@ C:\>scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... cl /Fohello.obj /c hello.c /nologo diff --git a/doc/generated/examples/simple_ex1_3.xml b/doc/generated/examples/simple_ex1_3.xml index f0e07a1..91257dd 100644 --- a/doc/generated/examples/simple_ex1_3.xml +++ b/doc/generated/examples/simple_ex1_3.xml @@ -1,6 +1,6 @@ C:\>scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... cl /Fohello.obj /c hello.c /nologo diff --git a/doc/generated/examples/simple_ex1_4.xml b/doc/generated/examples/simple_ex1_4.xml index 80c7b63..ea6c6a9 100644 --- a/doc/generated/examples/simple_ex1_4.xml +++ b/doc/generated/examples/simple_ex1_4.xml @@ -1,6 +1,6 @@ C:\>scons -Q -cl /Fohello.obj /c hello.c /nologo +[?1034hcl /Fohello.obj /c hello.c /nologo link /nologo /OUT:hello.exe hello.obj embedManifestExeCheck(target, source, env) diff --git a/doc/generated/examples/simple_java_1.xml b/doc/generated/examples/simple_java_1.xml index 75cc6cc..16f8c28 100644 --- a/doc/generated/examples/simple_java_1.xml +++ b/doc/generated/examples/simple_java_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... scons: done reading SConscript files. scons: Building targets ... javac -d classes -sourcepath src src/hello.java diff --git a/doc/generated/examples/sourcecode_bitkeeper_1.xml b/doc/generated/examples/sourcecode_bitkeeper_1.xml index a070ada..71c656a 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 +[?1034hbk get hello.c cc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/sourcecode_cvs_1.xml b/doc/generated/examples/sourcecode_cvs_1.xml index 9ec7cd4..a2da87f 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 +[?1034hcvs -d /usr/local/CVS co hello.c cc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/sourcecode_rcs_1.xml b/doc/generated/examples/sourcecode_rcs_1.xml index 5e120eb..abb8448 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 +[?1034hco hello.c cc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/sourcecode_sccs_1.xml b/doc/generated/examples/sourcecode_sccs_1.xml index 354b680..fb0e112 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 +[?1034hsccs get hello.c cc -o hello.o -c hello.c cc -o hello hello.o diff --git a/doc/generated/examples/tasks_ex1_1.xml b/doc/generated/examples/tasks_ex1_1.xml index 4885fde..85ca58a 100644 --- a/doc/generated/examples/tasks_ex1_1.xml +++ b/doc/generated/examples/tasks_ex1_1.xml @@ -1,6 +1,6 @@ % scons -Q -cat < test.bar > test.h +[?1034hcat < test.bar > test.h cc -o app main.cpp cat < foo.bar2 > foo.cpp cc -o app2 main2.cpp foo.cpp diff --git a/doc/generated/examples/troubleshoot_Dump_1.xml b/doc/generated/examples/troubleshoot_Dump_1.xml index 281fed7..f939ad7 100644 --- a/doc/generated/examples/troubleshoot_Dump_1.xml +++ b/doc/generated/examples/troubleshoot_Dump_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... File "/home/my/project/SConstruct", line 2 print env.Dump() diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml index 78cd84b..dee98f4 100644 --- a/doc/generated/examples/troubleshoot_Dump_2.xml +++ b/doc/generated/examples/troubleshoot_Dump_2.xml @@ -1,6 +1,6 @@ C:\>scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... File "/home/my/project/SConstruct", line 2 print env.Dump() diff --git a/doc/generated/examples/troubleshoot_Dump_ENV_1.xml b/doc/generated/examples/troubleshoot_Dump_ENV_1.xml index bd674a6..ca6fdbd 100644 --- a/doc/generated/examples/troubleshoot_Dump_ENV_1.xml +++ b/doc/generated/examples/troubleshoot_Dump_ENV_1.xml @@ -1,6 +1,6 @@ % scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... File "/home/my/project/SConstruct", line 2 print env.Dump('ENV') diff --git a/doc/generated/examples/troubleshoot_Dump_ENV_2.xml b/doc/generated/examples/troubleshoot_Dump_ENV_2.xml index c9f9258..d94656a 100644 --- a/doc/generated/examples/troubleshoot_Dump_ENV_2.xml +++ b/doc/generated/examples/troubleshoot_Dump_ENV_2.xml @@ -1,6 +1,6 @@ C:\>scons -scons: Reading SConscript files ... +[?1034hscons: Reading SConscript files ... File "/home/my/project/SConstruct", line 2 print env.Dump('ENV') diff --git a/doc/generated/examples/troubleshoot_explain1_1.xml b/doc/generated/examples/troubleshoot_explain1_1.xml index 2a9547d..9ce68da 100644 --- a/doc/generated/examples/troubleshoot_explain1_1.xml +++ b/doc/generated/examples/troubleshoot_explain1_1.xml @@ -1,8 +1,8 @@ % scons -Q -cp file.in file.oout +[?1034hcp file.in file.oout % scons -Q -cp file.in file.oout +[?1034hcp file.in file.oout % scons -Q -cp file.in file.oout +[?1034hcp file.in file.oout diff --git a/doc/generated/examples/troubleshoot_explain1_2.xml b/doc/generated/examples/troubleshoot_explain1_2.xml index 9864cd7..f12ba00 100644 --- a/doc/generated/examples/troubleshoot_explain1_2.xml +++ b/doc/generated/examples/troubleshoot_explain1_2.xml @@ -1,5 +1,5 @@ % scons -Q --debug=explain -scons: building `file.out' because it doesn't exist +[?1034hscons: building `file.out' because it doesn't exist cp file.in file.oout diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index 36d9139..702da50 100644 --- a/doc/generated/examples/troubleshoot_explain1_3.xml +++ b/doc/generated/examples/troubleshoot_explain1_3.xml @@ -1,7 +1,7 @@ % scons -Q --warn=target-not-built -cp file.in file.oout +[?1034hcp 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 "/Users/bdbaddog/devel/scons/hg/scons/src/script/scons.py", line 201, in <module> diff --git a/doc/generated/examples/troubleshoot_explain2_1.xml b/doc/generated/examples/troubleshoot_explain2_1.xml index cd95a44..3f9fdae 100644 --- a/doc/generated/examples/troubleshoot_explain2_1.xml +++ b/doc/generated/examples/troubleshoot_explain2_1.xml @@ -1,12 +1,12 @@ % scons -Q -cc -o file1.o -c file1.c +[?1034hcc -o file1.o -c file1.c cc -o file2.o -c file2.c cc -o file3.o -c file3.c cc -o prog file1.o file2.o file3.o % [CHANGE THE CONTENTS OF file2.c] % scons -Q --debug=explain -scons: rebuilding `file2.o' because `file2.c' changed +[?1034hscons: rebuilding `file2.o' because `file2.c' changed cc -o file2.o -c file2.c scons: rebuilding `prog' because `file2.o' changed cc -o prog file1.o file2.o file3.o diff --git a/doc/generated/examples/troubleshoot_explain3_1.xml b/doc/generated/examples/troubleshoot_explain3_1.xml index bacb7e8..d52110f 100644 --- a/doc/generated/examples/troubleshoot_explain3_1.xml +++ b/doc/generated/examples/troubleshoot_explain3_1.xml @@ -1,12 +1,12 @@ % scons -Q -cc -o file1.o -c -I. file1.c +[?1034hcc -o file1.o -c -I. file1.c cc -o file2.o -c -I. file2.c cc -o file3.o -c -I. file3.c cc -o prog file1.o file2.o file3.o % [CHANGE THE CONTENTS OF hello.h] % scons -Q --debug=explain -scons: rebuilding `file1.o' because `hello.h' changed +[?1034hscons: rebuilding `file1.o' because `hello.h' changed cc -o file1.o -c -I. file1.c scons: rebuilding `file3.o' because `hello.h' changed cc -o file3.o -c -I. file3.c diff --git a/doc/generated/examples/troubleshoot_findlibs_1.xml b/doc/generated/examples/troubleshoot_findlibs_1.xml index 8fc4e5f..95f317c 100644 --- a/doc/generated/examples/troubleshoot_findlibs_1.xml +++ b/doc/generated/examples/troubleshoot_findlibs_1.xml @@ -1,6 +1,6 @@ % scons -Q --debug=findlibs - findlibs: looking for 'libfoo.a' in 'libs1' ... +[?1034h findlibs: looking for 'libfoo.a' in 'libs1' ... findlibs: ... FOUND 'libfoo.a' in 'libs1' findlibs: looking for 'libfoo.so' in 'libs1' ... findlibs: looking for 'libfoo.so' in 'libs2' ... diff --git a/doc/generated/examples/troubleshoot_stacktrace_1.xml b/doc/generated/examples/troubleshoot_stacktrace_1.xml index cc3ca7b..a048468 100644 --- a/doc/generated/examples/troubleshoot_stacktrace_1.xml +++ b/doc/generated/examples/troubleshoot_stacktrace_1.xml @@ -1,4 +1,5 @@ % scons -Q scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'. +[?1034h diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml index a86a5dd..9a76147 100644 --- a/doc/generated/examples/troubleshoot_stacktrace_2.xml +++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml @@ -4,10 +4,11 @@ scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'. scons: internal stack trace: File "bootstrap/src/engine/SCons/Job.py", line 199, in start task.prepare() - File "bootstrap/src/engine/SCons/Script/Main.py", line 174, in 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 executor.prepare() File "bootstrap/src/engine/SCons/Executor.py", line 430, in prepare raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0])) +[?1034h diff --git a/doc/generated/examples/troubleshoot_taskmastertrace_1.xml b/doc/generated/examples/troubleshoot_taskmastertrace_1.xml index 578951d..3ea9fd0 100644 --- a/doc/generated/examples/troubleshoot_taskmastertrace_1.xml +++ b/doc/generated/examples/troubleshoot_taskmastertrace_1.xml @@ -1,6 +1,6 @@ % scons -Q --taskmastertrace=- prog - +[?1034h Taskmaster: Looking for a node to evaluate Taskmaster: Considering node <no_state 0 'prog'> and its children: Taskmaster: <no_state 0 'prog.o'> diff --git a/doc/generated/examples/troubleshoot_tree1_1.xml b/doc/generated/examples/troubleshoot_tree1_1.xml index 4ccadc6..882f625 100644 --- a/doc/generated/examples/troubleshoot_tree1_1.xml +++ b/doc/generated/examples/troubleshoot_tree1_1.xml @@ -1,6 +1,6 @@ % scons -Q --tree=all -cc -o f1.o -c -I. f1.c +[?1034hcc -o f1.o -c -I. f1.c cc -o f2.o -c -I. f2.c cc -o f3.o -c -I. f3.c cc -o prog f1.o f2.o f3.o diff --git a/doc/generated/examples/troubleshoot_tree1_2.xml b/doc/generated/examples/troubleshoot_tree1_2.xml index 0bd4874..6a14eb4 100644 --- a/doc/generated/examples/troubleshoot_tree1_2.xml +++ b/doc/generated/examples/troubleshoot_tree1_2.xml @@ -1,6 +1,6 @@ % scons -Q --tree=all f2.o -cc -o f2.o -c -I. f2.c +[?1034hcc -o f2.o -c -I. f2.c +-f2.o +-f2.c +-inc.h diff --git a/doc/generated/examples/troubleshoot_tree1_3.xml b/doc/generated/examples/troubleshoot_tree1_3.xml index 75fa841..c6ab142 100644 --- a/doc/generated/examples/troubleshoot_tree1_3.xml +++ b/doc/generated/examples/troubleshoot_tree1_3.xml @@ -1,6 +1,6 @@ % scons -Q --tree=all f1.o f3.o -cc -o f1.o -c -I. f1.c +[?1034hcc -o f1.o -c -I. f1.c +-f1.o +-f1.c +-inc.h diff --git a/doc/generated/examples/troubleshoot_tree1_4.xml b/doc/generated/examples/troubleshoot_tree1_4.xml index 409bce9..453234b 100644 --- a/doc/generated/examples/troubleshoot_tree1_4.xml +++ b/doc/generated/examples/troubleshoot_tree1_4.xml @@ -1,6 +1,6 @@ % scons -Q --tree=status -cc -o f1.o -c -I. f1.c +[?1034hcc -o f1.o -c -I. f1.c cc -o f2.o -c -I. f2.c cc -o f3.o -c -I. f3.c cc -o prog f1.o f2.o f3.o diff --git a/doc/generated/examples/troubleshoot_tree1_5.xml b/doc/generated/examples/troubleshoot_tree1_5.xml index b852ab0..74b502c 100644 --- a/doc/generated/examples/troubleshoot_tree1_5.xml +++ b/doc/generated/examples/troubleshoot_tree1_5.xml @@ -1,6 +1,6 @@ % scons -Q --tree=derived -cc -o f1.o -c -I. f1.c +[?1034hcc -o f1.o -c -I. f1.c cc -o f2.o -c -I. f2.c cc -o f3.o -c -I. f3.c cc -o prog f1.o f2.o f3.o diff --git a/doc/generated/examples/troubleshoot_tree1_6.xml b/doc/generated/examples/troubleshoot_tree1_6.xml index a0d42d7..ec25851 100644 --- a/doc/generated/examples/troubleshoot_tree1_6.xml +++ b/doc/generated/examples/troubleshoot_tree1_6.xml @@ -1,6 +1,6 @@ % scons -Q --tree=derived,status -cc -o f1.o -c -I. f1.c +[?1034hcc -o f1.o -c -I. f1.c cc -o f2.o -c -I. f2.c cc -o f3.o -c -I. f3.c cc -o prog f1.o f2.o f3.o diff --git a/doc/generated/examples/troubleshoot_tree2_1.xml b/doc/generated/examples/troubleshoot_tree2_1.xml index 85febf5..08f29fa 100644 --- a/doc/generated/examples/troubleshoot_tree2_1.xml +++ b/doc/generated/examples/troubleshoot_tree2_1.xml @@ -1,6 +1,6 @@ % scons -Q --tree=all -cc -o f1.o -c -I. f1.c +[?1034hcc -o f1.o -c -I. f1.c cc -o f2.o -c -I. f2.c cc -o f3.o -c -I. f3.c ar rc libfoo.a f1.o f2.o f3.o diff --git a/doc/generated/examples/troubleshoot_tree2_2.xml b/doc/generated/examples/troubleshoot_tree2_2.xml index 5380fad..e574184 100644 --- a/doc/generated/examples/troubleshoot_tree2_2.xml +++ b/doc/generated/examples/troubleshoot_tree2_2.xml @@ -1,6 +1,6 @@ % scons -Q --tree=prune -cc -o f1.o -c -I. f1.c +[?1034hcc -o f1.o -c -I. f1.c cc -o f2.o -c -I. f2.c cc -o f3.o -c -I. f3.c ar rc libfoo.a f1.o f2.o f3.o diff --git a/doc/generated/examples/variants_ex_1.xml b/doc/generated/examples/variants_ex_1.xml index 12a14d6..745073f 100644 --- a/doc/generated/examples/variants_ex_1.xml +++ b/doc/generated/examples/variants_ex_1.xml @@ -1,6 +1,6 @@ % scons -Q OS=linux -Install file: "build/linux/world/world.h" as "export/linux/include/world.h" +[?1034hInstall file: "build/linux/world/world.h" as "export/linux/include/world.h" cc -o build/linux/hello/hello.o -c -Iexport/linux/include build/linux/hello/hello.c cc -o build/linux/world/world.o -c -Iexport/linux/include build/linux/world/world.c ar rc build/linux/world/libworld.a build/linux/world/world.o diff --git a/doc/generated/examples/variants_ex_2.xml b/doc/generated/examples/variants_ex_2.xml index c129cc4..2dc5a28 100644 --- a/doc/generated/examples/variants_ex_2.xml +++ b/doc/generated/examples/variants_ex_2.xml @@ -1,6 +1,6 @@ C:\>scons -Q OS=windows -Install file: "build/windows/world/world.h" as "export/windows/include/world.h" +[?1034hInstall file: "build/windows/world/world.h" as "export/windows/include/world.h" cl /Fobuild\windows\hello\hello.obj /c build\windows\hello\hello.c /nologo /Iexport\windows\include cl /Fobuild\windows\world\world.obj /c build\windows\world\world.c /nologo /Iexport\windows\include lib /nologo /OUT:build\windows\world\world.lib build\windows\world\world.obj -- cgit v0.12 From 90be727f1bc7bcf8a4f781c9384f0e72f5f24358 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 14 Jun 2017 10:57:25 -0400 Subject: remove obsolete aegis related files --- src/RELEASE.txt | 2 +- src/test_aegistests.py | 81 -------------------------------------------------- 2 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 src/test_aegistests.py diff --git a/src/RELEASE.txt b/src/RELEASE.txt index d71619d..07eaaf4 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,4 +1,4 @@ - A new SCons checkpoint release, 2.7.0.alpha.yyyymmdd, is now available + A new SCons checkpoint release, 3.0.0.alpha.yyyymmdd, is now available on the SCons download page: http://www.scons.org/download.php diff --git a/src/test_aegistests.py b/src/test_aegistests.py deleted file mode 100644 index 57adc1d..0000000 --- a/src/test_aegistests.py +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env python -# -# __COPYRIGHT__ -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -""" -Verify that we have proper Copyright notices on all the right files -in our distributions. - -Note that this is a packaging test, not a functional test, so the -name of this script doesn't end in *Tests.py. -""" - -import os -import popen2 -import re -import sys - -import TestSCons - -test = TestSCons.TestSCons() - -try: - popen2.Popen3 -except AttributeError: - def get_stdout(command): - (tochild, fromchild, childerr) = os.popen3(command) - tochild.close() - return fromchild.read() -else: - def get_stdout(command): - p = popen2.Popen3(command, 1) - p.tochild.close() - return p.fromchild.read() - -output = get_stdout('aegis -list -unformatted pf') +\ - get_stdout('aegis -list -unformatted cf') -lines = output.split('\n')[:-1] -sources = [x for x in lines if x[:7] == 'source '] - -re1 = re.compile(r' src/.*Tests\.py') -re2 = re.compile(r' src/test_.*\.py') -re3 = re.compile(r' test/.*\.py') - -def filename_is_a_test(x): - return re1.search(x) or re2.search(x) or re3.search(x) - -test_files = [file for file in sources if filename_is_a_test(file)] - -if test_files: - sys.stderr.write("Found the following files with test names not marked as Aegis tests:\n") - sys.stderr.write('\t' + '\n\t'.join(test_files) + '\n') - test.fail_test(1) - -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: -- cgit v0.12 From 7380db9e5afa9953150a23cabc73d2d63182cc31 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 14 Jun 2017 11:00:23 -0400 Subject: minor edits to Announce to update URLS --- src/Announce.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Announce.txt b/src/Announce.txt index 266988f..a7b172d 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -11,11 +11,11 @@ scripts, allowing you to use the full power of a real scripting language to solve build problems. You do not, however, need to know Python to use SCons effectively. -Please go to http://www.scons.org/download.php to get the latest production +Please go to http://scons.org/pages/download.html to get the latest production release of SCons. So that everyone using SCons can help each other learn how to use it more -effectively, please go to http://scons.org/lists.php#users to sign up for +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 -- cgit v0.12 From 299cc026065c2f580f9aff3364324b3322d48cc1 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 14 Jun 2017 11:45:17 -0400 Subject: updates for 3.0.0 alpha --- src/Announce.txt | 30 ++++++++++++++++++++++++++++-- src/RELEASE.txt | 27 ++------------------------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/Announce.txt b/src/Announce.txt index a7b172d..122de68 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -18,14 +18,40 @@ 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.0 Alpha 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 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 YET.* - - Please note the following important changes since release 2.4.1: + This is the initial release supporting both python 3.5+ and 2.7.x and pypy + There are some important changes: + + - Any print statements must now use python 3 syntax of "print()" + - All node content should be in bytes. This is the default in python 2.7.x, + 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 + 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 + need to remove your sconsign file. This should be resolves shortly, but + regardless switching between python 2.7.x and 3.5+ will not use compatible + sconsigns and as such incremental builds should be expected to rebuild + anything changed since the previous scons run with the same version of python. + + - Removed deprecated tools CVS, Perforce, BitKeeper, RCS, SCCS, Subversion. + - Removed deprecated module SCons.Sig + - See CHANGES.txt for more details on other changes + + + + + Please note the following important changes since release 2.4.1: We're enhancing implicit language scanning functionality to improve correctness. SCons now honors scanner keys for implicit dependencies and correctly changes scanner type (if necessary) when traversing diff --git a/src/RELEASE.txt b/src/RELEASE.txt index 07eaaf4..f87f889 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -3,35 +3,12 @@ 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 2.5.1: NEW FUNCTIONALITY - - List new features (presumably why a checkpoint is being released) + - Initial support for Python 3.0 DEPRECATED FUNCTIONALITY -- cgit v0.12 From cce1fd3b26037b4dd0044a4b1795ec5c98f0bf3b Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 14 Jun 2017 12:23:49 -0400 Subject: Prep for 3.0.0 alpha release --- ReleaseConfig | 4 ++-- src/Announce.txt | 10 +++++++--- src/CHANGES.txt | 50 ++++++++++++++++---------------------------------- src/RELEASE.txt | 3 ++- 4 files changed, 27 insertions(+), 40 deletions(-) diff --git a/ReleaseConfig b/ReleaseConfig index 517b5db..331380a 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 = (2, 7, 0, 'alpha', 0) +version_tuple = (3, 0, 0, 'alpha', 0) # Python versions prior to unsupported_python_version cause a fatal error # when that version is used. Python versions prior to deprecate_python_version @@ -51,7 +51,7 @@ deprecated_python_version = (2, 7, 0) #month_year = 'December 2012' # If copyright years is not given, the release year is used as the end. -copyright_years = '2001 - 2016' +copyright_years = '2001 - 2017' # Local Variables: # tab-width:4 diff --git a/src/Announce.txt b/src/Announce.txt index 122de68..488615a 100644 --- a/src/Announce.txt +++ b/src/Announce.txt @@ -25,7 +25,7 @@ RELEASE 3.0.0 Alpha 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 YET.* + *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: @@ -43,12 +43,16 @@ RELEASE 3.0.0 Alpha regardless switching between python 2.7.x and 3.5+ will not use compatible sconsigns and as such incremental builds should be expected to rebuild anything changed since the previous scons run with the same version of python. + - It is likely that migrating from 2.5.1 -> 3.0.0 alpha will cause rebuilds due + to the significant number of changes in the codebase. - Removed deprecated tools CVS, Perforce, BitKeeper, RCS, SCCS, Subversion. - Removed deprecated module SCons.Sig - See CHANGES.txt for more details on other changes - - + - 3.0.0 should be slightly faster than 2.5.1. Changes yielded a 15% speed up for + null incremental builds. + - Updated D language scanner support to latest: 2.071.1. + - python -m SCons should now run SCons if it's installed PYTHONPATH Please note the following important changes since release 2.4.1: diff --git a/src/CHANGES.txt b/src/CHANGES.txt index ada66b0..b3fec9f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -4,37 +4,9 @@ Change Log -RELEASE VERSION/DATE TO BE FILLED IN LATER - - From John Doe: - - - Whatever John Doe did. - RELEASE VERSION/DATE TO BE FILLED IN LATER - From Daniel Moody: - - Updated the QMTest/TestCmd.py so when using the - preserve option, it will be able to print unicode directories. - - Also updated test/scons-time/run/option/verbose.py that was - not taking into account the output when PRESERVE was enabled - - From Gaurav Juvekar: - - Fix issue #2832: Expand construction variables in 'chdir' argument of builders. (PR #463) - - Fix issue #2910: Make --tree=all handle Unicode. (PR #427) - - Fix issue #2788: Fix typo in documentation example for sconf. (PR #388) - - From Manish Vachharajani: - - Update debian rules, compat, and control to not use features - deprecated or obsolete in later versions of debhelpers - - Update python version to 2.7 in debian/control - - From Russel Winder: - - Reordered the default D tools from "dmd, gdc, ldc" to "dmd, ldc, gdc". - - Add a ProgramAllAtOnce builder to the dmd, ldc, and gdc tools. (PR #448) - - Deprecate a file name exception for very old Fedora LDC installation. - - gdc can now handle building shared objects (tested for version 6.3.0). - From William Blevins: - Updated D language scanner support to latest: 2.071.1. (PR #1924) https://dlang.org/spec/module.html accessed 11 August 2016 @@ -57,10 +29,6 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Fixed MSVSProject example code (http://scons.tigris.org/issues/show_bug.cgi?id=2979) - Defined MS SDK 10.0 and Changed VS 2015 to use SDK 10.0 - From Daniel Moody: - - Fixed msvs.py for Visual Studio generated projects which were - creating invalid xml for greater than and less than symbols. - From Daniel Holth: - Add basic support for PyPy (by deleting __slots__ from Node with a metaclass on PyPy); wrap most-used open() calls in 'with' statements to @@ -68,6 +36,11 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Add __main__.py for `python -m SCons` in case it is on PYTHONPATH. - Always use highest available pickle protocol for efficiency. + From Gaurav Juvekar: + - Fix issue #2832: Expand construction variables in 'chdir' argument of builders. (PR #463) + - Fix issue #2910: Make --tree=all handle Unicode. (PR #427) + - Fix issue #2788: Fix typo in documentation example for sconf. (PR #388) + From Alexey Klimkin: - Use memoization to optimize PATH evaluation across all dependencies per node. (PR #345) @@ -76,6 +49,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Fixed msvs.py for Visual Studio Express editions that would report "Error : ValueError: invalid literal for float(): 10.0Exp". + From Rick Lupton: + - Update LaTeX scanner to understand \import and related commands From Paweł Tomulik: - Fixed the issue with LDMODULEVERSIONFLAGS reported by Tim Jennes @@ -86,13 +61,20 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Added LoadableModule to the list of global functions (DefaultEnvironment builders). - From Rick Lupton: - - Update LaTeX scanner to understand \import and related commands + From Manish Vachharajani: + - Update debian rules, compat, and control to not use features + deprecated or obsolete in later versions of debhelpers + - Update python version to 2.7 in debian/control From Richard Viney: - Fixed PCHPDBFLAGS causing a deprecation warning on MSVC v8 and later when using PCHs and PDBs together. + From Russel Winder: + - Reordered the default D tools from "dmd, gdc, ldc" to "dmd, ldc, gdc". + - Add a ProgramAllAtOnce builder to the dmd, ldc, and gdc tools. (PR #448) + - Deprecate a file name exception for very old Fedora LDC installation. + - gdc can now handle building shared objects (tested for version 6.3.0). RELEASE 2.5.1 - Mon, 03 Nov 2016 13:37:42 -0400 diff --git a/src/RELEASE.txt b/src/RELEASE.txt index f87f889..c7d36e9 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -8,7 +8,8 @@ NEW FUNCTIONALITY - - Initial support for Python 3.0 + - Initial support for Python 3.5+ + - I DEPRECATED FUNCTIONALITY -- cgit v0.12 From 15906a8f315b983279d0a6f8867ef1c15f6a0f4f Mon Sep 17 00:00:00 2001 From: William Deegan Date: Wed, 14 Jun 2017 12:25:06 -0400 Subject: changes to prep for 3.0.0 alpha --- QMTest/TestSCons.py | 2 +- README.rst | 18 +++++++++--------- SConstruct | 6 +++--- doc/user/main.xml | 4 ++-- src/Announce.txt | 2 +- src/CHANGES.txt | 2 +- src/RELEASE.txt | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index bd23ce6..66d6b23 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 = '2.5.0' +default_version = '3.0.0.alpha.20170614' python_version_unsupported = (2, 6, 0) python_version_deprecated = (2, 7, 0) diff --git a/README.rst b/README.rst index ba1755f..dfbf117 100644 --- a/README.rst +++ b/README.rst @@ -492,15 +492,15 @@ 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-2.5.0.tar.gz - build/dist/scons-2.5.0.win32.exe - build/dist/scons-2.5.0.zip - build/dist/scons-doc-2.5.0.tar.gz - build/dist/scons-local-2.5.0.tar.gz - build/dist/scons-local-2.5.0.zip - build/dist/scons-src-2.5.0.tar.gz - build/dist/scons-src-2.5.0.zip - build/dist/scons_2.5.0-1_all.deb + build/dist/scons-3.0.0.alpha.20170614.tar.gz + build/dist/scons-3.0.0.alpha.20170614.win32.exe + build/dist/scons-3.0.0.alpha.20170614.zip + build/dist/scons-doc-3.0.0.alpha.20170614.tar.gz + build/dist/scons-local-3.0.0.alpha.20170614.tar.gz + build/dist/scons-local-3.0.0.alpha.20170614.zip + build/dist/scons-src-3.0.0.alpha.20170614.tar.gz + build/dist/scons-src-3.0.0.alpha.20170614.zip + build/dist/scons_3.0.0.alpha.20170614-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 diff --git a/SConstruct b/SConstruct index bd43f19..f30b4c4 100644 --- a/SConstruct +++ b/SConstruct @@ -5,10 +5,10 @@ from __future__ import print_function -copyright_years = '2001 - 2016' +copyright_years = '2001 - 2017' # This gets inserted into the man pages to reflect the month of release. -month_year = 'November 2016' +month_year = 'MONTH YEAR' # # __COPYRIGHT__ @@ -45,7 +45,7 @@ import tempfile import bootstrap project = 'scons' -default_version = '2.5.1' +default_version = '3.0.0.alpha.20170614' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years platform = distutils.util.get_platform() diff --git a/doc/user/main.xml b/doc/user/main.xml index 451f87d..9bb1526 100644 --- a/doc/user/main.xml +++ b/doc/user/main.xml @@ -74,10 +74,10 @@ Steven Knight and the SCons Development Team - 2004 - 2016 + 2004 - 2017 - 2004 - 2016 + 2004 - 2017 The SCons Foundation diff --git a/src/Announce.txt b/src/Announce.txt index 488615a..112d6f0 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 +RELEASE 3.0.0.alpha.20170614 - Mon, 14 Jun 2017 12:23:56 -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 b3fec9f..5d670fd 100644 --- 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.0.alpha.20170614 - Mon, 14 Jun 2017 12:23:56 -0400 From William Blevins: - Updated D language scanner support to latest: 2.071.1. (PR #1924) diff --git a/src/RELEASE.txt b/src/RELEASE.txt index c7d36e9..b08b3f7 100644 --- a/src/RELEASE.txt +++ b/src/RELEASE.txt @@ -1,4 +1,4 @@ - A new SCons checkpoint release, 3.0.0.alpha.yyyymmdd, is now available + A new SCons checkpoint release, 3.0.0.alpha.20170614, is now available on the SCons download page: http://www.scons.org/download.php -- cgit v0.12