From 10afdcc2e22670940b7de6319f614cb177f83516 Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Sat, 4 May 2013 00:20:26 +0200 Subject: - added filename prefix to all scons_example names - added unique suffixes to each scons_output_command - extended SCons Docbook XSD by the new suffix attribute --- .../addon/config/scons/scons_xsd/dbpoolx.xsd | 1 + doc/user/add-method.xml | 10 +- doc/user/alias.xml | 18 +- doc/user/builders-built-in.xml | 34 +-- doc/user/builders-commands.xml | 14 +- doc/user/builders-writing.xml | 62 ++--- doc/user/caching.xml | 62 ++--- doc/user/command-line.xml | 282 ++++++++++----------- doc/user/depends.xml | 228 ++++++++--------- doc/user/environments.xml | 114 ++++----- doc/user/factories.xml | 60 ++--- doc/user/file-removal.xml | 22 +- doc/user/gettext.xml | 12 +- doc/user/hierarchy.xml | 30 +-- doc/user/install.xml | 34 +-- doc/user/java.xml | 56 ++-- doc/user/less-simple.xml | 38 +-- doc/user/libraries.xml | 48 ++-- doc/user/mergeflags.xml | 18 +- doc/user/misc.xml | 80 +++--- doc/user/nodes.xml | 40 +-- doc/user/output.xml | 50 ++-- doc/user/parseconfig.xml | 12 +- doc/user/parseflags.xml | 28 +- doc/user/repositories.xml | 54 ++-- doc/user/scanners.xml | 14 +- doc/user/separate.xml | 52 ++-- doc/user/sideeffect.xml | 20 +- doc/user/simple.xml | 54 ++-- doc/user/sourcecode.xml | 30 +-- doc/user/tasks.xml | 8 +- doc/user/troubleshoot.xml | 124 ++++----- doc/user/variants.xml | 16 +- doc/xsd/dbpoolx.xsd | 1 + 34 files changed, 864 insertions(+), 862 deletions(-) diff --git a/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd b/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd index 3c937ee..b5e856f 100644 --- a/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd +++ b/doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd @@ -2380,6 +2380,7 @@ + diff --git a/doc/user/add-method.xml b/doc/user/add-method.xml index cb9b358..aeb85cf 100644 --- a/doc/user/add-method.xml +++ b/doc/user/add-method.xml @@ -61,7 +61,7 @@ - + def install_in_bin_dirs(env, source): """Install source in both bin dirs""" @@ -81,8 +81,8 @@ This produces the following: - - scons -Q / + + scons -Q / @@ -130,7 +130,7 @@ - scons -Q + scons -Q @@ -138,7 +138,7 @@ - scons -Q + scons -Q diff --git a/doc/user/alias.xml b/doc/user/alias.xml index ae50feb..07c5bbd 100644 --- a/doc/user/alias.xml +++ b/doc/user/alias.xml @@ -52,7 +52,7 @@ - + env = Environment() hello = env.Program('hello.c') @@ -71,8 +71,8 @@ - - scons -Q install + + scons -Q install @@ -88,7 +88,7 @@ - + env = Environment() p = env.Program('foo.c') @@ -116,11 +116,11 @@ - - scons -Q install-bin - scons -Q install-lib - scons -Q -c __ROOT__/ - scons -Q install + + scons -Q install-bin + scons -Q install-lib + scons -Q -c __ROOT__/ + scons -Q install diff --git a/doc/user/builders-built-in.xml b/doc/user/builders-built-in.xml index ec4012d..6b47afc 100644 --- a/doc/user/builders-built-in.xml +++ b/doc/user/builders-built-in.xml @@ -152,7 +152,7 @@ - + env = Environment(LIBS = ['foo1', 'foo2'], LIBPATH = ['/usr/dir1', 'dir2']) @@ -172,8 +172,8 @@ - - scons -Q + + scons -Q @@ -182,8 +182,8 @@ - - scons -Q + + scons -Q @@ -743,7 +743,7 @@ - + env = Environment() env.Tar('out1.tar', ['file1', 'file2']) @@ -760,8 +760,8 @@ - - scons -Q . + + scons -Q . @@ -779,7 +779,7 @@ - + env = Environment(TARFLAGS = '-c -z') env.Tar('out.tar.gz', 'directory') @@ -789,8 +789,8 @@ - - scons -Q . + + scons -Q . @@ -803,7 +803,7 @@ - + env = Environment(TARFLAGS = '-c -z', TARSUFFIX = '.tgz') @@ -814,8 +814,8 @@ - - scons -Q . + + scons -Q . @@ -835,7 +835,7 @@ - + env = Environment() env.Zip('out', ['file1', 'file2']) @@ -856,8 +856,8 @@ - - scons -Q . + + scons -Q . diff --git a/doc/user/builders-commands.xml b/doc/user/builders-commands.xml index fa6573b..f9583ca 100644 --- a/doc/user/builders-commands.xml +++ b/doc/user/builders-commands.xml @@ -91,7 +91,7 @@ - + env = Environment() env.Command('foo.out', 'foo.in', "sed 's/x/y/' < $SOURCE > $TARGET") @@ -110,8 +110,8 @@ - - scons -Q + + scons -Q @@ -131,7 +131,7 @@ - + env = Environment() def build(target, source, env): @@ -150,8 +150,8 @@ - - scons -Q + + scons -Q @@ -162,7 +162,7 @@ - + env.Command('${SOURCE.basename}.out', 'foo.in', build) diff --git a/doc/user/builders-writing.xml b/doc/user/builders-writing.xml index 74787fe..e676ef2 100644 --- a/doc/user/builders-writing.xml +++ b/doc/user/builders-writing.xml @@ -185,7 +185,7 @@ This functionality could be invoked as in the following example: - + bld = Builder(action = 'foobuild < $SOURCE > $TARGET') env = Environment(BUILDERS = {'Foo' : bld}) @@ -224,8 +224,8 @@ This functionality could be invoked as in the following example: - - scons -Q + + scons -Q @@ -259,7 +259,7 @@ This functionality could be invoked as in the following example: in the generated error consistent with what the user will see in the User's Guide. --> - + import SCons.Defaults; SCons.Defaults.ConstructionEnvironment['TOOLS'] = {}; bld = Builder(action = 'foobuild < $SOURCE > $TARGET') env = Environment(BUILDERS = {'Foo' : bld}) @@ -280,8 +280,8 @@ This functionality could be invoked as in the following example: - - scons -Q + + scons -Q @@ -293,7 +293,7 @@ This functionality could be invoked as in the following example: - + env = Environment() import os @@ -346,8 +346,8 @@ This functionality could be invoked as in the following example: - - scons -Q + + scons -Q @@ -372,7 +372,7 @@ This functionality could be invoked as in the following example: - + bld = Builder(action = 'foobuild < $SOURCE > $TARGET', suffix = '.foo', @@ -403,8 +403,8 @@ This functionality could be invoked as in the following example: env.Foo('file2') - - scons -Q + + scons -Q @@ -519,7 +519,7 @@ This functionality could be invoked as in the following example: - + def build_function(target, source, env): # Code to build "target" from "source" @@ -544,8 +544,8 @@ This functionality could be invoked as in the following example: - - scons -Q + + scons -Q @@ -666,7 +666,7 @@ This functionality could be invoked as in the following example: - + def generate_actions(source, target, env, for_signature): return 'foobuild < %s > %s' % (source[0], target[0]) @@ -696,8 +696,8 @@ This functionality could be invoked as in the following example: env.Foo('file') - - scons -Q + + scons -Q @@ -744,7 +744,7 @@ This functionality could be invoked as in the following example: - + def modify_targets(target, source, env): target.append('new_target') @@ -789,8 +789,8 @@ This functionality could be invoked as in the following example: - - scons -Q + + scons -Q @@ -809,7 +809,7 @@ This functionality could be invoked as in the following example: - + bld = Builder(action = 'my_command $SOURCES > $TARGET', @@ -874,8 +874,8 @@ This functionality could be invoked as in the following example: - - scons -Q + + scons -Q @@ -960,7 +960,7 @@ This functionality could be invoked as in the following example: - + def TOOL_ADD_HEADER(env): """A Tool to add a header from $HEADER to the source file""" @@ -999,8 +999,8 @@ This functionality could be invoked as in the following example: @@ -1034,7 +1034,7 @@ This functionality could be invoked as in the following example: functions: - + from SCons.Script import * # for Execute and Mkdir def build_id(): @@ -1110,7 +1110,7 @@ This functionality could be invoked as in the following example: - + env = Environment() #env.SourceCode('.', env.BitKeeper('my_command')) @@ -1121,8 +1121,8 @@ This functionality could be invoked as in the following example: - - scons -Q + + scons -Q diff --git a/doc/user/caching.xml b/doc/user/caching.xml index baea2ea..522dd65 100644 --- a/doc/user/caching.xml +++ b/doc/user/caching.xml @@ -65,7 +65,7 @@ - + env = Environment() env.Program('hello.c') @@ -120,10 +120,10 @@ - - scons -Q - scons -Q -c - scons -Q + + scons -Q + scons -Q -c + scons -Q @@ -170,10 +170,10 @@ - - scons -Q - scons -Q -c - scons -Q --cache-show + + scons -Q + scons -Q -c + scons -Q --cache-show @@ -232,10 +232,10 @@ @@ -284,12 +284,12 @@ - - scons -Q - scons -Q -c - scons -Q - scons -Q -c - scons -Q --cache-disable + + scons -Q + scons -Q -c + scons -Q + scons -Q -c + scons -Q --cache-disable @@ -325,12 +325,12 @@ - - scons -Q --cache-disable - scons -Q -c - scons -Q --cache-disable - scons -Q --cache-force - scons -Q + + scons -Q --cache-disable + scons -Q -c + scons -Q --cache-disable + scons -Q --cache-force + scons -Q @@ -365,7 +365,7 @@ - + Program('prog', ['f1.c', 'f2.c', 'f3.c', 'f4.c', 'f5.c']) @@ -385,8 +385,8 @@ - - scons -Q + + scons -Q @@ -420,8 +420,8 @@ The following output was generated by this: - - scons -Q - -random + + scons -Q - -random We captured it directly here to guarantee a "random" order, @@ -477,7 +477,7 @@ - + SetOption('random', 1) Program('prog', diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml index 82a201a..ba08bf9 100644 --- a/doc/user/command-line.xml +++ b/doc/user/command-line.xml @@ -168,7 +168,7 @@ - + def b(target, source, env): pass @@ -183,10 +183,10 @@ - - scons - export SCONSFLAGS="-Q" - scons + + scons + export SCONSFLAGS="-Q" + scons @@ -312,7 +312,7 @@ - + import os num_cpu = int(os.environ.get('NUM_CPU', 2)) @@ -344,8 +344,8 @@ - - scons -Q + + scons -Q @@ -356,9 +356,9 @@ - - export NUM_CPU="4" - scons -Q + + export NUM_CPU="4" + scons -Q @@ -372,10 +372,10 @@ - - scons -Q -j 7 - export NUM_CPU="4" - scons -Q -j 3 + + scons -Q -j 7 + export NUM_CPU="4" + scons -Q -j 3 @@ -626,7 +626,7 @@ - + AddOption('--prefix', dest='prefix', @@ -662,8 +662,8 @@ - - scons -Q -n + + scons -Q -n @@ -674,8 +674,8 @@ - - scons -Q -n --prefix=/tmp/install + + scons -Q -n --prefix=/tmp/install @@ -731,7 +731,7 @@ - + env = Environment() debug = ARGUMENTS.get('debug', 0) @@ -753,11 +753,11 @@ - - scons -Q debug=0 - scons -Q debug=0 - scons -Q debug=1 - scons -Q debug=1 + + scons -Q debug=0 + scons -Q debug=0 + scons -Q debug=1 + scons -Q debug=1 @@ -820,7 +820,7 @@ - + cppdefines = [] for key, value in ARGLIST: @@ -840,9 +840,9 @@ - - scons -Q define=FOO - scons -Q define=FOO define=BAR + + scons -Q define=FOO + scons -Q define=FOO define=BAR @@ -905,7 +905,7 @@ - + vars = Variables(None, ARGUMENTS) vars.Add('RELEASE', 'Set to 1 to build for release', 0) @@ -950,8 +950,8 @@ - - scons -Q RELEASE=1 + + scons -Q RELEASE=1 @@ -996,7 +996,7 @@ - + vars = Variables(None, ARGUMENTS) vars.Add('RELEASE', 'Set to 1 to build for release', 0) @@ -1012,8 +1012,8 @@ - - scons -Q -h + + scons -Q -h @@ -1043,7 +1043,7 @@ - + vars = Variables('custom.py') vars.Add('RELEASE', 'Set to 1 to build for release', 0) @@ -1070,7 +1070,7 @@ - + @@ -1080,8 +1080,8 @@ - - scons -Q + + scons -Q @@ -1090,7 +1090,7 @@ - + vars = Variables('custom.py') vars.Add('RELEASE', 'Set to 1 to build for release', 0) @@ -1117,8 +1117,8 @@ - - scons -Q + + scons -Q @@ -1180,7 +1180,7 @@ - + vars = Variables('custom.py') vars.Add(BoolVariable('RELEASE', 'Set to build for release', 0)) @@ -1202,12 +1202,12 @@ - - scons -Q RELEASE=yes foo.o + + scons -Q RELEASE=yes foo.o - - scons -Q RELEASE=t foo.o + + scons -Q RELEASE=t foo.o @@ -1231,12 +1231,12 @@ - - scons -Q RELEASE=no foo.o + + scons -Q RELEASE=no foo.o - - scons -Q RELEASE=f foo.o + + scons -Q RELEASE=f foo.o @@ -1258,8 +1258,8 @@ - - scons -Q RELEASE=bad_value foo.o + + scons -Q RELEASE=bad_value foo.o @@ -1284,7 +1284,7 @@ - + vars = Variables('custom.py') vars.Add(EnumVariable('COLOR', 'Set background color', 'red', @@ -1305,10 +1305,10 @@ - - scons -Q COLOR=red foo.o - scons -Q COLOR=blue foo.o - scons -Q COLOR=green foo.o + + scons -Q COLOR=red foo.o + scons -Q COLOR=blue foo.o + scons -Q COLOR=green foo.o @@ -1320,8 +1320,8 @@ - - scons -Q COLOR=magenta foo.o + + scons -Q COLOR=magenta foo.o @@ -1364,7 +1364,7 @@ - scons -Q COLOR=navy foo.o + scons -Q COLOR=navy foo.o @@ -1377,10 +1377,10 @@ - - scons -Q COLOR=Red foo.o - scons -Q COLOR=BLUE foo.o - scons -Q COLOR=nAvY foo.o + + scons -Q COLOR=Red foo.o + scons -Q COLOR=BLUE foo.o + scons -Q COLOR=nAvY foo.o @@ -1393,7 +1393,7 @@ - + vars = Variables('custom.py') vars.Add(EnumVariable('COLOR', 'Set background color', 'red', @@ -1415,11 +1415,11 @@ - - scons -Q COLOR=Red foo.o - scons -Q COLOR=BLUE foo.o - scons -Q COLOR=nAvY foo.o - scons -Q COLOR=green foo.o + + scons -Q COLOR=Red foo.o + scons -Q COLOR=BLUE foo.o + scons -Q COLOR=nAvY foo.o + scons -Q COLOR=green foo.o @@ -1433,7 +1433,7 @@ - + vars = Variables('custom.py') vars.Add(EnumVariable('COLOR', 'Set background color', 'red', @@ -1460,10 +1460,10 @@ - - scons -Q COLOR=Red foo.o - scons -Q COLOR=nAvY foo.o - scons -Q COLOR=GREEN foo.o + + scons -Q COLOR=Red foo.o + scons -Q COLOR=nAvY foo.o + scons -Q COLOR=GREEN foo.o @@ -1482,7 +1482,7 @@ - + vars = Variables('custom.py') vars.Add(ListVariable('COLORS', 'List of colors', 0, @@ -1505,9 +1505,9 @@ - - scons -Q COLORS=red,blue foo.o - scons -Q COLORS=blue,green,red foo.o + + scons -Q COLORS=red,blue foo.o + scons -Q COLORS=blue,green,red foo.o @@ -1520,9 +1520,9 @@ - - scons -Q COLORS=all foo.o - scons -Q COLORS=none foo.o + + scons -Q COLORS=all foo.o + scons -Q COLORS=none foo.o @@ -1532,8 +1532,8 @@ - - scons -Q COLORS=magenta foo.o + + scons -Q COLORS=magenta foo.o @@ -1553,7 +1553,7 @@ - + vars = Variables('custom.py') vars.Add(PathVariable('CONFIG', @@ -1582,9 +1582,9 @@ - - scons -Q foo.o - scons -Q CONFIG=__ROOT__/usr/local/etc/other_config foo.o + + scons -Q foo.o + scons -Q CONFIG=__ROOT__/usr/local/etc/other_config foo.o @@ -1595,8 +1595,8 @@ - - scons -Q CONFIG=__ROOT__/does/not/exist foo.o + + scons -Q CONFIG=__ROOT__/does/not/exist foo.o @@ -1609,7 +1609,7 @@ - + vars = Variables('custom.py') vars.Add(PathVariable('CONFIG', @@ -1636,7 +1636,7 @@ - + vars = Variables('custom.py') vars.Add(PathVariable('DBDIR', @@ -1665,7 +1665,7 @@ - + vars = Variables('custom.py') vars.Add(PathVariable('DBDIR', @@ -1693,7 +1693,7 @@ - + vars = Variables('custom.py') vars.Add(PathVariable('OUTPUT', @@ -1728,7 +1728,7 @@ - + vars = Variables('custom.py') vars.Add(PackageVariable('PACKAGE', @@ -1762,11 +1762,11 @@ - - scons -Q foo.o - scons -Q PACKAGE=__ROOT__/usr/local/location foo.o - scons -Q PACKAGE=yes foo.o - scons -Q PACKAGE=no foo.o + + scons -Q foo.o + scons -Q PACKAGE=__ROOT__/usr/local/location foo.o + scons -Q PACKAGE=yes foo.o + scons -Q PACKAGE=no foo.o @@ -1794,7 +1794,7 @@ - + vars = Variables() vars.AddVariables( @@ -1855,7 +1855,7 @@ - + vars = Variables(None) vars.Add('RELEASE', 'Set to 1 to build for release', 0) @@ -1891,8 +1891,8 @@ - - scons -Q NOT_KNOWN=foo + + scons -Q NOT_KNOWN=foo @@ -1942,7 +1942,7 @@ - + if 'bar' in COMMAND_LINE_TARGETS: print "Don't forget to copy `bar' to the archive!" @@ -1966,9 +1966,9 @@ - - scons -Q - scons -Q bar + + scons -Q + scons -Q bar @@ -2004,7 +2004,7 @@ - + env = Environment() hello = env.Program('hello.c') @@ -2028,10 +2028,10 @@ - - scons -Q - scons -Q - scons -Q goodbye + + scons -Q + scons -Q + scons -Q goodbye @@ -2045,8 +2045,8 @@ - - scons -Q . + + scons -Q . @@ -2058,7 +2058,7 @@ - + env = Environment() prog1 = env.Program('prog1.c') @@ -2104,9 +2104,9 @@ - - scons -Q - scons -Q . + + scons -Q + scons -Q . @@ -2116,7 +2116,7 @@ - + env = Environment() env.Program(['prog1/main.c', 'prog1/foo.c']) @@ -2146,10 +2146,10 @@ - - scons -Q - scons -Q - scons -Q . + + scons -Q + scons -Q + scons -Q . @@ -2161,7 +2161,7 @@ - + env = Environment() prog1 = env.Program('prog1.c') @@ -2182,9 +2182,9 @@ - - scons -Q - scons -Q . + + scons -Q + scons -Q .
@@ -2206,7 +2206,7 @@ - + prog1 = Program('prog1.c') Default(prog1) @@ -2227,8 +2227,8 @@ - - scons + + scons @@ -2240,7 +2240,7 @@ - + prog1 = Program('prog1.c') Default(prog1) @@ -2263,8 +2263,8 @@ - - scons + + scons @@ -2333,7 +2333,7 @@ - + prog1 = Program('prog1.c') Program('prog2.c') @@ -2356,10 +2356,10 @@ - - scons -Q - scons -Q prog2 - scons -Q -c . + + scons -Q + scons -Q prog2 + scons -Q -c .
diff --git a/doc/user/depends.xml b/doc/user/depends.xml index a30ba80..a5468dc 100644 --- a/doc/user/depends.xml +++ b/doc/user/depends.xml @@ -58,7 +58,7 @@ - + Program('hello.c') @@ -67,9 +67,9 @@ - - scons -Q - scons -Q + + scons -Q + scons -Q @@ -83,9 +83,9 @@ - - scons -Q hello - scons -Q hello + + scons -Q hello + scons -Q hello @@ -135,10 +135,10 @@ - - scons -Q hello - touch hello.c - scons -Q hello + + scons -Q hello + touch hello.c + scons -Q hello @@ -157,10 +157,10 @@ - - scons -Q hello - edit hello.c - scons -Q hello + + scons -Q hello + edit hello.c + scons -Q hello @@ -216,10 +216,10 @@ - - scons -Q hello - edit hello.c - scons -Q hello + + scons -Q hello + edit hello.c + scons -Q hello @@ -268,7 +268,7 @@ - + Object('hello.c') Decider('timestamp-newer') @@ -286,10 +286,10 @@ - - scons -Q hello.o - touch hello.c - scons -Q hello.o + + scons -Q hello.o + touch hello.c + scons -Q hello.o @@ -337,7 +337,7 @@ - + Object('hello.c') Decider('timestamp-match') @@ -359,10 +359,10 @@ - - scons -Q hello.o - touch -t 198901010000 hello.c - scons -Q hello.o + + scons -Q hello.o + touch -t 198901010000 hello.c + scons -Q hello.o @@ -396,7 +396,7 @@ - + Program('hello.c') Decider('MD5-timestamp') @@ -420,12 +420,12 @@ output seems to get this wrong. Just in-line the output for now. - - scons -Q hello - touch hello.c - scons -Q hello - edit hello.c - scons -Q hello + + scons -Q hello + touch hello.c + scons -Q hello + edit hello.c + scons -Q hello --> @@ -514,7 +514,7 @@ - + Program('hello.c') def decide_if_changed(dependency, target, prev_ni): @@ -696,7 +696,7 @@ - + env1 = Environment(CPPPATH = ['.']) env2 = env1.Clone() @@ -729,10 +729,10 @@ - - scons -Q - touch inc.h - scons -Q + + scons -Q + touch inc.h + scons -Q @@ -947,7 +947,7 @@ - + Program('hello.c', CPPPATH = '.') @@ -970,7 +970,7 @@ - + @@ -983,7 +983,7 @@ - + @@ -997,11 +997,11 @@ - - scons -Q hello - scons -Q hello - edit hello.h - scons -Q hello + + scons -Q hello + scons -Q hello + edit hello.h + scons -Q hello @@ -1047,7 +1047,7 @@ - + Program('hello.c', CPPPATH = ['include', '/home/project/inc']) @@ -1062,8 +1062,8 @@ - - scons -Q hello + + scons -Q hello @@ -1072,8 +1072,8 @@ - - scons -Q hello.exe + + scons -Q hello.exe @@ -1126,9 +1126,9 @@ - - scons -Q --implicit-cache hello - scons -Q hello + + scons -Q --implicit-cache hello + scons -Q hello @@ -1206,9 +1206,9 @@ - - scons -Q --implicit-deps-changed hello - scons -Q hello + + scons -Q --implicit-deps-changed hello + scons -Q hello @@ -1241,9 +1241,9 @@ - - scons -Q --implicit-deps-unchanged hello - scons -Q hello + + scons -Q --implicit-deps-unchanged hello + scons -Q hello @@ -1362,7 +1362,7 @@ - + #define FOO_HEADER <foo.h> #include FOO_HEADER @@ -1379,11 +1379,11 @@ - - scons -Q + + scons -Q edit foo.h - scons -Q + suffix="2">edit foo.h + scons -Q @@ -1415,7 +1415,7 @@ priori specification of the dependency file. The produced hello.d file is not found (or used) for unknown reasons. --> - + #define FOO_HEADER <foo.h> #include FOO_HEADER @@ -1438,11 +1438,11 @@ - - scons -Q + + scons -Q edit foo.h - scons -Q + suffix="2">edit foo.h + scons -Q @@ -1453,7 +1453,7 @@ - + #define FOO_HEADER <foo.h> #include FOO_HEADER @@ -1474,10 +1474,10 @@ @@ -1532,7 +1532,7 @@ - + hello_obj=Object('hello.c') hello = Program(hello_obj) @@ -1550,11 +1550,11 @@ @@ -1608,7 +1608,7 @@ by default. - + hello_obj=Object('hello.c') hello = Program(hello_obj) @@ -1620,10 +1620,10 @@ - - scons -Q - scons -Q hello - scons -Q hello + + scons -Q + scons -Q hello + scons -Q hello @@ -1669,7 +1669,7 @@ - + import time @@ -1699,12 +1699,12 @@ - - scons -Q hello - sleep 1 - scons -Q hello - sleep 1 - scons -Q hello + + scons -Q hello + sleep 1 + scons -Q hello + sleep 1 + scons -Q hello @@ -1728,7 +1728,7 @@ - + import time @@ -1776,15 +1776,15 @@ - - scons -Q hello - sleep 1 - scons -Q hello - sleep 1 - edit hello.c - scons -Q hello - sleep 1 - scons -Q hello + + scons -Q hello + sleep 1 + scons -Q hello + sleep 1 + edit hello.c + scons -Q hello + sleep 1 + scons -Q hello @@ -1801,7 +1801,7 @@ - + hello = Program('hello.c') AlwaysBuild(hello) @@ -1820,9 +1820,9 @@ - - scons -Q - scons -Q + + scons -Q + scons -Q @@ -1842,9 +1842,9 @@ - - scons -Q - scons -Q hello.o + + scons -Q + scons -Q hello.o diff --git a/doc/user/factories.xml b/doc/user/factories.xml index 8ec22fb..35b82d5 100644 --- a/doc/user/factories.xml +++ b/doc/user/factories.xml @@ -82,7 +82,7 @@ - + Command("file.out", "file.in", Copy("$TARGET", "$SOURCE")) @@ -100,8 +100,8 @@ - - scons -Q + + scons -Q @@ -111,7 +111,7 @@ - + Command("file.out", [], Copy("$TARGET", "file.in")) @@ -124,8 +124,8 @@ - - scons -Q + + scons -Q @@ -145,7 +145,7 @@ - + Command("file.out", "file.in", [ @@ -172,8 +172,8 @@ - - scons -Q + + scons -Q @@ -196,7 +196,7 @@ - + Command("file.out", "file.in", [ @@ -224,8 +224,8 @@ - - scons -Q + + scons -Q @@ -237,7 +237,7 @@ - + Command("file.out", "file.in", [ @@ -254,8 +254,8 @@ - - scons -Q + + scons -Q @@ -291,7 +291,7 @@ - + Command("file.out", "file.in", [ @@ -318,8 +318,8 @@ - - scons -Q + + scons -Q @@ -335,7 +335,7 @@ - + Command("file.out", "file.in", [ @@ -358,8 +358,8 @@ - - scons -Q + + scons -Q @@ -379,7 +379,7 @@ - + Command("file.out", "file.in", [ @@ -409,8 +409,8 @@ - - scons -Q + + scons -Q @@ -429,7 +429,7 @@ - + Command("file.out", "file.in", [ @@ -446,8 +446,8 @@ - - scons -Q + + scons -Q @@ -468,7 +468,7 @@ - + Execute(Mkdir('__ROOT__/tmp/my_temp_directory')) @@ -482,8 +482,8 @@ - - scons + + scons diff --git a/doc/user/file-removal.xml b/doc/user/file-removal.xml index 5ff945b..654b93f 100644 --- a/doc/user/file-removal.xml +++ b/doc/user/file-removal.xml @@ -78,7 +78,7 @@ - + env = Environment(RANLIBCOM='') lib = env.Library('foo', ['f1.c', 'f2.c', 'f3.c']) @@ -103,8 +103,8 @@ - - scons -Q + + scons -Q @@ -136,7 +136,7 @@ - + env = Environment(RANLIBCOM='') lib = env.Library('foo', ['f1.c', 'f2.c', 'f3.c']) @@ -160,9 +160,9 @@ - - scons -Q - scons -c + + scons -Q + scons -c @@ -197,7 +197,7 @@ - + t = Command('foo.out', 'foo.in', 'build -o $TARGET $SOURCE') Clean(t, 'foo.log') @@ -237,9 +237,9 @@ - - scons -Q - scons -Q -c + + scons -Q + scons -Q -c diff --git a/doc/user/gettext.xml b/doc/user/gettext.xml index bed0d0e..4484ea3 100644 --- a/doc/user/gettext.xml +++ b/doc/user/gettext.xml @@ -78,7 +78,7 @@ Let's start with a very simple project, the "Hello world" program for example - + /* hello.c */ #include <stdio.h> @@ -92,7 +92,7 @@ Prepare a SConstruct to compile the program as usual. - + # SConstruct env = Environment() @@ -118,7 +118,7 @@ First prepare the hello.c program for internationalization. Change the previous code so it reads as follows: - + /* hello.c */ #include <stdio.h> @@ -160,7 +160,7 @@ The completed SConstruct is as follows: - + # SConstruct env = Environment( tools = ['default', 'gettext'] ) @@ -279,7 +279,7 @@ Now, open hello.c and add another one printf line with new message. - + /* hello.c */ #include <stdio.h> @@ -334,7 +334,7 @@ PO) are touched (i.e. no content changes, no creation/modification time changed and so on). Let's append another line to the program (after the last printf), so its code becomes: - + /* hello.c */ #include <stdio.h> diff --git a/doc/user/hierarchy.xml b/doc/user/hierarchy.xml index 4c9cd38..ff7dd1b 100644 --- a/doc/user/hierarchy.xml +++ b/doc/user/hierarchy.xml @@ -301,7 +301,7 @@ make no difference to the build. - + SConscript(['prog1/SConscript', 'prog2/SConscript']) @@ -342,7 +342,7 @@ make no difference to the build. - + @@ -351,7 +351,7 @@ make no difference to the build. - + @@ -361,8 +361,8 @@ make no difference to the build. - - scons -Q + + scons -Q @@ -402,7 +402,7 @@ make no difference to the build. - + SConscript('src/prog/SConscript') @@ -432,8 +432,8 @@ make no difference to the build. - - scons -Q + + scons -Q @@ -458,7 +458,7 @@ make no difference to the build. - + SConscript('src/prog/SConscript') @@ -483,8 +483,8 @@ make no difference to the build. - - scons -Q + + scons -Q @@ -736,7 +736,7 @@ make no difference to the build. - + env = Environment() Export('env') @@ -774,7 +774,7 @@ make no difference to the build. - + @@ -788,8 +788,8 @@ make no difference to the build. - - scons -Q + + scons -Q diff --git a/doc/user/mergeflags.xml b/doc/user/mergeflags.xml index 0979d94..1c73f8a 100644 --- a/doc/user/mergeflags.xml +++ b/doc/user/mergeflags.xml @@ -71,7 +71,7 @@ - + env = Environment() env.Append(CCFLAGS = '-option -O3 -O1') @@ -81,8 +81,8 @@ - - scons -Q + + scons -Q @@ -98,7 +98,7 @@ - + env = Environment() env.Append(CPPPATH = ['/include', '/usr/local/include', '/usr/include']) @@ -108,8 +108,8 @@ - - scons -Q + + scons -Q @@ -132,7 +132,7 @@ - + env = Environment() env.Append(CCFLAGS = '-option -O3 -O1') @@ -143,8 +143,8 @@ - - scons -Q + + scons -Q diff --git a/doc/user/misc.xml b/doc/user/misc.xml index c24a014..5264c78 100644 --- a/doc/user/misc.xml +++ b/doc/user/misc.xml @@ -89,7 +89,7 @@ regardless of executing Python version by faking out the infrastructure in some way. - + EnsurePythonVersion(2, 5) @@ -115,8 +115,8 @@ regardless of executing Python version by faking out the infrastructure in some way. - - scons -Q + + scons -Q --> @@ -158,7 +158,7 @@ regardless of executing SCons version by faking out the infrastructure in some way. - + EnsureSConsVersion(1, 0) @@ -184,8 +184,8 @@ regardless of executing SCons version by faking out the infrastructure in some way. - - scons -Q + + scons -Q --> @@ -210,7 +210,7 @@ - + if ARGUMENTS.get('FUTURE'): print "The FUTURE option is not supported yet!" @@ -223,9 +223,9 @@ - - scons -Q FUTURE=1 - scons -Q + + scons -Q FUTURE=1 + scons -Q @@ -266,7 +266,7 @@ - + # one directory print FindFile('missing', '.') @@ -278,11 +278,11 @@ - - scons -Q + + scons -Q - + # several directories includes = [ '.', 'include', 'src/include'] @@ -304,8 +304,8 @@ - - scons -Q + + scons -Q @@ -349,7 +349,7 @@ - + print FindFile('multiple', ['sub1', 'sub2', 'sub3']) print FindFile('multiple', ['sub2', 'sub3', 'sub1']) @@ -369,8 +369,8 @@ - - scons -Q + + scons -Q @@ -383,7 +383,7 @@ - + # Neither file exists, so build will fail Command('derived', 'leaf', 'cat >$TARGET $SOURCE') @@ -392,11 +392,11 @@ - - scons -Q + + scons -Q - + # Only 'leaf' exists Command('derived', 'leaf', 'cat >$TARGET $SOURCE') @@ -408,8 +408,8 @@ - - scons -Q + + scons -Q @@ -419,7 +419,7 @@ - + # Only 'src/leaf' exists VariantDir('build', 'src') @@ -431,8 +431,8 @@ - - scons -Q + + scons -Q @@ -458,7 +458,7 @@ - + objects = [ Object('prog1.c'), @@ -482,8 +482,8 @@ - - scons -Q + + scons -Q @@ -499,7 +499,7 @@ - + objects = [ Object('prog1.c'), @@ -528,8 +528,8 @@ - - scons -Q + + scons -Q @@ -540,7 +540,7 @@ - + objects = [ Object('prog1.c'), @@ -563,8 +563,8 @@ TODO: can't use this now because it displays the temporary path name - - scons -Q + + scons -Q --> diff --git a/doc/user/nodes.xml b/doc/user/nodes.xml index 82a41fe..cc17e35 100644 --- a/doc/user/nodes.xml +++ b/doc/user/nodes.xml @@ -121,7 +121,7 @@ - + hello_list = Object('hello.c', CCFLAGS='-DHELLO') goodbye_list = Object('goodbye.c', CCFLAGS='-DGOODBYE') @@ -142,8 +142,8 @@ - - scons -Q + + scons -Q @@ -152,8 +152,8 @@ - - scons -Q + + scons -Q @@ -181,7 +181,7 @@ - + hello_c = File('hello.c') Program(hello_c) @@ -261,7 +261,7 @@ - + object_list = Object('hello.c') program_list = Program(object_list) @@ -279,8 +279,8 @@ - - scons -Q + + scons -Q @@ -289,8 +289,8 @@ - - scons -Q + + scons -Q @@ -328,7 +328,7 @@ - + import os.path program_list = Program('hello.c') @@ -347,8 +347,8 @@ - - scons -Q + + scons -Q @@ -370,7 +370,7 @@ - + env=Environment(VAR="value") n=File("foo.c") @@ -384,8 +384,8 @@ - - scons -Q + + scons -Q @@ -410,7 +410,7 @@ - + hello_c = File('hello.c') contents = hello_c.read() @@ -428,8 +428,8 @@ - - scons -Q + + scons -Q diff --git a/doc/user/output.xml b/doc/user/output.xml index e2831b6..6dd2528 100644 --- a/doc/user/output.xml +++ b/doc/user/output.xml @@ -72,7 +72,7 @@ - + Help(""" Type: 'scons program' to build the production program, @@ -98,8 +98,8 @@ - - scons -h + + scons -h @@ -130,7 +130,7 @@ - + env = Environment() @@ -147,8 +147,8 @@ - - scons -h + + scons -h @@ -157,8 +157,8 @@ - - scons -h + + scons -h @@ -212,7 +212,7 @@ - + env = Environment(CCCOMSTR = "Compiling $TARGET", LINKCOMSTR = "Linking $TARGET") @@ -231,8 +231,8 @@ @@ -284,7 +284,7 @@ - + env = Environment() if ARGUMENTS.get('VERBOSE') != "1': @@ -313,10 +313,10 @@ @@ -370,7 +370,7 @@ - + Progress('Evaluating $TARGET\n') Program('f1.c') @@ -401,8 +401,8 @@ - - scons -Q + + scons -Q @@ -520,7 +520,7 @@ - + screen = open('/dev/tty', 'w') count = 0 @@ -593,7 +593,7 @@ - + import atexit @@ -637,7 +637,7 @@ - + # Make the build fail if we pass fail=1 on the command line if ARGUMENTS.get('fail', 0): @@ -694,9 +694,9 @@ - - scons -Q - scons -Q fail=1 + + scons -Q + scons -Q fail=1 diff --git a/doc/user/parseconfig.xml b/doc/user/parseconfig.xml index 59077a3..0d619b1 100644 --- a/doc/user/parseconfig.xml +++ b/doc/user/parseconfig.xml @@ -82,7 +82,7 @@ - + env = Environment() env['CPPPATH'] = ['/lib/compat'] @@ -105,8 +105,8 @@ no longer reports back an include directory. Since this is just for example anyway, we're just hard-coding the output. - - scons -Q + + scons -Q --> @@ -134,7 +134,7 @@ - + env = Environment() env.ParseConfig("pkg-config x11 --cflags --libs") @@ -149,8 +149,8 @@ no longer reports back an include directory. Since this is just for example anyway, we're just hard-coding the output. - - scons -Q + + scons -Q --> diff --git a/doc/user/parseflags.xml b/doc/user/parseflags.xml index 8a3c225..f327f51 100644 --- a/doc/user/parseflags.xml +++ b/doc/user/parseflags.xml @@ -78,7 +78,7 @@ - + env = Environment() d = env.ParseFlags("-I/opt/include -L/opt/lib -lfoo") @@ -93,8 +93,8 @@ - - scons -Q + + scons -Q @@ -105,8 +105,8 @@ - - scons -Q + + scons -Q @@ -117,7 +117,7 @@ - + env = Environment() d = env.ParseFlags("-whatever") @@ -132,8 +132,8 @@ - - scons -Q + + scons -Q @@ -143,7 +143,7 @@ - + env = Environment() d = env.ParseFlags(["-I/opt/include", ["-L/opt/lib", "-lfoo"]]) @@ -158,8 +158,8 @@ - - scons -Q + + scons -Q @@ -170,7 +170,7 @@ - + env = Environment() d = env.ParseFlags(["!echo -I/opt/include", "!echo -L/opt/lib", "-lfoo"]) @@ -185,8 +185,8 @@ - - scons -Q + + scons -Q diff --git a/doc/user/repositories.xml b/doc/user/repositories.xml index b5bb62d..902ef02 100644 --- a/doc/user/repositories.xml +++ b/doc/user/repositories.xml @@ -94,7 +94,7 @@ - + env = Environment() env.Program('hello.c') @@ -150,8 +150,8 @@ - - scons -Q + + scons -Q @@ -163,7 +163,7 @@ - + env = Environment() env.Program('hello.c') @@ -174,8 +174,8 @@ - - scons -Q + + scons -Q @@ -186,7 +186,7 @@ - + env = Environment() env.Program('hello.c') @@ -197,8 +197,8 @@ - - scons -Q + + scons -Q @@ -254,7 +254,7 @@ - + env = Environment(CPPPATH = ['.']) env.Program('hello.c') @@ -271,8 +271,8 @@ - - scons -Q + + scons -Q @@ -290,7 +290,7 @@ - + env = Environment(CPPPATH = ['dir1', 'dir2', 'dir3']) env.Program('hello.c') @@ -310,8 +310,8 @@ - - scons -Q + + scons -Q @@ -625,7 +625,7 @@ coming into existence.) - + env = Environment() hello = env.Program('hello.c') diff --git a/doc/user/scanners.xml b/doc/user/scanners.xml index 6712378..304937c 100644 --- a/doc/user/scanners.xml +++ b/doc/user/scanners.xml @@ -306,7 +306,7 @@ over the file scanning rather than being called for each input line: - + import re @@ -351,11 +351,11 @@ over the file scanning rather than being called for each input line: - - scons -Q - edit other_file - scons -Q - scons -Q + + scons -Q + edit other_file + scons -Q + scons -Q --> @@ -391,7 +391,7 @@ over the file scanning rather than being called for each input line: - + kscan = Scanner(function = kfile_scan, skeys = ['.k'], diff --git a/doc/user/separate.xml b/doc/user/separate.xml index 9699521..ea8c71f 100644 --- a/doc/user/separate.xml +++ b/doc/user/separate.xml @@ -172,7 +172,7 @@ program using the F path name. - + SConscript('src/SConscript', variant_dir='build') @@ -192,10 +192,10 @@ program using the F path name. - - ls src - scons -Q - ls build + + ls src + scons -Q + ls build @@ -358,7 +358,7 @@ program using the F path name. - + VariantDir('build', 'src') env = Environment() @@ -389,10 +389,10 @@ program using the F path name. - - ls src - scons -Q - ls build + + ls src + scons -Q + ls build @@ -402,7 +402,7 @@ program using the F path name. - + VariantDir('build', 'src', duplicate=0) env = Environment() @@ -420,10 +420,10 @@ program using the F path name. - - ls src - scons -Q - ls build + + ls src + scons -Q + ls build @@ -442,7 +442,7 @@ program using the F path name. - + VariantDir('build', 'src') SConscript('build/SConscript') @@ -462,7 +462,7 @@ program using the F path name. - + @@ -471,10 +471,10 @@ program using the F path name. - - ls src - scons -Q - ls build + + ls src + scons -Q + ls build @@ -500,7 +500,7 @@ program using the F path name. - + VariantDir('build', 'src') SConscript('build/SConscript') @@ -530,10 +530,10 @@ program using the F path name. - - ls src - scons -Q - ls build + + ls src + scons -Q + ls build diff --git a/doc/user/sideeffect.xml b/doc/user/sideeffect.xml index ad5c85c..dd0203a 100644 --- a/doc/user/sideeffect.xml +++ b/doc/user/sideeffect.xml @@ -75,7 +75,7 @@ - + env = Environment() f2 = env.Command('file2', 'log', Copy('$TARGET', '$SOURCE')) @@ -92,8 +92,8 @@ - - scons -Q --jobs=2 + + scons -Q --jobs=2 @@ -153,7 +153,7 @@ - + env = Environment() f1 = env.Command('file1.out', 'file1.in', @@ -181,8 +181,8 @@ - - scons -Q --jobs=2 + + scons -Q --jobs=2 @@ -197,7 +197,7 @@ - + env = Environment() f1 = env.Command('file1.out', [], 'echo >$TARGET data1') @@ -207,8 +207,8 @@ - - scons -Q --jobs=2 + + scons -Q --jobs=2 @@ -235,4 +235,4 @@ - \ No newline at end of file + diff --git a/doc/user/simple.xml b/doc/user/simple.xml index 41e4a00..323d83f 100644 --- a/doc/user/simple.xml +++ b/doc/user/simple.xml @@ -80,7 +80,7 @@ - + Program('hello.c') @@ -112,8 +112,8 @@ - - scons + + scons @@ -123,8 +123,8 @@ - - scons + + scons @@ -177,7 +177,7 @@ - + Object('hello.c') @@ -193,8 +193,8 @@ - - scons + + scons @@ -204,8 +204,8 @@ - - scons + + scons @@ -226,7 +226,7 @@ - + Java('classes', 'src') @@ -251,8 +251,8 @@ - - scons + + scons @@ -283,7 +283,7 @@ - + Program('hello.c') @@ -292,9 +292,9 @@ - - scons - scons -c + + scons + scons -c @@ -303,9 +303,9 @@ - - scons - scons -c + + scons + scons -c @@ -440,7 +440,7 @@ - + print "Calling Program('hello.c')" Program('hello.c') @@ -467,8 +467,8 @@ - - scons + + scons @@ -495,8 +495,8 @@ - - scons + + scons @@ -521,8 +521,8 @@ - - scons -Q + + scons -Q diff --git a/doc/user/sourcecode.xml b/doc/user/sourcecode.xml index 55e3089..7251dce 100644 --- a/doc/user/sourcecode.xml +++ b/doc/user/sourcecode.xml @@ -63,7 +63,7 @@ - + env = Environment() env.SourceCode('.', env.BitKeeper()) @@ -74,8 +74,8 @@ - - scons -Q + + scons -Q @@ -89,7 +89,7 @@ - + env = Environment() env.SourceCode('.', env.CVS('/usr/local/CVS')) @@ -97,8 +97,8 @@ - - scons -Q + + scons -Q @@ -112,7 +112,7 @@ - + env = Environment() env.SourceCode('.', env.RCS()) @@ -123,8 +123,8 @@ - - scons -Q + + scons -Q @@ -138,7 +138,7 @@ - + env = Environment() env.SourceCode('.', env.SCCS()) @@ -149,8 +149,8 @@ - - scons -Q + + scons -Q @@ -166,7 +166,7 @@ - + env = Environment() env.SourceCode('.', env.Subversion('XXX')) @@ -174,8 +174,8 @@ - - scons -Q + + scons -Q diff --git a/doc/user/tasks.xml b/doc/user/tasks.xml index 2f2f727..ea02025 100644 --- a/doc/user/tasks.xml +++ b/doc/user/tasks.xml @@ -112,7 +112,7 @@ those files and use them in &SCons;. - + #### SConstruct env = Environment() @@ -153,15 +153,15 @@ Where main.cpp looks like this: - + produces this: - - scons -Q + + scons -Q diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml index 773ccac..d8bcf6e 100644 --- a/doc/user/troubleshoot.xml +++ b/doc/user/troubleshoot.xml @@ -90,7 +90,7 @@ - + # Intentionally misspell the output file name in the # command used to create the file: @@ -119,10 +119,10 @@ - - scons -Q - scons -Q - scons -Q + + scons -Q + scons -Q + scons -Q @@ -142,8 +142,8 @@ - - scons -Q --debug=explain + + scons -Q --debug=explain @@ -172,7 +172,7 @@ - + Program('prog', ['file1.c', 'file2.c', 'file3.c']) @@ -187,10 +187,10 @@ - - scons -Q - edit file2.c - scons -Q --debug=explain + + scons -Q + edit file2.c + scons -Q --debug=explain @@ -210,7 +210,7 @@ - + Program('prog', ['file1.c', 'file2.c', 'file3.c'], CPPPATH='.') @@ -230,10 +230,10 @@ - - scons -Q - edit hello.h - scons -Q --debug=explain + + scons -Q + edit hello.h + scons -Q --debug=explain @@ -276,7 +276,7 @@ - + env = Environment() print env.Dump() @@ -290,8 +290,8 @@ - - scons + + scons @@ -301,8 +301,8 @@ - - scons + + scons @@ -336,7 +336,7 @@ - + env = Environment() print env.Dump('ENV') @@ -349,8 +349,8 @@ - - scons + + scons @@ -359,8 +359,8 @@ - - scons + + scons @@ -389,7 +389,7 @@ - + env = Environment(CPPPATH = ['.']) env.Program('prog', ['f1.c', 'f2.c', 'f3.c']) @@ -415,8 +415,8 @@ - - scons -Q --tree=all + + scons -Q --tree=all @@ -441,8 +441,8 @@ - - scons -Q --tree=all f2.o + + scons -Q --tree=all f2.o @@ -457,8 +457,8 @@ - - scons -Q --tree=all f1.o f3.o + + scons -Q --tree=all f1.o f3.o @@ -469,8 +469,8 @@ - - scons -Q --tree=status + + scons -Q --tree=status @@ -487,8 +487,8 @@ - - scons -Q --tree=derived + + scons -Q --tree=derived @@ -498,8 +498,8 @@ - - scons -Q --tree=derived,status + + scons -Q --tree=derived,status @@ -521,7 +521,7 @@ - + env = Environment(CPPPATH = ['.'], LIBS = ['foo'], @@ -557,8 +557,8 @@ - - scons -Q --tree=all + + scons -Q --tree=all @@ -579,8 +579,8 @@ - - scons -Q --tree=prune + + scons -Q --tree=prune @@ -607,7 +607,7 @@ - + env = Environment(CPPPATH = ['.']) env.Program('prog', 'prog.c') @@ -623,8 +623,8 @@ shows the Python functions from the sconsdoc.py execution wrapper used to generate this manual, not the underlying command-line strings. - - scons -Q - -debug=presub + + scons -Q - -debug=presub --> @@ -655,7 +655,7 @@ - + env = Environment(LIBPATH = ['libs1', 'libs2']) env.Program('prog.c', LIBS=['foo', 'bar']) @@ -681,8 +681,8 @@ - - scons -Q --debug=findlibs + + scons -Q --debug=findlibs @@ -699,7 +699,7 @@ - + env = Environment(CPPPATH = ['inc1', 'inc2']) env.Program('prog.c') @@ -717,8 +717,8 @@ - - scons -Q - - debug=includes prog + + scons -Q - - debug=includes prog @@ -747,7 +747,7 @@ - + Program('prog.c') @@ -761,8 +761,8 @@ - - scons -Q + + scons -Q @@ -778,8 +778,8 @@ - - scons -Q --debug=stacktrace + + scons -Q --debug=stacktrace @@ -827,7 +827,7 @@ - + env = Environment(CPPPATH = ['.']) env.Program('prog.c') @@ -841,8 +841,8 @@ - - scons -Q --taskmastertrace=- prog + + scons -Q --taskmastertrace=- prog diff --git a/doc/user/variants.xml b/doc/user/variants.xml index b841d0a..8daff22 100644 --- a/doc/user/variants.xml +++ b/doc/user/variants.xml @@ -82,7 +82,7 @@ is pretty smart about rebuilding things when you change options. - + platform = ARGUMENTS.get('OS', Platform()) @@ -141,8 +141,8 @@ is pretty smart about rebuilding things when you change options. - - scons -Q OS=linux + + scons -Q OS=linux @@ -151,13 +151,13 @@ is pretty smart about rebuilding things when you change options. - - scons -Q OS=windows + + scons -Q OS=windows diff --git a/doc/xsd/dbpoolx.xsd b/doc/xsd/dbpoolx.xsd index 3c937ee..b5e856f 100644 --- a/doc/xsd/dbpoolx.xsd +++ b/doc/xsd/dbpoolx.xsd @@ -2380,6 +2380,7 @@ + -- cgit v0.12