From 4899db342c2e87197da91f3d61471abfdbdf30c8 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 20 Mar 2017 10:57:39 -0700 Subject: remove deprecated Perforce tool --- doc/generated/builders.gen | 2 +- doc/generated/functions.gen | 60 ++++----------------------------------------- doc/generated/functions.mod | 4 --- doc/generated/tools.gen | 9 ------- doc/generated/tools.mod | 2 -- doc/generated/variables.gen | 39 ++--------------------------- doc/generated/variables.mod | 8 ------ 7 files changed, 8 insertions(+), 116 deletions(-) (limited to 'doc') diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen index d49156f3..b19d82d1 100644 --- a/doc/generated/builders.gen +++ b/doc/generated/builders.gen @@ -2248,7 +2248,7 @@ and the result replaces the key. env = Environment(tools = ['default', 'textfile']) env['prefix'] = '/usr/bin' -script_dict = {'@prefix@': '/bin', @exec_prefix@: '$prefix'} +script_dict = {'@prefix@': '/bin', '@exec_prefix@': '$prefix'} env.Substfile('script.in', SUBST_DICT = script_dict) conf_dict = {'%VERSION%': '1.2.3', '%BASE%': 'MyProg'} diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen index e80c1c98..d6e970af 100644 --- a/doc/generated/functions.gen +++ b/doc/generated/functions.gen @@ -96,7 +96,7 @@ Examples: # which the method will be called; the Python # convention is to call it 'self'. def my_method(self, arg): - print "my_method() got", arg + print("my_method() got", arg) # Use the global AddMethod() function to add a method # to the Environment class. This @@ -1114,7 +1114,7 @@ timestamp, such as can happen when restoring files from backup archives. Specifies that a target shall be considered out of date and rebuilt -if the dependency's content has changed sine the last time +if the dependency's content has changed since the last time the target was built, as determined be performing an MD5 checksum on the dependency's contents @@ -1131,7 +1131,7 @@ can be used as a synonym for Specifies that a target shall be considered out of date and rebuilt -if the dependency's content has changed sine the last time +if the dependency's content has changed since the last time the target was built, except that dependencies with a timestamp that matches the last time the target was rebuilt will be @@ -2102,7 +2102,7 @@ import atexit def print_build_failures(): from SCons.Script import GetBuildFailures for bf in GetBuildFailures(): - print "%s failed: %s" % (bf.node, bf.errstr) + print("%s failed: %s" % (bf.node, bf.errstr)) atexit.register(print_build_failures) @@ -3060,56 +3060,6 @@ dict = env.ParseFlags('-O2', '-Dfoo', '-Dbar=1') dict = env.ParseFlags(['-O2', '-Dfoo -Dbar=1']) dict = env.ParseFlags('-O2', '!echo -Dfoo -Dbar=1') - - - - - env.Perforce() - - - -A factory function that -returns a Builder object -to be used to fetch source files -from the Perforce source code management system. -The returned Builder -is intended to be passed to the -SourceCode -function. - - - -This function is deprecated. For details, see the entry for the -SourceCode -function. - - - -Example: - - - -env.SourceCode('.', env.Perforce()) - - - -Perforce uses a number of external -environment variables for its operation. -Consequently, this function adds the -following variables from the user's external environment -to the construction environment's -ENV dictionary: -P4CHARSET, -P4CLIENT, -P4LANGUAGE, -P4PASSWD, -P4PORT, -P4USER, -SystemRoot, -USER, -and -USERNAME. - @@ -3346,7 +3296,7 @@ every 10 Nodes: def my_progress_function(node, *args, **kw): - print 'Evaluating node %s!' % node + print('Evaluating node %s!' % node) Progress(my_progress_function, interval=10) diff --git a/doc/generated/functions.mod b/doc/generated/functions.mod index 99aaa480..03cef302 100644 --- a/doc/generated/functions.mod +++ b/doc/generated/functions.mod @@ -64,7 +64,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. ParseConfig"> ParseDepends"> ParseFlags"> -Perforce"> Platform"> Precious"> Prepend"> @@ -152,7 +151,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. env.ParseConfig"> env.ParseDepends"> env.ParseFlags"> -env.Perforce"> env.Platform"> env.Precious"> env.Prepend"> @@ -250,7 +248,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. ParseConfig"> ParseDepends"> ParseFlags"> -Perforce"> Platform"> Precious"> Prepend"> @@ -338,7 +335,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. env.ParseConfig"> env.ParseDepends"> env.ParseFlags"> -env.Perforce"> env.Platform"> env.Precious"> env.Prepend"> diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen index ba12966f..16aa688a 100644 --- a/doc/generated/tools.gen +++ b/doc/generated/tools.gen @@ -819,15 +819,6 @@ Sets construction variables for the pdftex utility. Sets: &cv-link-LATEXRETRIES;, &cv-link-PDFLATEX;, &cv-link-PDFLATEXCOM;, &cv-link-PDFLATEXFLAGS;, &cv-link-PDFTEX;, &cv-link-PDFTEXCOM;, &cv-link-PDFTEXFLAGS;.Uses: &cv-link-PDFLATEXCOMSTR;, &cv-link-PDFTEXCOMSTR;. - - - Perforce - - -Sets construction variables for interacting with the -Perforce source code management system. - -Sets: &cv-link-P4;, &cv-link-P4COM;, &cv-link-P4FLAGS;.Uses: &cv-link-P4COMSTR;. qt diff --git a/doc/generated/tools.mod b/doc/generated/tools.mod index 2ee22706..9fccf32a 100644 --- a/doc/generated/tools.mod +++ b/doc/generated/tools.mod @@ -83,7 +83,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. pdf"> pdflatex"> pdftex"> -Perforce"> qt"> RCS"> rmic"> @@ -194,7 +193,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. pdf"> pdflatex"> pdftex"> -Perforce"> qt"> RCS"> rmic"> diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index b3771027..add620ca 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -3104,7 +3104,7 @@ The command line used to call the Java archive tool. The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. @@ -3114,7 +3114,7 @@ env = Environment(JARCOMSTR = "JARchiving $SOURCES into $TARGET") The string displayed when the Java archive tool is called -If this is not set, then $JARCOM (the command line) is displayed. +If this is not set, then $JARCOM (the command line) is displayed. @@ -4614,41 +4614,6 @@ The prefix used for (static) object file names. The suffix used for (static) object file names. - - - - P4 - - -The Perforce executable. - - - - - P4COM - - -The command line used to -fetch source files from Perforce. - - - - - P4COMSTR - - -The string displayed when -fetching a source file from Perforce. -If this is not set, then $P4COM (the command line) is displayed. - - - - - P4FLAGS - - -General options that are passed to Perforce. - diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index 955a9eb8..6ec13f7e 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -352,10 +352,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $no_import_lib"> $OBJPREFIX"> $OBJSUFFIX"> -$P4"> -$P4COM"> -$P4COMSTR"> -$P4FLAGS"> $PACKAGEROOT"> $PACKAGETYPE"> $PACKAGEVERSION"> @@ -1006,10 +1002,6 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $no_import_lib"> $OBJPREFIX"> $OBJSUFFIX"> -$P4"> -$P4COM"> -$P4COMSTR"> -$P4FLAGS"> $PACKAGEROOT"> $PACKAGETYPE"> $PACKAGEVERSION"> -- cgit v1.2.1