summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/editor_configs/xmlmind/addon/config/scons/scons_xsd/dbpoolx.xsd1
-rw-r--r--doc/user/add-method.xml10
-rw-r--r--doc/user/alias.xml18
-rw-r--r--doc/user/builders-built-in.xml34
-rw-r--r--doc/user/builders-commands.xml14
-rw-r--r--doc/user/builders-writing.xml62
-rw-r--r--doc/user/caching.xml62
-rw-r--r--doc/user/command-line.xml282
-rw-r--r--doc/user/depends.xml228
-rw-r--r--doc/user/environments.xml114
-rw-r--r--doc/user/factories.xml60
-rw-r--r--doc/user/file-removal.xml22
-rw-r--r--doc/user/gettext.xml12
-rw-r--r--doc/user/hierarchy.xml30
-rw-r--r--doc/user/install.xml34
-rw-r--r--doc/user/java.xml56
-rw-r--r--doc/user/less-simple.xml38
-rw-r--r--doc/user/libraries.xml48
-rw-r--r--doc/user/mergeflags.xml18
-rw-r--r--doc/user/misc.xml80
-rw-r--r--doc/user/nodes.xml40
-rw-r--r--doc/user/output.xml50
-rw-r--r--doc/user/parseconfig.xml12
-rw-r--r--doc/user/parseflags.xml28
-rw-r--r--doc/user/repositories.xml54
-rw-r--r--doc/user/scanners.xml14
-rw-r--r--doc/user/separate.xml52
-rw-r--r--doc/user/sideeffect.xml20
-rw-r--r--doc/user/simple.xml54
-rw-r--r--doc/user/sourcecode.xml30
-rw-r--r--doc/user/tasks.xml8
-rw-r--r--doc/user/troubleshoot.xml124
-rw-r--r--doc/user/variants.xml16
-rw-r--r--doc/xsd/dbpoolx.xsd1
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 @@
<xs:attribute name="edit" type="xs:string" use="optional" />
<xs:attribute name="environment" type="xs:string" use="optional" />
<xs:attribute name="output" type="xs:string" use="optional" />
+ <xs:attribute name="suffix" type="xs:string" use="required" />
</xs:attributeGroup>
<!-- end of scons_output_command.attlist -->
<!-- end of scons_output_command.module -->
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 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="addmethod_ex1">
<file name="SConstruct" printme="1">
def install_in_bin_dirs(env, source):
"""Install source in both bin dirs"""
@@ -81,8 +81,8 @@
This produces the following:
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q /</scons_output_command>
+ <scons_output example="addmethod_ex1">
+ <scons_output_command suffix="1">scons -Q /</scons_output_command>
</scons_output>
<para>
@@ -130,7 +130,7 @@
</para>
<scons_output example="ex2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -138,7 +138,7 @@
</para>
<scons_output example="ex2" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
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 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="alias_ex1">
<file name="SConstruct" printme="1">
env = Environment()
hello = env.Program('hello.c')
@@ -71,8 +71,8 @@
</para>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons -Q install</scons_output_command>
+ <scons_output example="alias_ex1" os="posix">
+ <scons_output_command suffix="1">scons -Q install</scons_output_command>
</scons_output>
<para>
@@ -88,7 +88,7 @@
</para>
- <scons_example name="ex2">
+ <scons_example name="alias_ex2">
<file name="SConstruct" printme="1">
env = Environment()
p = env.Program('foo.c')
@@ -116,11 +116,11 @@
</para>
- <scons_output example="ex2" os="posix">
- <scons_output_command>scons -Q install-bin</scons_output_command>
- <scons_output_command>scons -Q install-lib</scons_output_command>
- <scons_output_command>scons -Q -c __ROOT__/</scons_output_command>
- <scons_output_command>scons -Q install</scons_output_command>
+ <scons_output example="alias_ex2" os="posix">
+ <scons_output_command suffix="1">scons -Q install-bin</scons_output_command>
+ <scons_output_command suffix="2">scons -Q install-lib</scons_output_command>
+ <scons_output_command suffix="3">scons -Q -c __ROOT__/</scons_output_command>
+ <scons_output_command suffix="4">scons -Q install</scons_output_command>
</scons_output>
</chapter>
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 @@
</para>
- <scons_example name="libs">
+ <scons_example name="buildersbuiltin_libs">
<file name="SConstruct" printme="1">
env = Environment(LIBS = ['foo1', 'foo2'],
LIBPATH = ['/usr/dir1', 'dir2'])
@@ -172,8 +172,8 @@
</para>
- <scons_output example="libs" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="buildersbuiltin_libs" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -182,8 +182,8 @@
</para>
- <scons_output example="libs" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="buildersbuiltin_libs" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -743,7 +743,7 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="buildersbuiltin_ex1">
<file name="SConstruct" printme="1">
env = Environment()
env.Tar('out1.tar', ['file1', 'file2'])
@@ -760,8 +760,8 @@
</file>
</scons_example>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons -Q .</scons_output_command>
+ <scons_output example="buildersbuiltin_ex1" os="posix">
+ <scons_output_command suffix="1">scons -Q .</scons_output_command>
</scons_output>
<para>
@@ -779,7 +779,7 @@
</para>
- <scons_example name="ex2">
+ <scons_example name="buildersbuiltin_ex2">
<file name="SConstruct" printme="1">
env = Environment(TARFLAGS = '-c -z')
env.Tar('out.tar.gz', 'directory')
@@ -789,8 +789,8 @@
</file>
</scons_example>
- <scons_output example="ex2" os="posix">
- <scons_output_command>scons -Q .</scons_output_command>
+ <scons_output example="buildersbuiltin_ex2" os="posix">
+ <scons_output_command suffix="1">scons -Q .</scons_output_command>
</scons_output>
<para>
@@ -803,7 +803,7 @@
</para>
- <scons_example name="ex3">
+ <scons_example name="buildersbuiltin_ex3">
<file name="SConstruct" printme="1">
env = Environment(TARFLAGS = '-c -z',
TARSUFFIX = '.tgz')
@@ -814,8 +814,8 @@
</file>
</scons_example>
- <scons_output example="ex3" os="posix">
- <scons_output_command>scons -Q .</scons_output_command>
+ <scons_output example="buildersbuiltin_ex3" os="posix">
+ <scons_output_command suffix="1">scons -Q .</scons_output_command>
</scons_output>
</section>
@@ -835,7 +835,7 @@
</para>
- <scons_example name="ex4">
+ <scons_example name="buildersbuiltin_ex4">
<file name="SConstruct" printme="1">
env = Environment()
env.Zip('out', ['file1', 'file2'])
@@ -856,8 +856,8 @@
</para>
- <scons_output example="ex4" os="posix">
- <scons_output_command>scons -Q .</scons_output_command>
+ <scons_output example="buildersbuiltin_ex4" os="posix">
+ <scons_output_command suffix="1">scons -Q .</scons_output_command>
</scons_output>
</section>
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 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="builderscommands_ex1">
<file name="SConstruct" printme="1">
env = Environment()
env.Command('foo.out', 'foo.in', "sed 's/x/y/' &lt; $SOURCE > $TARGET")
@@ -110,8 +110,8 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderscommands_ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -131,7 +131,7 @@
</para>
- <scons_example name="ex2">
+ <scons_example name="builderscommands_ex2">
<file name="SConstruct" printme="1">
env = Environment()
def build(target, source, env):
@@ -150,8 +150,8 @@
</para>
- <scons_output example="ex2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderscommands_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -162,7 +162,7 @@
</para>
- <scons_example name="ex3">
+ <scons_example name="builderscommands_ex3">
<file name="SConstruct" printme="1">
env.Command('${SOURCE.basename}.out', 'foo.in', build)
</file>
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:
</para>
- <scons_example name="ex1">
+ <scons_example name="builderswriting_ex1">
<file name="SConstruct">
bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
env = Environment(BUILDERS = {'Foo' : bld})
@@ -224,8 +224,8 @@ This functionality could be invoked as in the following example:
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -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.
-->
- <scons_example name="ex2">
+ <scons_example name="builderswriting_ex2">
<file name="SConstruct">
import SCons.Defaults; SCons.Defaults.ConstructionEnvironment['TOOLS'] = {}; bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET')
env = Environment(BUILDERS = {'Foo' : bld})
@@ -280,8 +280,8 @@ This functionality could be invoked as in the following example:
</file>
</scons_example>
- <scons_output example="ex2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -293,7 +293,7 @@ This functionality could be invoked as in the following example:
</para>
- <scons_example name="ex3">
+ <scons_example name="builderswriting_ex3">
<file name="SConstruct">
env = Environment()
import os
@@ -346,8 +346,8 @@ This functionality could be invoked as in the following example:
</para>
- <scons_output example="ex3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_ex3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -372,7 +372,7 @@ This functionality could be invoked as in the following example:
</para>
- <scons_example name="ex4">
+ <scons_example name="builderswriting_ex4">
<file name="SConstruct">
bld = Builder(action = 'foobuild &lt; $SOURCE &gt; $TARGET',
suffix = '.foo',
@@ -403,8 +403,8 @@ This functionality could be invoked as in the following example:
env.Foo('file2')
</sconstruct>
- <scons_output example="ex4">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_ex4">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -519,7 +519,7 @@ This functionality could be invoked as in the following example:
</para>
- <scons_example name="ex5">
+ <scons_example name="builderswriting_ex5">
<file name="SConstruct" printme="1">
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:
</para>
- <scons_output example="ex5">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_ex5">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -666,7 +666,7 @@ This functionality could be invoked as in the following example:
</para>
- <scons_example name="ex6">
+ <scons_example name="builderswriting_ex6">
<file name="SConstruct">
def generate_actions(source, target, env, for_signature):
return 'foobuild &lt; %s &gt; %s' % (source[0], target[0])
@@ -696,8 +696,8 @@ This functionality could be invoked as in the following example:
env.Foo('file')
</sconstruct>
- <scons_output example="ex6">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_ex6">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -744,7 +744,7 @@ This functionality could be invoked as in the following example:
</para>
- <scons_example name="ex7">
+ <scons_example name="builderswriting_ex7">
<file name="SConstruct">
def modify_targets(target, source, env):
target.append('new_target')
@@ -789,8 +789,8 @@ This functionality could be invoked as in the following example:
</para>
- <scons_output example="ex7">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_ex7">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -809,7 +809,7 @@ This functionality could be invoked as in the following example:
</para>
- <scons_example name="MY_EMITTER">
+ <scons_example name="builderswriting_MY_EMITTER">
<file name="SConstruct" printme="1">
bld = Builder(action = 'my_command $SOURCES &gt; $TARGET',
@@ -874,8 +874,8 @@ This functionality could be invoked as in the following example:
</para>
- <scons_output example="MY_EMITTER">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_MY_EMITTER">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -960,7 +960,7 @@ This functionality could be invoked as in the following example:
</para>
- <scons_example name="site1">
+ <scons_example name="builderswriting_site1">
<file name="site_scons/site_init.py" printme="1">
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:
</para>
<!--
- <scons_output example="site1" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_site1" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
-->
@@ -1034,7 +1034,7 @@ This functionality could be invoked as in the following example:
functions:
</para>
- <scons_example name="site2">
+ <scons_example name="builderswriting_site2">
<file name="site_scons/my_utils.py" printme="1">
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:
</para>
- <scons_example name="ex8">
+ <scons_example name="builderswriting_ex8">
<file name="SConstruct" printme="1">
env = Environment()
#env.SourceCode('.', env.BitKeeper('my_command'))
@@ -1121,8 +1121,8 @@ This functionality could be invoked as in the following example:
</file>
</scons_example>
- <scons_output example="ex8">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="builderswriting_ex8">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
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 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="caching_ex1">
<file name="SConstruct">
env = Environment()
env.Program('hello.c')
@@ -120,10 +120,10 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q -c</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="caching_ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q -c</scons_output_command>
+ <scons_output_command suffix="3">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -170,10 +170,10 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q -c</scons_output_command>
- <scons_output_command>scons -Q --cache-show</scons_output_command>
+ <scons_output example="caching_ex1">
+ <scons_output_command suffix="4">scons -Q</scons_output_command>
+ <scons_output_command suffix="5">scons -Q -c</scons_output_command>
+ <scons_output_command suffix="6">scons -Q --cache-show</scons_output_command>
</scons_output>
<para>
@@ -232,10 +232,10 @@
<!--
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q -c</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="caching_ex1">
+ <scons_output_command suffix="7">scons -Q</scons_output_command>
+ <scons_output_command suffix="8">scons -Q -c</scons_output_command>
+ <scons_output_command suffix="9">scons -Q</scons_output_command>
</scons_output>
-->
@@ -284,12 +284,12 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q -c</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q -c</scons_output_command>
- <scons_output_command>scons -Q --cache-disable</scons_output_command>
+ <scons_output example="caching_ex1">
+ <scons_output_command suffix="10">scons -Q</scons_output_command>
+ <scons_output_command suffix="11">scons -Q -c</scons_output_command>
+ <scons_output_command suffix="12">scons -Q</scons_output_command>
+ <scons_output_command suffix="13">scons -Q -c</scons_output_command>
+ <scons_output_command suffix="14">scons -Q --cache-disable</scons_output_command>
</scons_output>
</section>
@@ -325,12 +325,12 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q --cache-disable</scons_output_command>
- <scons_output_command>scons -Q -c</scons_output_command>
- <scons_output_command>scons -Q --cache-disable</scons_output_command>
- <scons_output_command>scons -Q --cache-force</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="caching_ex1">
+ <scons_output_command suffix="15">scons -Q --cache-disable</scons_output_command>
+ <scons_output_command suffix="16">scons -Q -c</scons_output_command>
+ <scons_output_command suffix="17">scons -Q --cache-disable</scons_output_command>
+ <scons_output_command suffix="18">scons -Q --cache-force</scons_output_command>
+ <scons_output_command suffix="19">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -365,7 +365,7 @@
</para>
- <scons_example name="ex-random">
+ <scons_example name="caching_ex-random">
<file name="SConstruct" printme="1">
Program('prog',
['f1.c', 'f2.c', 'f3.c', 'f4.c', 'f5.c'])
@@ -385,8 +385,8 @@
</para>
- <scons_output example="ex-random">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="caching_ex-random">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -420,8 +420,8 @@
The following <screen> output was generated by this:
- <scons_output example="ex-random">
- <scons_output_command>scons -Q - -random</scons_output_command>
+ <scons_output example="caching_ex-random">
+ <scons_output_command suffix="2">scons -Q - -random</scons_output_command>
</scons_output>
We captured it directly here to guarantee a "random" order,
@@ -477,7 +477,7 @@
</para>
- <scons_example name="ex-random">
+ <scons_example name="caching_ex-random">
<file name="SConstruct" printme="1">
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 @@
</para>
- <scons_example name="SCONSFLAGS">
+ <scons_example name="commandline_SCONSFLAGS">
<file name="SConstruct">
def b(target, source, env):
pass
@@ -183,10 +183,10 @@
</file>
</scons_example>
- <scons_output example="SCONSFLAGS">
- <scons_output_command>scons</scons_output_command>
- <scons_output_command>export SCONSFLAGS="-Q"</scons_output_command>
- <scons_output_command environment="SCONSFLAGS=-Q">scons</scons_output_command>
+ <scons_output example="commandline_SCONSFLAGS">
+ <scons_output_command suffix="1">scons</scons_output_command>
+ <scons_output_command suffix="2">export SCONSFLAGS="-Q"</scons_output_command>
+ <scons_output_command environment="SCONSFLAGS=-Q" suffix="3">scons</scons_output_command>
</scons_output>
<para>
@@ -312,7 +312,7 @@
</para>
- <scons_example name="SetOption">
+ <scons_example name="commandline_SetOption">
<file name="SConstruct" printme="1">
import os
num_cpu = int(os.environ.get('NUM_CPU', 2))
@@ -344,8 +344,8 @@
</para>
- <scons_output example="SetOption">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="commandline_SetOption">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -356,9 +356,9 @@
</para>
- <scons_output example="SetOption">
- <scons_output_command>export NUM_CPU="4"</scons_output_command>
- <scons_output_command environment="NUM_CPU=4">scons -Q</scons_output_command>
+ <scons_output example="commandline_SetOption">
+ <scons_output_command suffix="2">export NUM_CPU="4"</scons_output_command>
+ <scons_output_command environment="NUM_CPU=4" suffix="3">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -372,10 +372,10 @@
</para>
- <scons_output example="SetOption">
- <scons_output_command>scons -Q -j 7</scons_output_command>
- <scons_output_command>export NUM_CPU="4"</scons_output_command>
- <scons_output_command environment="NUM_CPU=4">scons -Q -j 3</scons_output_command>
+ <scons_output example="commandline_SetOption">
+ <scons_output_command suffix="4">scons -Q -j 7</scons_output_command>
+ <scons_output_command suffix="5">export NUM_CPU="4"</scons_output_command>
+ <scons_output_command environment="NUM_CPU=4" suffix="6">scons -Q -j 3</scons_output_command>
</scons_output>
</section>
@@ -626,7 +626,7 @@
</para>
- <scons_example name="AddOption">
+ <scons_example name="commandline_AddOption">
<file name="SConstruct" printme="1">
AddOption('--prefix',
dest='prefix',
@@ -662,8 +662,8 @@
</para>
- <scons_output example="AddOption">
- <scons_output_command>scons -Q -n</scons_output_command>
+ <scons_output example="commandline_AddOption">
+ <scons_output_command suffix="1">scons -Q -n</scons_output_command>
</scons_output>
<para>
@@ -674,8 +674,8 @@
</para>
- <scons_output example="AddOption">
- <scons_output_command>scons -Q -n --prefix=/tmp/install</scons_output_command>
+ <scons_output example="commandline_AddOption">
+ <scons_output_command suffix="2">scons -Q -n --prefix=/tmp/install</scons_output_command>
</scons_output>
</section>
@@ -731,7 +731,7 @@
</para>
- <scons_example name="ARGUMENTS">
+ <scons_example name="commandline_ARGUMENTS">
<file name="SConstruct" printme="1">
env = Environment()
debug = ARGUMENTS.get('debug', 0)
@@ -753,11 +753,11 @@
</para>
- <scons_output example="ARGUMENTS">
- <scons_output_command>scons -Q debug=0</scons_output_command>
- <scons_output_command>scons -Q debug=0</scons_output_command>
- <scons_output_command>scons -Q debug=1</scons_output_command>
- <scons_output_command>scons -Q debug=1</scons_output_command>
+ <scons_output example="commandline_ARGUMENTS">
+ <scons_output_command suffix="1">scons -Q debug=0</scons_output_command>
+ <scons_output_command suffix="2">scons -Q debug=0</scons_output_command>
+ <scons_output_command suffix="3">scons -Q debug=1</scons_output_command>
+ <scons_output_command suffix="4">scons -Q debug=1</scons_output_command>
</scons_output>
<para>
@@ -820,7 +820,7 @@
</para>
- <scons_example name="ARGLIST">
+ <scons_example name="commandline_ARGLIST">
<file name="SConstruct" printme="1">
cppdefines = []
for key, value in ARGLIST:
@@ -840,9 +840,9 @@
</para>
- <scons_output example="ARGLIST">
- <scons_output_command>scons -Q define=FOO</scons_output_command>
- <scons_output_command>scons -Q define=FOO define=BAR</scons_output_command>
+ <scons_output example="commandline_ARGLIST">
+ <scons_output_command suffix="1">scons -Q define=FOO</scons_output_command>
+ <scons_output_command suffix="2">scons -Q define=FOO define=BAR</scons_output_command>
</scons_output>
<para>
@@ -905,7 +905,7 @@
</para>
- <scons_example name="Variables1">
+ <scons_example name="commandline_Variables1">
<file name="SConstruct" printme="1">
vars = Variables(None, ARGUMENTS)
vars.Add('RELEASE', 'Set to 1 to build for release', 0)
@@ -950,8 +950,8 @@
</para>
- <scons_output example="Variables1">
- <scons_output_command>scons -Q RELEASE=1</scons_output_command>
+ <scons_output example="commandline_Variables1">
+ <scons_output_command suffix="1">scons -Q RELEASE=1</scons_output_command>
</scons_output>
<para>
@@ -996,7 +996,7 @@
</para>
- <scons_example name="Variables_Help">
+ <scons_example name="commandline_Variables_Help">
<file name="SConstruct" printme="1">
vars = Variables(None, ARGUMENTS)
vars.Add('RELEASE', 'Set to 1 to build for release', 0)
@@ -1012,8 +1012,8 @@
</para>
- <scons_output example="Variables_Help">
- <scons_output_command>scons -Q -h</scons_output_command>
+ <scons_output example="commandline_Variables_Help">
+ <scons_output_command suffix="1">scons -Q -h</scons_output_command>
</scons_output>
<para>
@@ -1043,7 +1043,7 @@
</para>
- <scons_example name="Variables_custom_py_1">
+ <scons_example name="commandline_Variables_custom_py_1">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add('RELEASE', 'Set to 1 to build for release', 0)
@@ -1070,7 +1070,7 @@
</para>
- <scons_example_file example="Variables_custom_py_1" name="custom.py"></scons_example_file>
+ <scons_example_file example="commandline_Variables_custom_py_1" name="custom.py"></scons_example_file>
<para>
@@ -1080,8 +1080,8 @@
</para>
- <scons_output example="Variables_custom_py_1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="commandline_Variables_custom_py_1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1090,7 +1090,7 @@
</para>
- <scons_example name="Variables_custom_py_2">
+ <scons_example name="commandline_Variables_custom_py_2">
<file name="SConstruct">
vars = Variables('custom.py')
vars.Add('RELEASE', 'Set to 1 to build for release', 0)
@@ -1117,8 +1117,8 @@
</para>
- <scons_output example="Variables_custom_py_2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="commandline_Variables_custom_py_2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1180,7 +1180,7 @@
</para>
- <scons_example name="BoolVariable">
+ <scons_example name="commandline_BoolVariable">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(BoolVariable('RELEASE', 'Set to build for release', 0))
@@ -1202,12 +1202,12 @@
</para>
- <scons_output example="BoolVariable">
- <scons_output_command>scons -Q RELEASE=yes foo.o</scons_output_command>
+ <scons_output example="commandline_BoolVariable">
+ <scons_output_command suffix="1">scons -Q RELEASE=yes foo.o</scons_output_command>
</scons_output>
- <scons_output example="BoolVariable">
- <scons_output_command>scons -Q RELEASE=t foo.o</scons_output_command>
+ <scons_output example="commandline_BoolVariable">
+ <scons_output_command suffix="2">scons -Q RELEASE=t foo.o</scons_output_command>
</scons_output>
<para>
@@ -1231,12 +1231,12 @@
</para>
- <scons_output example="BoolVariable">
- <scons_output_command>scons -Q RELEASE=no foo.o</scons_output_command>
+ <scons_output example="commandline_BoolVariable">
+ <scons_output_command suffix="3">scons -Q RELEASE=no foo.o</scons_output_command>
</scons_output>
- <scons_output example="BoolVariable">
- <scons_output_command>scons -Q RELEASE=f foo.o</scons_output_command>
+ <scons_output example="commandline_BoolVariable">
+ <scons_output_command suffix="4">scons -Q RELEASE=f foo.o</scons_output_command>
</scons_output>
<para>
@@ -1258,8 +1258,8 @@
</para>
- <scons_output example="BoolVariable">
- <scons_output_command>scons -Q RELEASE=bad_value foo.o</scons_output_command>
+ <scons_output example="commandline_BoolVariable">
+ <scons_output_command suffix="5">scons -Q RELEASE=bad_value foo.o</scons_output_command>
</scons_output>
</section>
@@ -1284,7 +1284,7 @@
</para>
- <scons_example name="EnumVariable">
+ <scons_example name="commandline_EnumVariable">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(EnumVariable('COLOR', 'Set background color', 'red',
@@ -1305,10 +1305,10 @@
</para>
- <scons_output example="EnumVariable">
- <scons_output_command>scons -Q COLOR=red foo.o</scons_output_command>
- <scons_output_command>scons -Q COLOR=blue foo.o</scons_output_command>
- <scons_output_command>scons -Q COLOR=green foo.o</scons_output_command>
+ <scons_output example="commandline_EnumVariable">
+ <scons_output_command suffix="1">scons -Q COLOR=red foo.o</scons_output_command>
+ <scons_output_command suffix="2">scons -Q COLOR=blue foo.o</scons_output_command>
+ <scons_output_command suffix="3">scons -Q COLOR=green foo.o</scons_output_command>
</scons_output>
<para>
@@ -1320,8 +1320,8 @@
</para>
- <scons_output example="EnumVariable">
- <scons_output_command>scons -Q COLOR=magenta foo.o</scons_output_command>
+ <scons_output example="commandline_EnumVariable">
+ <scons_output_command suffix="4">scons -Q COLOR=magenta foo.o</scons_output_command>
</scons_output>
<para>
@@ -1364,7 +1364,7 @@
</para>
<scons_output example="EnumVariable_map">
- <scons_output_command>scons -Q COLOR=navy foo.o</scons_output_command>
+ <scons_output_command suffix="1">scons -Q COLOR=navy foo.o</scons_output_command>
</scons_output>
<para>
@@ -1377,10 +1377,10 @@
</para>
- <scons_output example="EnumVariable">
- <scons_output_command>scons -Q COLOR=Red foo.o</scons_output_command>
- <scons_output_command>scons -Q COLOR=BLUE foo.o</scons_output_command>
- <scons_output_command>scons -Q COLOR=nAvY foo.o</scons_output_command>
+ <scons_output example="commandline_EnumVariable">
+ <scons_output_command suffix="5">scons -Q COLOR=Red foo.o</scons_output_command>
+ <scons_output_command suffix="6">scons -Q COLOR=BLUE foo.o</scons_output_command>
+ <scons_output_command suffix="7">scons -Q COLOR=nAvY foo.o</scons_output_command>
</scons_output>
<para>
@@ -1393,7 +1393,7 @@
</para>
- <scons_example name="EnumVariable_ic1">
+ <scons_example name="commandline_EnumVariable_ic1">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(EnumVariable('COLOR', 'Set background color', 'red',
@@ -1415,11 +1415,11 @@
</para>
- <scons_output example="EnumVariable_ic1">
- <scons_output_command>scons -Q COLOR=Red foo.o</scons_output_command>
- <scons_output_command>scons -Q COLOR=BLUE foo.o</scons_output_command>
- <scons_output_command>scons -Q COLOR=nAvY foo.o</scons_output_command>
- <scons_output_command>scons -Q COLOR=green foo.o</scons_output_command>
+ <scons_output example="commandline_EnumVariable_ic1">
+ <scons_output_command suffix="1">scons -Q COLOR=Red foo.o</scons_output_command>
+ <scons_output_command suffix="2">scons -Q COLOR=BLUE foo.o</scons_output_command>
+ <scons_output_command suffix="3">scons -Q COLOR=nAvY foo.o</scons_output_command>
+ <scons_output_command suffix="4">scons -Q COLOR=green foo.o</scons_output_command>
</scons_output>
<para>
@@ -1433,7 +1433,7 @@
</para>
- <scons_example name="EnumVariable_ic2">
+ <scons_example name="commandline_EnumVariable_ic2">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(EnumVariable('COLOR', 'Set background color', 'red',
@@ -1460,10 +1460,10 @@
</para>
- <scons_output example="EnumVariable_ic2">
- <scons_output_command>scons -Q COLOR=Red foo.o</scons_output_command>
- <scons_output_command>scons -Q COLOR=nAvY foo.o</scons_output_command>
- <scons_output_command>scons -Q COLOR=GREEN foo.o</scons_output_command>
+ <scons_output example="commandline_EnumVariable_ic2">
+ <scons_output_command suffix="1">scons -Q COLOR=Red foo.o</scons_output_command>
+ <scons_output_command suffix="2">scons -Q COLOR=nAvY foo.o</scons_output_command>
+ <scons_output_command suffix="3">scons -Q COLOR=GREEN foo.o</scons_output_command>
</scons_output>
</section>
@@ -1482,7 +1482,7 @@
</para>
- <scons_example name="ListVariable">
+ <scons_example name="commandline_ListVariable">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(ListVariable('COLORS', 'List of colors', 0,
@@ -1505,9 +1505,9 @@
</para>
- <scons_output example="ListVariable">
- <scons_output_command>scons -Q COLORS=red,blue foo.o</scons_output_command>
- <scons_output_command>scons -Q COLORS=blue,green,red foo.o</scons_output_command>
+ <scons_output example="commandline_ListVariable">
+ <scons_output_command suffix="1">scons -Q COLORS=red,blue foo.o</scons_output_command>
+ <scons_output_command suffix="2">scons -Q COLORS=blue,green,red foo.o</scons_output_command>
</scons_output>
<para>
@@ -1520,9 +1520,9 @@
</para>
- <scons_output example="ListVariable">
- <scons_output_command>scons -Q COLORS=all foo.o</scons_output_command>
- <scons_output_command>scons -Q COLORS=none foo.o</scons_output_command>
+ <scons_output example="commandline_ListVariable">
+ <scons_output_command suffix="3">scons -Q COLORS=all foo.o</scons_output_command>
+ <scons_output_command suffix="4">scons -Q COLORS=none foo.o</scons_output_command>
</scons_output>
<para>
@@ -1532,8 +1532,8 @@
</para>
- <scons_output example="ListVariable">
- <scons_output_command>scons -Q COLORS=magenta foo.o</scons_output_command>
+ <scons_output example="commandline_ListVariable">
+ <scons_output_command suffix="5">scons -Q COLORS=magenta foo.o</scons_output_command>
</scons_output>
</section>
@@ -1553,7 +1553,7 @@
</para>
- <scons_example name="PathVariable">
+ <scons_example name="commandline_PathVariable">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(PathVariable('CONFIG',
@@ -1582,9 +1582,9 @@
</para>
- <scons_output example="PathVariable">
- <scons_output_command>scons -Q foo.o</scons_output_command>
- <scons_output_command>scons -Q CONFIG=__ROOT__/usr/local/etc/other_config foo.o</scons_output_command>
+ <scons_output example="commandline_PathVariable">
+ <scons_output_command suffix="1">scons -Q foo.o</scons_output_command>
+ <scons_output_command suffix="2">scons -Q CONFIG=__ROOT__/usr/local/etc/other_config foo.o</scons_output_command>
</scons_output>
<para>
@@ -1595,8 +1595,8 @@
</para>
- <scons_output example="PathVariable">
- <scons_output_command>scons -Q CONFIG=__ROOT__/does/not/exist foo.o</scons_output_command>
+ <scons_output example="commandline_PathVariable">
+ <scons_output_command suffix="3">scons -Q CONFIG=__ROOT__/does/not/exist foo.o</scons_output_command>
</scons_output>
<para>
@@ -1609,7 +1609,7 @@
</para>
- <scons_example name="PathIsFile">
+ <scons_example name="commandline_PathIsFile">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(PathVariable('CONFIG',
@@ -1636,7 +1636,7 @@
</para>
- <scons_example name="PathIsDir">
+ <scons_example name="commandline_PathIsDir">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(PathVariable('DBDIR',
@@ -1665,7 +1665,7 @@
</para>
- <scons_example name="PathIsDirCreate">
+ <scons_example name="commandline_PathIsDirCreate">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(PathVariable('DBDIR',
@@ -1693,7 +1693,7 @@
</para>
- <scons_example name="PathAccept">
+ <scons_example name="commandline_PathAccept">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(PathVariable('OUTPUT',
@@ -1728,7 +1728,7 @@
</para>
- <scons_example name="PackageVariable">
+ <scons_example name="commandline_PackageVariable">
<file name="SConstruct" printme="1">
vars = Variables('custom.py')
vars.Add(PackageVariable('PACKAGE',
@@ -1762,11 +1762,11 @@
</para>
- <scons_output example="PackageVariable">
- <scons_output_command>scons -Q foo.o</scons_output_command>
- <scons_output_command>scons -Q PACKAGE=__ROOT__/usr/local/location foo.o</scons_output_command>
- <scons_output_command>scons -Q PACKAGE=yes foo.o</scons_output_command>
- <scons_output_command>scons -Q PACKAGE=no foo.o</scons_output_command>
+ <scons_output example="commandline_PackageVariable">
+ <scons_output_command suffix="1">scons -Q foo.o</scons_output_command>
+ <scons_output_command suffix="2">scons -Q PACKAGE=__ROOT__/usr/local/location foo.o</scons_output_command>
+ <scons_output_command suffix="3">scons -Q PACKAGE=yes foo.o</scons_output_command>
+ <scons_output_command suffix="4">scons -Q PACKAGE=no foo.o</scons_output_command>
</scons_output>
</section>
@@ -1794,7 +1794,7 @@
</para>
- <scons_example name="AddVariables_1">
+ <scons_example name="commandline_AddVariables_1">
<file name="SConstruct" printme="1">
vars = Variables()
vars.AddVariables(
@@ -1855,7 +1855,7 @@
</para>
- <scons_example name="UnknownVariables">
+ <scons_example name="commandline_UnknownVariables">
<file name="SConstruct" printme="1">
vars = Variables(None)
vars.Add('RELEASE', 'Set to 1 to build for release', 0)
@@ -1891,8 +1891,8 @@
</para>
- <scons_output example="UnknownVariables">
- <scons_output_command>scons -Q NOT_KNOWN=foo</scons_output_command>
+ <scons_output example="commandline_UnknownVariables">
+ <scons_output_command suffix="1">scons -Q NOT_KNOWN=foo</scons_output_command>
</scons_output>
<para>
@@ -1942,7 +1942,7 @@
</para>
- <scons_example name="COMMAND_LINE_TARGETS">
+ <scons_example name="commandline_COMMAND_LINE_TARGETS">
<file name="SConstruct" printme="1">
if 'bar' in COMMAND_LINE_TARGETS:
print "Don't forget to copy `bar' to the archive!"
@@ -1966,9 +1966,9 @@
</para>
- <scons_output example="COMMAND_LINE_TARGETS">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q bar</scons_output_command>
+ <scons_output example="commandline_COMMAND_LINE_TARGETS">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q bar</scons_output_command>
</scons_output>
<para>
@@ -2004,7 +2004,7 @@
</para>
- <scons_example name="Default1">
+ <scons_example name="commandline_Default1">
<file name="SConstruct" printme="1">
env = Environment()
hello = env.Program('hello.c')
@@ -2028,10 +2028,10 @@
</para>
- <scons_output example="Default1">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q goodbye</scons_output_command>
+ <scons_output example="commandline_Default1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
+ <scons_output_command suffix="3">scons -Q goodbye</scons_output_command>
</scons_output>
<para>
@@ -2045,8 +2045,8 @@
</para>
- <scons_output example="Default1">
- <scons_output_command>scons -Q .</scons_output_command>
+ <scons_output example="commandline_Default1">
+ <scons_output_command suffix="4">scons -Q .</scons_output_command>
</scons_output>
<para>
@@ -2058,7 +2058,7 @@
</para>
- <scons_example name="Default2">
+ <scons_example name="commandline_Default2">
<file name="SConstruct" printme="1">
env = Environment()
prog1 = env.Program('prog1.c')
@@ -2104,9 +2104,9 @@
</para>
- <scons_output example="Default2">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q .</scons_output_command>
+ <scons_output example="commandline_Default2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q .</scons_output_command>
</scons_output>
<para>
@@ -2116,7 +2116,7 @@
</para>
- <scons_example name="Default3">
+ <scons_example name="commandline_Default3">
<file name="SConstruct" printme="1">
env = Environment()
env.Program(['prog1/main.c', 'prog1/foo.c'])
@@ -2146,10 +2146,10 @@
</para>
- <scons_output example="Default3">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q .</scons_output_command>
+ <scons_output example="commandline_Default3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
+ <scons_output_command suffix="3">scons -Q .</scons_output_command>
</scons_output>
<para>
@@ -2161,7 +2161,7 @@
</para>
- <scons_example name="Default4">
+ <scons_example name="commandline_Default4">
<file name="SConstruct" printme="1">
env = Environment()
prog1 = env.Program('prog1.c')
@@ -2182,9 +2182,9 @@
</para>
- <scons_output example="Default4">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q .</scons_output_command>
+ <scons_output example="commandline_Default4">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q .</scons_output_command>
</scons_output>
<section>
@@ -2206,7 +2206,7 @@
</para>
- <scons_example name="DEFAULT_TARGETS_1">
+ <scons_example name="commandline_DEFAULT_TARGETS_1">
<file name="SConstruct" printme="1">
prog1 = Program('prog1.c')
Default(prog1)
@@ -2227,8 +2227,8 @@
</para>
- <scons_output example="DEFAULT_TARGETS_1">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="commandline_DEFAULT_TARGETS_1">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
@@ -2240,7 +2240,7 @@
</para>
- <scons_example name="DEFAULT_TARGETS_2">
+ <scons_example name="commandline_DEFAULT_TARGETS_2">
<file name="SConstruct" printme="1">
prog1 = Program('prog1.c')
Default(prog1)
@@ -2263,8 +2263,8 @@
</para>
- <scons_output example="DEFAULT_TARGETS_2">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="commandline_DEFAULT_TARGETS_2">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
@@ -2333,7 +2333,7 @@
</para>
- <scons_example name="BUILD_TARGETS_1">
+ <scons_example name="commandline_BUILD_TARGETS_1">
<file name="SConstruct" printme="1">
prog1 = Program('prog1.c')
Program('prog2.c')
@@ -2356,10 +2356,10 @@
</para>
- <scons_output example="BUILD_TARGETS_1">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q prog2</scons_output_command>
- <scons_output_command>scons -Q -c .</scons_output_command>
+ <scons_output example="commandline_BUILD_TARGETS_1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q prog2</scons_output_command>
+ <scons_output_command suffix="3">scons -Q -c .</scons_output_command>
</scons_output>
</section>
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 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="depends_ex1">
<file name="SConstruct">
Program('hello.c')
</file>
@@ -67,9 +67,9 @@
</file>
</scons_example>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="depends_ex1" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -83,9 +83,9 @@
</para>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ex1" os="posix">
+ <scons_output_command suffix="3">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="4">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -135,10 +135,10 @@
</para>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>touch hello.c</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ex1" os="posix">
+ <scons_output_command suffix="5">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="6">touch hello.c</scons_output_command>
+ <scons_output_command suffix="7">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -157,10 +157,10 @@
</para>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command output=" [CHANGE THE CONTENTS OF hello.c]">edit hello.c</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ex1" os="posix">
+ <scons_output_command suffix="8">scons -Q hello</scons_output_command>
+ <scons_output_command output=" [CHANGE THE CONTENTS OF hello.c]" suffix="9">edit hello.c</scons_output_command>
+ <scons_output_command suffix="10">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -216,10 +216,10 @@
</para>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command output=" [CHANGE A COMMENT IN hello.c]" edit="STRIP CCCOM line">edit hello.c</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ex1" os="posix">
+ <scons_output_command suffix="11">scons -Q hello</scons_output_command>
+ <scons_output_command output=" [CHANGE A COMMENT IN hello.c]" edit="STRIP CCCOM line" suffix="12">edit hello.c</scons_output_command>
+ <scons_output_command suffix="13">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -268,7 +268,7 @@
</para>
- <scons_example name="newer">
+ <scons_example name="depends_newer">
<file name="SConstruct" printme="1">
Object('hello.c')
Decider('timestamp-newer')
@@ -286,10 +286,10 @@
</para>
- <scons_output example="newer" os="posix">
- <scons_output_command>scons -Q hello.o</scons_output_command>
- <scons_output_command>touch hello.c</scons_output_command>
- <scons_output_command>scons -Q hello.o</scons_output_command>
+ <scons_output example="depends_newer" os="posix">
+ <scons_output_command suffix="1">scons -Q hello.o</scons_output_command>
+ <scons_output_command suffix="2">touch hello.c</scons_output_command>
+ <scons_output_command suffix="3">scons -Q hello.o</scons_output_command>
</scons_output>
<para>
@@ -337,7 +337,7 @@
</para>
- <scons_example name="match">
+ <scons_example name="depends_match">
<file name="SConstruct" printme="1">
Object('hello.c')
Decider('timestamp-match')
@@ -359,10 +359,10 @@
</para>
- <scons_output example="match" os="posix">
- <scons_output_command>scons -Q hello.o</scons_output_command>
- <scons_output_command>touch -t 198901010000 hello.c</scons_output_command>
- <scons_output_command>scons -Q hello.o</scons_output_command>
+ <scons_output example="depends_match" os="posix">
+ <scons_output_command suffix="1">scons -Q hello.o</scons_output_command>
+ <scons_output_command suffix="2">touch -t 198901010000 hello.c</scons_output_command>
+ <scons_output_command suffix="3">scons -Q hello.o</scons_output_command>
</scons_output>
<para>
@@ -396,7 +396,7 @@
</para>
- <scons_example name="MD5-timestamp">
+ <scons_example name="depends_MD5-timestamp">
<file name="SConstruct" printme="1">
Program('hello.c')
Decider('MD5-timestamp')
@@ -420,12 +420,12 @@
output seems to get this wrong.
Just in-line the output for now.
- <scons_output example="MD5-timestamp" os="posix">
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>touch hello.c</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command output=" [CHANGE THE CONTENTS OF hello.c]">edit hello.c</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_MD5-timestamp" os="posix">
+ <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="2">touch hello.c</scons_output_command>
+ <scons_output_command suffix="3">scons -Q hello</scons_output_command>
+ <scons_output_command output=" [CHANGE THE CONTENTS OF hello.c]" suffix="4">edit hello.c</scons_output_command>
+ <scons_output_command suffix="5">scons -Q hello</scons_output_command>
</scons_output>
-->
@@ -514,7 +514,7 @@
</para>
- <scons_example name="function">
+ <scons_example name="depends_function">
<file name="SConstruct" printme="1">
Program('hello.c')
def decide_if_changed(dependency, target, prev_ni):
@@ -696,7 +696,7 @@
</para>
- <scons_example name="mixing">
+ <scons_example name="depends_mixing">
<file name="SConstruct" printme="1">
env1 = Environment(CPPPATH = ['.'])
env2 = env1.Clone()
@@ -729,10 +729,10 @@
</para>
- <scons_output example="mixing" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>touch inc.h</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="depends_mixing" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">touch inc.h</scons_output_command>
+ <scons_output_command suffix="3">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -947,7 +947,7 @@
</para>
- <scons_example name="include">
+ <scons_example name="depends_include">
<file name="SConstruct">
Program('hello.c', CPPPATH = '.')
</file>
@@ -970,7 +970,7 @@
</para>
- <scons_example_file example="include" name="hello.h">
+ <scons_example_file example="depends_include" name="hello.h">
</scons_example_file>
<para>
@@ -983,7 +983,7 @@
</para>
- <scons_example_file example="include" name="SConstruct">
+ <scons_example_file example="depends_include" name="SConstruct">
</scons_example_file>
<para>
@@ -997,11 +997,11 @@
</para>
- <scons_output example="include" os="posix">
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command output=" [CHANGE THE CONTENTS OF hello.h]">edit hello.h</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_include" os="posix">
+ <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="2">scons -Q hello</scons_output_command>
+ <scons_output_command output=" [CHANGE THE CONTENTS OF hello.h]" suffix="3">edit hello.h</scons_output_command>
+ <scons_output_command suffix="4">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -1047,7 +1047,7 @@
</para>
- <scons_example name="ex5">
+ <scons_example name="depends_ex5">
<file name="SConstruct" printme="1">
Program('hello.c', CPPPATH = ['include', '/home/project/inc'])
</file>
@@ -1062,8 +1062,8 @@
</para>
- <scons_output example="ex5" os="posix">
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ex5" os="posix">
+ <scons_output_command suffix="1">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -1072,8 +1072,8 @@
</para>
- <scons_output example="ex5" os="win32">
- <scons_output_command>scons -Q hello.exe</scons_output_command>
+ <scons_output example="depends_ex5" os="win32">
+ <scons_output_command suffix="2">scons -Q hello.exe</scons_output_command>
</scons_output>
</section>
@@ -1126,9 +1126,9 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q --implicit-cache hello</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ex1">
+ <scons_output_command suffix="14">scons -Q --implicit-cache hello</scons_output_command>
+ <scons_output_command suffix="15">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -1206,9 +1206,9 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q --implicit-deps-changed hello</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ex1">
+ <scons_output_command suffix="16">scons -Q --implicit-deps-changed hello</scons_output_command>
+ <scons_output_command suffix="17">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -1241,9 +1241,9 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q --implicit-deps-unchanged hello</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ex1">
+ <scons_output_command suffix="18">scons -Q --implicit-deps-unchanged hello</scons_output_command>
+ <scons_output_command suffix="19">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -1362,7 +1362,7 @@
</para>
- <scons_example name="macroinc">
+ <scons_example name="depends_macroinc">
<file name="hello.c" printme="1">
#define FOO_HEADER &lt;foo.h&gt;
#include FOO_HEADER
@@ -1379,11 +1379,11 @@
</file>
</scons_example>
- <scons_output example="macroinc" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="depends_macroinc" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
<scons_output_command output=" [CHANGE CONTENTS OF foo.h]"
- >edit foo.h</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ suffix="2">edit foo.h</scons_output_command>
+ <scons_output_command suffix="3">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1415,7 +1415,7 @@
priori specification of the dependency file. The produced hello.d
file is not found (or used) for unknown reasons. -->
- <scons_example name="parsedep">
+ <scons_example name="depends_parsedep">
<file name="hello.c">
#define FOO_HEADER &lt;foo.h&gt;
#include FOO_HEADER
@@ -1438,11 +1438,11 @@
</file>
</scons_example>
- <scons_output example="parsedep" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="depends_parsedep" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
<scons_output_command output=" [CHANGE CONTENTS OF foo.h]"
- >edit foo.h</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ suffix="2">edit foo.h</scons_output_command>
+ <scons_output_command suffix="3">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1453,7 +1453,7 @@
</para>
- <scons_example name="parsedeprebuild">
+ <scons_example name="depends_parsedeprebuild">
<file name="hello.c">
#define FOO_HEADER &lt;foo.h&gt;
#include FOO_HEADER
@@ -1474,10 +1474,10 @@
</scons_example>
<!--
- <scons_output example="parsedeprebuild" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="depends_parsedeprebuild" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
+ <scons_output_command suffix="3">scons -Q</scons_output_command>
</scons_output>
-->
@@ -1532,7 +1532,7 @@
</para>
- <scons_example name="ignore">
+ <scons_example name="depends_ignore">
<file name="SConstruct" printme="1">
hello_obj=Object('hello.c')
hello = Program(hello_obj)
@@ -1550,11 +1550,11 @@
<!-- XXX mention that you can use lists for target and source? -->
<!--
- <scons_output example="ignore">
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command output=" [CHANGE THE CONTENTS OF hello.h]">edit hello.h</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ignore">
+ <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="2">scons -Q hello</scons_output_command>
+ <scons_output_command output=" [CHANGE THE CONTENTS OF hello.h]" suffix="3">edit hello.h</scons_output_command>
+ <scons_output_command suffix="4">scons -Q hello</scons_output_command>
XXX THIS EXAMPLE SHOULD BE UP-TO-DATE! XXX
</scons_output>
-->
@@ -1608,7 +1608,7 @@
by default.
</para>
- <scons_example name="ignore_explicit">
+ <scons_example name="depends_ignore_explicit">
<file name="SConstruct" printme="1">
hello_obj=Object('hello.c')
hello = Program(hello_obj)
@@ -1620,10 +1620,10 @@
</file>
</scons_example>
- <scons_output example="ignore_explicit" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_ignore_explicit" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="3">scons -Q hello</scons_output_command>
</scons_output>
</section>
@@ -1669,7 +1669,7 @@
</para>
- <scons_example name="no-Requires">
+ <scons_example name="depends_no-Requires">
<file name="SConstruct" printme="1">
import time
@@ -1699,12 +1699,12 @@
</para>
- <scons_output example="no-Requires">
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>sleep 1</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>sleep 1</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_no-Requires">
+ <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="2">sleep 1</scons_output_command>
+ <scons_output_command suffix="3">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="4">sleep 1</scons_output_command>
+ <scons_output_command suffix="5">scons -Q hello</scons_output_command>
</scons_output>
<para>
@@ -1728,7 +1728,7 @@
</para>
- <scons_example name="Requires">
+ <scons_example name="depends_Requires">
<file name="SConstruct" printme="1">
import time
@@ -1776,15 +1776,15 @@
</para>
- <scons_output example="Requires">
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>sleep 1</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>sleep 1</scons_output_command>
- <scons_output_command output=" [CHANGE THE CONTENTS OF hello.c]">edit hello.c</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
- <scons_output_command>sleep 1</scons_output_command>
- <scons_output_command>scons -Q hello</scons_output_command>
+ <scons_output example="depends_Requires">
+ <scons_output_command suffix="1">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="2">sleep 1</scons_output_command>
+ <scons_output_command suffix="3">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="4">sleep 1</scons_output_command>
+ <scons_output_command output=" [CHANGE THE CONTENTS OF hello.c]" suffix="5">edit hello.c</scons_output_command>
+ <scons_output_command suffix="6">scons -Q hello</scons_output_command>
+ <scons_output_command suffix="7">sleep 1</scons_output_command>
+ <scons_output_command suffix="8">scons -Q hello</scons_output_command>
</scons_output>
</section>
@@ -1801,7 +1801,7 @@
</para>
- <scons_example name="AlwaysBuild">
+ <scons_example name="depends_AlwaysBuild">
<file name="SConstruct" printme="1">
hello = Program('hello.c')
AlwaysBuild(hello)
@@ -1820,9 +1820,9 @@
</para>
- <scons_output example="AlwaysBuild">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="depends_AlwaysBuild">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1842,9 +1842,9 @@
</para>
- <scons_output example="AlwaysBuild">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q hello.o</scons_output_command>
+ <scons_output example="depends_AlwaysBuild">
+ <scons_output_command suffix="3">scons -Q</scons_output_command>
+ <scons_output_command suffix="4">scons -Q hello.o</scons_output_command>
</scons_output>
<!--
diff --git a/doc/user/environments.xml b/doc/user/environments.xml
index b741ca3..ad810dd 100644
--- a/doc/user/environments.xml
+++ b/doc/user/environments.xml
@@ -488,7 +488,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex1">
+ <scons_example name="environments_ex1">
<file name="SConstruct" printme="1">
import os
</file>
@@ -577,7 +577,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex1">
+ <scons_example name="environments_ex1">
<file name="SConstruct" printme="1">
env = Environment(CC = 'gcc',
CCFLAGS = '-O2')
@@ -607,8 +607,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -624,7 +624,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex6">
+ <scons_example name="environments_ex6">
<file name="SConstruct" printme="1">
env = Environment()
print "CC is:", env['CC']
@@ -639,8 +639,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex6">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex6">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -653,7 +653,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex6b">
+ <scons_example name="environments_ex6b">
<file name="SConstruct" printme="1">
env = Environment(FOO = 'foo', BAR = 'bar')
dict = env.Dictionary()
@@ -670,8 +670,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex6b" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex6b" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -680,8 +680,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex6b" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex6b" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -803,15 +803,15 @@ environment, of directory names, suffixes, etc.
(a null string), and will not cause scons to fail.
</para>
- <scons_example name="missing1">
+ <scons_example name="environments_missing1">
<file name="SConstruct" printme="1">
env = Environment()
print "value is:", env.subst( '->$MISSING&lt;-' )
</file>
</scons_example>
- <scons_output example="missing1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_missing1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -830,7 +830,7 @@ environment, of directory names, suffixes, etc.
with no extra arguments.
</para>
- <scons_example name="missing2">
+ <scons_example name="environments_missing2">
<file name="SConstruct" printme="1">
AllowSubstExceptions()
env = Environment()
@@ -838,8 +838,8 @@ environment, of directory names, suffixes, etc.
</file>
</scons_example>
- <scons_output example="missing2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_missing2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -850,7 +850,7 @@ environment, of directory names, suffixes, etc.
allowed
</para>
- <scons_example name="missing3">
+ <scons_example name="environments_missing3">
<file name="SConstruct" printme="1">
AllowSubstExceptions(IndexError, NameError, ZeroDivisionError)
env = Environment()
@@ -858,8 +858,8 @@ environment, of directory names, suffixes, etc.
</file>
</scons_example>
- <scons_output example="missing3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_missing3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<sconstruct>
</sconstruct>
@@ -1003,7 +1003,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex2">
+ <scons_example name="environments_ex2">
<file name="SConstruct" printme="1">
opt = Environment(CCFLAGS = '-O2')
dbg = Environment(CCFLAGS = '-g')
@@ -1020,8 +1020,8 @@ environment, of directory names, suffixes, etc.
</file>
</scons_example>
- <scons_output example="ex2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1034,7 +1034,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex3">
+ <scons_example name="environments_ex3">
<file name="SConstruct" printme="1">
opt = Environment(CCFLAGS = '-O2')
dbg = Environment(CCFLAGS = '-g')
@@ -1054,8 +1054,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1079,7 +1079,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex4">
+ <scons_example name="environments_ex4">
<file name="SConstruct" printme="1">
opt = Environment(CCFLAGS = '-O2')
dbg = Environment(CCFLAGS = '-g')
@@ -1111,8 +1111,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex4">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex4">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -1147,7 +1147,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex5">
+ <scons_example name="environments_ex5">
<file name="SConstruct" printme="1">
env = Environment(CC = 'gcc')
opt = env.Clone(CCFLAGS = '-O2')
@@ -1172,8 +1172,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex5">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex5">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -1188,7 +1188,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="Replace1">
+ <scons_example name="environments_Replace1">
<file name="SConstruct" printme="1">
env = Environment(CCFLAGS = '-DDEFINE1')
env.Replace(CCFLAGS = '-DDEFINE2')
@@ -1208,8 +1208,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="Replace1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_Replace1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1220,7 +1220,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="Replace-nonexistent">
+ <scons_example name="environments_Replace-nonexistent">
<file name="SConstruct" printme="1">
env = Environment()
env.Replace(NEW_VARIABLE = 'xyzzy')
@@ -1236,8 +1236,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="Replace-nonexistent">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_Replace-nonexistent">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1256,7 +1256,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="Replace2">
+ <scons_example name="environments_Replace2">
<file name="SConstruct" printme="1">
env = Environment(CCFLAGS = '-DDEFINE1')
print "CCFLAGS =", env['CCFLAGS']
@@ -1285,8 +1285,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="Replace2">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="environments_Replace2">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
@@ -1350,7 +1350,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex8">
+ <scons_example name="environments_ex8">
<file name="SConstruct" printme="1">
env = Environment(CCFLAGS = ['-DMY_VALUE'])
env.Append(CCFLAGS = ['-DLAST'])
@@ -1368,8 +1368,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex8">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex8">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1379,7 +1379,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="Append-nonexistent">
+ <scons_example name="environments_Append-nonexistent">
<file name="SConstruct" printme="1">
env = Environment()
env.Append(NEW_VARIABLE = 'added')
@@ -1393,8 +1393,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="Append-nonexistent">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_Append-nonexistent">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1450,7 +1450,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="ex9">
+ <scons_example name="environments_ex9">
<file name="SConstruct" printme="1">
env = Environment(CCFLAGS = ['-DMY_VALUE'])
env.Prepend(CCFLAGS = ['-DFIRST'])
@@ -1468,8 +1468,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex9">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex9">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1479,7 +1479,7 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_example name="Prepend-nonexistent">
+ <scons_example name="environments_Prepend-nonexistent">
<file name="SConstruct" printme="1">
env = Environment()
env.Prepend(NEW_VARIABLE = 'added')
@@ -1493,8 +1493,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="Prepend-nonexistent">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_Prepend-nonexistent">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -1644,7 +1644,7 @@ environment, of directory names, suffixes, etc.
<!--
- <scons_example name="ex1">
+ <scons_example name="environments_ex1">
<file name="SConstruct" printme="1">
env = Environment()
env.Command('foo', [], '__ROOT__/usr/bin/printenv.py')
@@ -1666,8 +1666,8 @@ environment, of directory names, suffixes, etc.
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="environments_ex1">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
-->
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 @@
</para>
- <scons_example name="Copy1">
+ <scons_example name="factories_Copy1">
<file name="SConstruct" printme="1">
Command("file.out", "file.in", Copy("$TARGET", "$SOURCE"))
</file>
@@ -100,8 +100,8 @@
</para>
- <scons_output example="Copy1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="factories_Copy1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -111,7 +111,7 @@
</para>
- <scons_example name="Copy2">
+ <scons_example name="factories_Copy2">
<file name="SConstruct" printme="1">
Command("file.out", [], Copy("$TARGET", "file.in"))
</file>
@@ -124,8 +124,8 @@
</para>
- <scons_output example="Copy2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="factories_Copy2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -145,7 +145,7 @@
</para>
- <scons_example name="Copy3">
+ <scons_example name="factories_Copy3">
<file name="S" printme="1">
Command("file.out", "file.in",
[
@@ -172,8 +172,8 @@
</para>
- <scons_output example="Copy3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="factories_Copy3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -196,7 +196,7 @@
</para>
- <scons_example name="Delete1">
+ <scons_example name="factories_Delete1">
<file name="S" printme="1">
Command("file.out", "file.in",
[
@@ -224,8 +224,8 @@
</para>
- <scons_output example="Delete1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="factories_Delete1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -237,7 +237,7 @@
</para>
- <scons_example name="Delete2">
+ <scons_example name="factories_Delete2">
<file name="SConstruct" printme="1">
Command("file.out", "file.in",
[
@@ -254,8 +254,8 @@
</para>
- <scons_output example="Delete2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="factories_Delete2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -291,7 +291,7 @@
</para>
- <scons_example name="Move">
+ <scons_example name="factories_Move">
<file name="S" printme="1">
Command("file.out", "file.in",
[
@@ -318,8 +318,8 @@
</para>
- <scons_output example="Move">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="factories_Move">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -335,7 +335,7 @@
</para>
- <scons_example name="Touch">
+ <scons_example name="factories_Touch">
<file name="S" printme="1">
Command("file.out", "file.in",
[
@@ -358,8 +358,8 @@
</para>
- <scons_output example="Touch">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="factories_Touch">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -379,7 +379,7 @@
</para>
- <scons_example name="Mkdir">
+ <scons_example name="factories_Mkdir">
<file name="S" printme="1">
Command("file.out", "file.in",
[
@@ -409,8 +409,8 @@
</para>
- <scons_output example="Mkdir">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="factories_Mkdir">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -429,7 +429,7 @@
</para>
- <scons_example name="Chmod">
+ <scons_example name="factories_Chmod">
<file name="SConstruct" printme="1">
Command("file.out", "file.in",
[
@@ -446,8 +446,8 @@
</para>
- <scons_output example="Chmod">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="factories_Chmod">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -468,7 +468,7 @@
</para>
- <scons_example name="Execute">
+ <scons_example name="factories_Execute">
<file name="SConstruct" printme="1">
Execute(Mkdir('__ROOT__/tmp/my_temp_directory'))
</file>
@@ -482,8 +482,8 @@
</para>
- <scons_output example="Execute">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="factories_Execute">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
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 @@
</para>
- <scons_example name="precious-ex1">
+ <scons_example name="fileremoval_precious-ex1">
<file name="SConstruct" printme="1">
env = Environment(RANLIBCOM='')
lib = env.Library('foo', ['f1.c', 'f2.c', 'f3.c'])
@@ -103,8 +103,8 @@
</para>
- <scons_output example="precious-ex1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="fileremoval_precious-ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -136,7 +136,7 @@
</para>
- <scons_example name="noclean-ex1">
+ <scons_example name="fileremoval_noclean-ex1">
<file name="SConstruct" printme="1">
env = Environment(RANLIBCOM='')
lib = env.Library('foo', ['f1.c', 'f2.c', 'f3.c'])
@@ -160,9 +160,9 @@
</para>
- <scons_output example="noclean-ex1">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -c</scons_output_command>
+ <scons_output example="fileremoval_noclean-ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -c</scons_output_command>
</scons_output>
</section>
@@ -197,7 +197,7 @@
</para>
- <scons_example name="clean-ex1">
+ <scons_example name="fileremoval_clean-ex1">
<file name="S" printme="1">
t = Command('foo.out', 'foo.in', 'build -o $TARGET $SOURCE')
Clean(t, 'foo.log')
@@ -237,9 +237,9 @@
</para>
- <scons_output example="clean-ex1">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q -c</scons_output_command>
+ <scons_output example="fileremoval_clean-ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q -c</scons_output_command>
</scons_output>
</section>
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 @@
<para>
Let's start with a very simple project, the "Hello world" program
for example
- <scons_example name="ex1">
+ <scons_example name="gettext_ex1">
<file name="hello.c" printme="1">
/* hello.c */
#include &lt;stdio.h&gt;
@@ -92,7 +92,7 @@
Prepare a <filename>SConstruct</filename> to compile the program
as usual.
- <scons_example name="ex2">
+ <scons_example name="gettext_ex2">
<file name="SConstruct" printme="1">
# SConstruct
env = Environment()
@@ -118,7 +118,7 @@
<para>
First prepare the <filename>hello.c</filename> program for
internationalization. Change the previous code so it reads as follows:
- <scons_example name="ex3">
+ <scons_example name="gettext_ex3">
<file name="hello.c" printme="1">
/* hello.c */
#include &lt;stdio.h&gt;
@@ -160,7 +160,7 @@
<para> The completed
<filename>SConstruct</filename> is as follows:
- <scons_example name="ex4">
+ <scons_example name="gettext_ex4">
<file name="SConstruct" printme="1">
# SConstruct
env = Environment( tools = ['default', 'gettext'] )
@@ -279,7 +279,7 @@
<para>
Now, open <filename>hello.c</filename> and add another one
<literal>printf</literal> line with new message.
- <scons_example name="ex5">
+ <scons_example name="gettext_ex5">
<file name="hello.c" printme="1">
/* hello.c */
#include &lt;stdio.h&gt;
@@ -334,7 +334,7 @@
<literal>PO</literal>) 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:
- <scons_example name="ex6">
+ <scons_example name="gettext_ex6">
<file name="hello.c" printme="1">
/* hello.c */
#include &lt;stdio.h&gt;
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.
</para>
- <scons_example name="ex1">
+ <scons_example name="hierarchy_ex1">
<file name="SConstruct" printme="1">
SConscript(['prog1/SConscript',
'prog2/SConscript'])
@@ -342,7 +342,7 @@ make no difference to the build.
</para>
- <scons_example_file example="ex1" name="prog1/SConscript">
+ <scons_example_file example="hierarchy_ex1" name="prog1/SConscript">
</scons_example_file>
<para>
@@ -351,7 +351,7 @@ make no difference to the build.
</para>
- <scons_example_file example="ex1" name="prog2/SConscript">
+ <scons_example_file example="hierarchy_ex1" name="prog2/SConscript">
</scons_example_file>
<para>
@@ -361,8 +361,8 @@ make no difference to the build.
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="hierarchy_ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -402,7 +402,7 @@ make no difference to the build.
</para>
- <scons_example name="ex2">
+ <scons_example name="hierarchy_ex2">
<file name="SConstruct">
SConscript('src/prog/SConscript')
</file>
@@ -432,8 +432,8 @@ make no difference to the build.
</para>
- <scons_output example="ex2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="hierarchy_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -458,7 +458,7 @@ make no difference to the build.
</para>
- <scons_example name="ex3">
+ <scons_example name="hierarchy_ex3">
<file name="SConstruct">
SConscript('src/prog/SConscript')
</file>
@@ -483,8 +483,8 @@ make no difference to the build.
</para>
- <scons_output example="ex3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="hierarchy_ex3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -736,7 +736,7 @@ make no difference to the build.
</para>
- <scons_example name="Return">
+ <scons_example name="hierarchy_Return">
<file name="SConstruct" printme="1">
env = Environment()
Export('env')
@@ -774,7 +774,7 @@ make no difference to the build.
</para>
- <scons_example_file example="Return" name="foo/SConscript">
+ <scons_example_file example="hierarchy_Return" name="foo/SConscript">
</scons_example_file>
<para>
@@ -788,8 +788,8 @@ make no difference to the build.
</para>
- <scons_output example="Return">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="hierarchy_Return">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<!--
diff --git a/doc/user/install.xml b/doc/user/install.xml
index 6172eb0..98c0e6d 100644
--- a/doc/user/install.xml
+++ b/doc/user/install.xml
@@ -56,7 +56,7 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="install_ex1">
<file name="SConstruct" printme="1">
env = Environment()
hello = env.Program('hello.c')
@@ -83,9 +83,9 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q __ROOT__/usr/bin</scons_output_command>
+ <scons_output example="install_ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q __ROOT__/usr/bin</scons_output_command>
</scons_output>
<para>
@@ -102,7 +102,7 @@
</para>
- <scons_example name="ex2">
+ <scons_example name="install_ex2">
<file name="SConstruct" printme="1">
env = Environment()
hello = env.Program('hello.c')
@@ -122,9 +122,9 @@
</para>
- <scons_output example="ex2">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q install</scons_output_command>
+ <scons_output example="install_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q install</scons_output_command>
</scons_output>
<section>
@@ -137,7 +137,7 @@
</para>
- <scons_example name="ex3">
+ <scons_example name="install_ex3">
<file name="SConstruct" printme="1">
env = Environment()
hello = env.Program('hello.c')
@@ -176,8 +176,8 @@
</para>
- <scons_output example="ex3">
- <scons_output_command>scons -Q install</scons_output_command>
+ <scons_output example="install_ex3">
+ <scons_output_command suffix="1">scons -Q install</scons_output_command>
</scons_output>
</section>
@@ -195,7 +195,7 @@
</para>
- <scons_example name="ex4">
+ <scons_example name="install_ex4">
<file name="SConstruct" printme="1">
env = Environment()
hello = env.Program('hello.c')
@@ -215,8 +215,8 @@
</para>
- <scons_output example="ex4">
- <scons_output_command>scons -Q install</scons_output_command>
+ <scons_output example="install_ex4">
+ <scons_output_command suffix="1">scons -Q install</scons_output_command>
</scons_output>
</section>
@@ -235,7 +235,7 @@
</para>
- <scons_example name="ex5">
+ <scons_example name="install_ex5">
<file name="SConstruct" printme="1">
env = Environment()
hello = env.Program('hello.c')
@@ -262,8 +262,8 @@
</para>
- <scons_output example="ex5">
- <scons_output_command>scons -Q install</scons_output_command>
+ <scons_output example="install_ex5">
+ <scons_output_command suffix="1">scons -Q install</scons_output_command>
</scons_output>
</section>
diff --git a/doc/user/java.xml b/doc/user/java.xml
index 041db35..4ddc370 100644
--- a/doc/user/java.xml
+++ b/doc/user/java.xml
@@ -78,7 +78,7 @@
</para>
- <scons_example name="java">
+ <scons_example name="java_java">
<file name="SConstruct" printme="1">
Java('classes', 'src')
</file>
@@ -119,8 +119,8 @@
</para>
- <scons_output example="java">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="java_java">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -153,7 +153,7 @@
</para>
- <scons_example name="java-classes">
+ <scons_example name="java_java-classes">
<file name="SConstruct" printme="1">
Java('classes', 'src')
</file>
@@ -211,9 +211,9 @@
</para>
- <scons_output example="java-classes">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q classes</scons_output_command>
+ <scons_output example="java_java-classes">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q classes</scons_output_command>
</scons_output>
<para>
@@ -235,9 +235,9 @@
</para>
- <scons_output example="java-classes">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q -c classes</scons_output_command>
+ <scons_output example="java_java-classes">
+ <scons_output_command suffix="3">scons -Q</scons_output_command>
+ <scons_output_command suffix="4">scons -Q -c classes</scons_output_command>
</scons_output>
<para>
@@ -278,7 +278,7 @@
</para>
- <scons_example name="jar1">
+ <scons_example name="java_jar1">
<file name="SConstruct" printme="1">
Java(target = 'classes', source = 'src')
Jar(target = 'test.jar', source = 'classes')
@@ -321,8 +321,8 @@
</para>
- <scons_output example="jar1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="java_jar1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -342,7 +342,7 @@
</para>
- <scons_example name="jar2">
+ <scons_example name="java_jar2">
<file name="SConstruct" printme="1">
prog1_class_files = Java(target = 'classes', source = 'prog1')
prog2_class_files = Java(target = 'classes', source = 'prog2')
@@ -397,8 +397,8 @@
</para>
- <scons_output example="jar2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="java_jar2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -416,7 +416,7 @@
</para>
- <scons_example name="javah">
+ <scons_example name="java_javah">
<file name="SConstruct" printme="1">
classes = Java(target = 'classes', source = 'src/pkg/sub')
JavaH(target = 'native', source = classes)
@@ -462,8 +462,8 @@
</para>
- <scons_output example="javah">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="java_javah">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -500,7 +500,7 @@
</para>
- <scons_example name="JAVACLASSDIR">
+ <scons_example name="java_JAVACLASSDIR">
<file name="SConstruct" printme="1">
Java(target = 'classes', source = 'src/pkg/sub')
class_file_list = ['classes/pkg/sub/Example1.class',
@@ -545,8 +545,8 @@
</para>
- <scons_output example="JAVACLASSDIR">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="java_JAVACLASSDIR">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -558,7 +558,7 @@
</para>
- <scons_example name="javah_file">
+ <scons_example name="java_javah_file">
<file name="SConstruct" printme="1">
classes = Java(target = 'classes', source = 'src/pkg/sub')
JavaH(target = File('native.h'), source = classes)
@@ -605,8 +605,8 @@
</para>
- <scons_output example="javah_file">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="java_javah_file">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -627,7 +627,7 @@
</para>
- <scons_example name="RMIC">
+ <scons_example name="java_RMIC">
<file name="SConstruct" printme="1">
classes = Java(target = 'classes', source = 'src/pkg/sub')
RMIC(target = 'outdir', source = classes)
@@ -661,8 +661,8 @@
</para>
- <scons_output example="RMIC">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="java_RMIC">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml
index fa0e653..81f4c20 100644
--- a/doc/user/less-simple.xml
+++ b/doc/user/less-simple.xml
@@ -84,7 +84,7 @@
</para>
- <scons_example name="target">
+ <scons_example name="lesssimple_target">
<file name="SConstruct" printme="1">
Program('new_hello', 'hello.c')
</file>
@@ -111,8 +111,8 @@
</para>
- <scons_output example="target" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="lesssimple_target" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -122,8 +122,8 @@
</para>
- <scons_output example="target" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="lesssimple_target" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -145,7 +145,7 @@
</para>
- <scons_example name="ex2">
+ <scons_example name="lesssimple_ex2">
<file name="SConstruct" printme="1">
Program(['prog.c', 'file1.c', 'file2.c'])
</file>
@@ -166,8 +166,8 @@
</para>
- <scons_output example="ex2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="lesssimple_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -192,7 +192,7 @@
</para>
- <scons_example name="ex3">
+ <scons_example name="lesssimple_ex3">
<file name="SConstruct" printme="1">
Program('program', ['prog.c', 'file1.c', 'file2.c'])
</file>
@@ -213,8 +213,8 @@
</para>
- <scons_output example="ex3" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="lesssimple_ex3" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -223,8 +223,8 @@
</para>
- <scons_output example="ex3" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="lesssimple_ex3" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -512,7 +512,7 @@
</para>
- <scons_example name="ex4">
+ <scons_example name="lesssimple_ex4">
<file name="SConstruct" printme="1">
Program('foo.c')
Program('bar', ['bar1.c', 'bar2.c'])
@@ -534,8 +534,8 @@
</para>
- <scons_output example="ex4">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="lesssimple_ex4">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -577,7 +577,7 @@
</para>
- <scons_example name="ex5">
+ <scons_example name="lesssimple_ex5">
<file name="SConstruct" printme="1">
Program(Split('foo.c common1.c common2.c'))
Program('bar', Split('bar1.c bar2.c common1.c common2.c'))
@@ -609,8 +609,8 @@
</para>
- <scons_output example="ex5">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="lesssimple_ex5">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
diff --git a/doc/user/libraries.xml b/doc/user/libraries.xml
index 01d6066..be09752 100644
--- a/doc/user/libraries.xml
+++ b/doc/user/libraries.xml
@@ -63,7 +63,7 @@
</para>
- <scons_example name="ex1" printme="1">
+ <scons_example name="libraries_ex1" printme="1">
<file name="SConstruct" printme="1">
Library('foo', ['f1.c', 'f2.c', 'f3.c'])
</file>
@@ -87,8 +87,8 @@
</para>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="libraries_ex1" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -98,8 +98,8 @@
</para>
- <scons_output example="ex1" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="libraries_ex1" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -129,7 +129,7 @@
</para>
- <scons_example name="objects" printme="1">
+ <scons_example name="libraries_objects" printme="1">
<file name="SConstruct" printme="1">
Library('foo', ['f1.c', 'f2.o', 'f3.c', 'f4.o'])
</file>
@@ -155,8 +155,8 @@
</para>
- <scons_output example="objects" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="libraries_objects" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -184,7 +184,7 @@
</para>
- <scons_example name="StaticLibrary" printme="1">
+ <scons_example name="libraries_StaticLibrary" printme="1">
<file name="SConstruct" printme="1">
StaticLibrary('foo', ['f1.c', 'f2.c', 'f3.c'])
</file>
@@ -210,7 +210,7 @@
</para>
- <scons_example name="SharedLibrary" printme="1">
+ <scons_example name="libraries_SharedLibrary" printme="1">
<file name="SConstruct" printme="1">
SharedLibrary('foo', ['f1.c', 'f2.c', 'f3.c'])
</file>
@@ -231,8 +231,8 @@
</para>
- <scons_output example="SharedLibrary" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="libraries_SharedLibrary" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -241,8 +241,8 @@
</para>
- <scons_output example="SharedLibrary" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="libraries_SharedLibrary" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -278,7 +278,7 @@
</para>
- <scons_example name="ex2">
+ <scons_example name="libraries_ex2">
<file name="SConstruct" printme="1">
Library('foo', ['f1.c', 'f2.c', 'f3.c'])
Program('prog.c', LIBS=['foo', 'bar'], LIBPATH='.')
@@ -313,8 +313,8 @@
</para>
- <scons_output example="ex2" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="libraries_ex2" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -324,8 +324,8 @@
</para>
- <scons_output example="ex2" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="libraries_ex2" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -385,7 +385,7 @@
</para>
- <scons_example name="ex3">
+ <scons_example name="libraries_ex3">
<file name="SConstruct" printme="1">
Program('prog.c', LIBS = 'm',
LIBPATH = ['/usr/lib', '/usr/local/lib'])
@@ -438,8 +438,8 @@
</para>
- <scons_output example="ex3" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="libraries_ex3" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -449,8 +449,8 @@
</para>
- <scons_output example="ex3" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="libraries_ex3" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<!-- The link command is too wide in the PDF version.
There are some other examples of this throughout the document. -->
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 @@
</para>
- <scons_example name="MergeFlags1">
+ <scons_example name="mergeflags_MergeFlags1">
<file name="SConstruct" printme="1">
env = Environment()
env.Append(CCFLAGS = '-option -O3 -O1')
@@ -81,8 +81,8 @@
</file>
</scons_example>
- <scons_output example="MergeFlags1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="mergeflags_MergeFlags1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -98,7 +98,7 @@
</para>
- <scons_example name="MergeFlags2">
+ <scons_example name="mergeflags_MergeFlags2">
<file name="SConstruct" printme="1">
env = Environment()
env.Append(CPPPATH = ['/include', '/usr/local/include', '/usr/include'])
@@ -108,8 +108,8 @@
</file>
</scons_example>
- <scons_output example="MergeFlags2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="mergeflags_MergeFlags2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -132,7 +132,7 @@
</para>
- <scons_example name="MergeFlags3">
+ <scons_example name="mergeflags_MergeFlags3">
<file name="SConstruct" printme="1">
env = Environment()
env.Append(CCFLAGS = '-option -O3 -O1')
@@ -143,8 +143,8 @@
</file>
</scons_example>
- <scons_output example="MergeFlags3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="mergeflags_MergeFlags3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
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.
- <scons_example name="EnsurePythonVersion">
+ <scons_example name="misc_EnsurePythonVersion">
<file name="SConstruct" printme="1">
EnsurePythonVersion(2, 5)
</file>
@@ -115,8 +115,8 @@
regardless of executing Python version by faking out
the infrastructure in some way.
- <scons_output example="EnsurePythonVersion">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_EnsurePythonVersion">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
-->
@@ -158,7 +158,7 @@
regardless of executing SCons version by faking out
the infrastructure in some way.
- <scons_example name="EnsureSConsVersion">
+ <scons_example name="misc_EnsureSConsVersion">
<file name="SConstruct" printme="1">
EnsureSConsVersion(1, 0)
</file>
@@ -184,8 +184,8 @@
regardless of executing SCons version by faking out
the infrastructure in some way.
- <scons_output example="EnsureSConsVersion">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_EnsureSConsVersion">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
-->
@@ -210,7 +210,7 @@
</para>
- <scons_example name="Exit">
+ <scons_example name="misc_Exit">
<file name="SConstruct" printme="1">
if ARGUMENTS.get('FUTURE'):
print "The FUTURE option is not supported yet!"
@@ -223,9 +223,9 @@
</file>
</scons_example>
- <scons_output example="Exit">
- <scons_output_command>scons -Q FUTURE=1</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_Exit">
+ <scons_output_command suffix="1">scons -Q FUTURE=1</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -266,7 +266,7 @@
</para>
- <scons_example name="FindFile1a">
+ <scons_example name="misc_FindFile1a">
<file name="SConstruct" printme="1">
# one directory
print FindFile('missing', '.')
@@ -278,11 +278,11 @@
</file>
</scons_example>
- <scons_output example="FindFile1a" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_FindFile1a" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
- <scons_example name="FindFile1b">
+ <scons_example name="misc_FindFile1b">
<file name="SConstruct" printme="1">
# several directories
includes = [ '.', 'include', 'src/include']
@@ -304,8 +304,8 @@
</file>
</scons_example>
- <scons_output example="FindFile1b" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_FindFile1b" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<!-- The man page says this should work, but it fails.
@@ -316,7 +316,7 @@
</para>
- <scons_example name="FindFile1c">
+ <scons_example name="misc_FindFile1c">
<file name="SConstruct" printme="1">
# several directories
includes = [ '.', 'include', 'src/include']
@@ -337,8 +337,8 @@
exists
</scons_example>
- <scons_output example="FindFile1c" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_FindFile1c" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
-->
@@ -349,7 +349,7 @@
</para>
- <scons_example name="FindFile1d">
+ <scons_example name="misc_FindFile1d">
<file name="SConstruct" printme="1">
print FindFile('multiple', ['sub1', 'sub2', 'sub3'])
print FindFile('multiple', ['sub2', 'sub3', 'sub1'])
@@ -369,8 +369,8 @@
</file>
</scons_example>
- <scons_output example="FindFile1d" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_FindFile1d" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<!-- file may be a list of file names or a single file name. -->
@@ -383,7 +383,7 @@
</para>
- <scons_example name="FindFile2">
+ <scons_example name="misc_FindFile2">
<file name="SConstruct" printme="1">
# Neither file exists, so build will fail
Command('derived', 'leaf', 'cat >$TARGET $SOURCE')
@@ -392,11 +392,11 @@
</file>
</scons_example>
- <scons_output example="FindFile2" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_FindFile2" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
- <scons_example name="FindFile2">
+ <scons_example name="misc_FindFile2">
<file name="SConstruct" printme="1">
# Only 'leaf' exists
Command('derived', 'leaf', 'cat >$TARGET $SOURCE')
@@ -408,8 +408,8 @@
</file>
</scons_example>
- <scons_output example="FindFile2" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_FindFile2" os="posix">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -419,7 +419,7 @@
</para>
- <scons_example name="FindFile3">
+ <scons_example name="misc_FindFile3">
<file name="SConstruct" printme="1">
# Only 'src/leaf' exists
VariantDir('build', 'src')
@@ -431,8 +431,8 @@
</file>
</scons_example>
- <scons_output example="FindFile3" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_FindFile3" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -458,7 +458,7 @@
</para>
- <scons_example name="Flatten1">
+ <scons_example name="misc_Flatten1">
<file name="SConstruct" printme="1">
objects = [
Object('prog1.c'),
@@ -482,8 +482,8 @@
</para>
- <scons_output example="Flatten1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_Flatten1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -499,7 +499,7 @@
</para>
- <scons_example name="Flatten2">
+ <scons_example name="misc_Flatten2">
<file name="SConstruct" printme="1">
objects = [
Object('prog1.c'),
@@ -528,8 +528,8 @@
</para>
- <scons_output example="Flatten2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_Flatten2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -540,7 +540,7 @@
</para>
- <scons_example name="Flatten3">
+ <scons_example name="misc_Flatten3">
<file name="SConstruct" printme="1">
objects = [
Object('prog1.c'),
@@ -563,8 +563,8 @@
TODO: can't use this now because it displays the temporary path name
- <scons_output example="Flatten3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="misc_Flatten3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
-->
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 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="nodes_ex1">
<file name="SConstruct" printme="1">
hello_list = Object('hello.c', CCFLAGS='-DHELLO')
goodbye_list = Object('goodbye.c', CCFLAGS='-DGOODBYE')
@@ -142,8 +142,8 @@
</para>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="nodes_ex1" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -152,8 +152,8 @@
</para>
- <scons_output example="ex1" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="nodes_ex1" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -181,7 +181,7 @@
</para>
- <scons_example name="print">
+ <scons_example name="nodes_print">
<file name="SConstruct" printme="1">
hello_c = File('hello.c')
Program(hello_c)
@@ -261,7 +261,7 @@
</para>
- <scons_example name="print">
+ <scons_example name="nodes_print">
<file name="SConstruct" printme="1">
object_list = Object('hello.c')
program_list = Program(object_list)
@@ -279,8 +279,8 @@
</para>
- <scons_output example="print" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="nodes_print" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -289,8 +289,8 @@
</para>
- <scons_output example="print" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="nodes_print" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -328,7 +328,7 @@
</para>
- <scons_example name="exists">
+ <scons_example name="nodes_exists">
<file name="SConstruct" printme="1">
import os.path
program_list = Program('hello.c')
@@ -347,8 +347,8 @@
</para>
- <scons_output example="exists" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="nodes_exists" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -370,7 +370,7 @@
</para>
- <scons_example name="GetBuildPath">
+ <scons_example name="nodes_GetBuildPath">
<file name="SConstruct" printme="1">
env=Environment(VAR="value")
n=File("foo.c")
@@ -384,8 +384,8 @@
</para>
- <scons_output example="GetBuildPath" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="nodes_GetBuildPath" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -410,7 +410,7 @@
</para>
- <scons_example name="read">
+ <scons_example name="nodes_read">
<file name="SConstruct" printme="1">
hello_c = File('hello.c')
contents = hello_c.read()
@@ -428,8 +428,8 @@
</para>
- <scons_output example="read" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="nodes_read" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
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 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="output_ex1">
<file name="SConstruct" printme="1">
Help("""
Type: 'scons program' to build the production program,
@@ -98,8 +98,8 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -h</scons_output_command>
+ <scons_output example="output_ex1">
+ <scons_output_command suffix="1">scons -h</scons_output_command>
</scons_output>
<para>
@@ -130,7 +130,7 @@
</para>
- <scons_example name="ex2">
+ <scons_example name="output_ex2">
<file name="SConstruct" printme="1">
env = Environment()
@@ -147,8 +147,8 @@
</para>
- <scons_output example="ex2" os="win32">
- <scons_output_command>scons -h</scons_output_command>
+ <scons_output example="output_ex2" os="win32">
+ <scons_output_command suffix="1">scons -h</scons_output_command>
</scons_output>
<para>
@@ -157,8 +157,8 @@
</para>
- <scons_output example="ex2" os="posix">
- <scons_output_command>scons -h</scons_output_command>
+ <scons_output example="output_ex2" os="posix">
+ <scons_output_command suffix="2">scons -h</scons_output_command>
</scons_output>
<para>
@@ -212,7 +212,7 @@
</para>
- <scons_example name="COMSTR">
+ <scons_example name="output_COMSTR">
<file name="SConstruct" printme="1">
env = Environment(CCCOMSTR = "Compiling $TARGET",
LINKCOMSTR = "Linking $TARGET")
@@ -231,8 +231,8 @@
<!--
- <scons_output example="COMSTR" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="output_COMSTR" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
-->
@@ -284,7 +284,7 @@
</para>
- <scons_example name="COMSTR-VERBOSE">
+ <scons_example name="output_COMSTR-VERBOSE">
<file name="SConstruct" printme="1">
env = Environment()
if ARGUMENTS.get('VERBOSE') != "1':
@@ -313,10 +313,10 @@
<!--
- <scons_output example="COMSTR-VERBOSE" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q -c</scons_output_command>
- <scons_output_command>scons -Q VERBOSE=1</scons_output_command>
+ <scons_output example="output_COMSTR-VERBOSE" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q -c</scons_output_command>
+ <scons_output_command suffix="3">scons -Q VERBOSE=1</scons_output_command>
</scons_output>
-->
@@ -370,7 +370,7 @@
</para>
- <scons_example name="Progress-TARGET">
+ <scons_example name="output_Progress-TARGET">
<file name="SConstruct" printme="1">
Progress('Evaluating $TARGET\n')
Program('f1.c')
@@ -401,8 +401,8 @@
</para>
- <scons_output example="Progress-TARGET" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="output_Progress-TARGET" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -520,7 +520,7 @@
</para>
- <scons_example name="Progress-callable">
+ <scons_example name="output_Progress-callable">
<file name="SConstruct" printme="1">
screen = open('/dev/tty', 'w')
count = 0
@@ -593,7 +593,7 @@
</para>
- <scons_example name="gbf1">
+ <scons_example name="output_gbf1">
<file name="SConstruct" printme="1">
import atexit
@@ -637,7 +637,7 @@
</para>
- <scons_example name="gbf2">
+ <scons_example name="output_gbf2">
<file name="SConstruct" printme="1">
# Make the build fail if we pass fail=1 on the command line
if ARGUMENTS.get('fail', 0):
@@ -694,9 +694,9 @@
</para>
- <scons_output example="gbf2">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q fail=1</scons_output_command>
+ <scons_output example="output_gbf2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q fail=1</scons_output_command>
</scons_output>
</section>
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 @@
</para>
- <scons_example name="ParseConfig1">
+ <scons_example name="parseconfig_ex1">
<file name="SConstruct" printme="1">
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_output example="ParseConfig1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="parseconfig_ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
-->
@@ -134,7 +134,7 @@
</para>
- <scons_example name="ParseConfig2">
+ <scons_example name="parseconfig_ex2">
<file name="SConstruct" printme="1">
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_output example="ParseConfig2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="parseconfig_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
-->
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 @@
</para>
- <scons_example name="ParseFlags1">
+ <scons_example name="parseflags_ex1">
<file name="SConstruct" printme="1">
env = Environment()
d = env.ParseFlags("-I/opt/include -L/opt/lib -lfoo")
@@ -93,8 +93,8 @@
</file>
</scons_example>
- <scons_output example="ParseFlags1" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="parseflags_ex1" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -105,8 +105,8 @@
</para>
- <scons_output example="ParseFlags1" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="parseflags_ex1" os="win32">
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -117,7 +117,7 @@
</para>
- <scons_example name="ParseFlags2">
+ <scons_example name="parseflags_ex2">
<file name="SConstruct" printme="1">
env = Environment()
d = env.ParseFlags("-whatever")
@@ -132,8 +132,8 @@
</file>
</scons_example>
- <scons_output example="ParseFlags2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="parseflags_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -143,7 +143,7 @@
</para>
- <scons_example name="ParseFlags3">
+ <scons_example name="parseflags_ex3">
<file name="SConstruct" printme="1">
env = Environment()
d = env.ParseFlags(["-I/opt/include", ["-L/opt/lib", "-lfoo"]])
@@ -158,8 +158,8 @@
</file>
</scons_example>
- <scons_output example="ParseFlags3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="parseflags_ex3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -170,7 +170,7 @@
</para>
- <scons_example name="ParseFlags4">
+ <scons_example name="parseflags_ex4">
<file name="SConstruct" printme="1">
env = Environment()
d = env.ParseFlags(["!echo -I/opt/include", "!echo -L/opt/lib", "-lfoo"])
@@ -185,8 +185,8 @@
</file>
</scons_example>
- <scons_output example="ParseFlags4">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="parseflags_ex4">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
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 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="repositories_ex1">
<file name="SConstruct" printme="1">
env = Environment()
env.Program('hello.c')
@@ -150,8 +150,8 @@
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="repositories_ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -163,7 +163,7 @@
</para>
- <scons_example name="ex2">
+ <scons_example name="repositories_ex2">
<file name="SConstruct">
env = Environment()
env.Program('hello.c')
@@ -174,8 +174,8 @@
</file>
</scons_example>
- <scons_output example="ex2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="repositories_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -186,7 +186,7 @@
</para>
- <scons_example name="ex3">
+ <scons_example name="repositories_ex3">
<file name="SConstruct">
env = Environment()
env.Program('hello.c')
@@ -197,8 +197,8 @@
</file>
</scons_example>
- <scons_output example="ex3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="repositories_ex3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -254,7 +254,7 @@
</para>
- <scons_example name="CPPPATH">
+ <scons_example name="repositories_CPPPATH">
<file name="SConstruct" printme="1">
env = Environment(CPPPATH = ['.'])
env.Program('hello.c')
@@ -271,8 +271,8 @@
</para>
- <scons_output example="CPPPATH">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="repositories_CPPPATH">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -290,7 +290,7 @@
</para>
- <scons_example name="CPPPATH3">
+ <scons_example name="repositories_CPPPATH3">
<file name="SConstruct" printme="1">
env = Environment(CPPPATH = ['dir1', 'dir2', 'dir3'])
env.Program('hello.c')
@@ -310,8 +310,8 @@
</para>
- <scons_output example="CPPPATH3">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="repositories_CPPPATH3">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<!--
@@ -374,7 +374,7 @@ coming into existence.)
</para>
- <scons_example name="quote1">
+ <scons_example name="repositories_quote1">
<file name="SConstruct">
env = Environment(CPPPATH = ['.'])
env.Program('hello.c')
@@ -385,8 +385,8 @@ coming into existence.)
</file>
</scons_example>
- <scons_output example="quote1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="repositories_quote1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -513,7 +513,7 @@ coming into existence.)
</para>
- <scons_example name="ex4">
+ <scons_example name="repositories_ex4">
<file name="SConstruct">
env = Environment()
env.Program(['hello.c', 'file1.c', 'file2.c'])
@@ -530,9 +530,9 @@ coming into existence.)
</file>
</scons_example>
- <scons_output example="ex4">
- <scons_output_command>cd /usr/repository1</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="repositories_ex4">
+ <scons_output_command suffix="1">cd /usr/repository1</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -556,10 +556,10 @@ coming into existence.)
</para>
<!--
- <scons_output example="ex4">
- <scons_output_command>cd $HOME/build</scons_output_command>
- <scons_output_command>edit hello.c</scons_output_command>
- <scons_output_command>scons -Q -Y __ROOT__/usr/repository1</scons_output_command>
+ <scons_output example="repositories_ex4">
+ <scons_output_command suffix="3">cd $HOME/build</scons_output_command>
+ <scons_output_command suffix="4">edit hello.c</scons_output_command>
+ <scons_output_command suffix="5">scons -Q -Y __ROOT__/usr/repository1</scons_output_command>
</scons_output>
-->
<screen>
@@ -625,7 +625,7 @@ coming into existence.)
</para>
- <scons_example name="ex5">
+ <scons_example name="repositories_ex5">
<file name="SConstruct" printme="1">
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:
</para>
- <scons_example name="scan">
+ <scons_example name="scanners_scan">
<file name="SConstruct" printme="1">
import re
@@ -351,11 +351,11 @@ over the file scanning rather than being called for each input line:
</para>
- <scons_output example="scan">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command output=" [CHANGE THE CONTENTS OF other_file]">edit other_file</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="scanners_scan">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command output=" [CHANGE THE CONTENTS OF other_file]" suffix="2">edit other_file</scons_output_command>
+ <scons_output_command suffix="3">scons -Q</scons_output_command>
+ <scons_output_command suffix="4">scons -Q</scons_output_command>
</scons_output>
-->
@@ -391,7 +391,7 @@ over the file scanning rather than being called for each input line:
</para>
- <scons_example name="findpathdirs">
+ <scons_example name="scanners_findpathdirs">
<file name="SConstruct" printme="1">
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<build/foo.c> path name.
</para>
- <scons_example name="ex1">
+ <scons_example name="separate_ex1">
<file name="SConstruct" printme="1">
SConscript('src/SConscript', variant_dir='build')
</file>
@@ -192,10 +192,10 @@ program using the F<build/foo.c> path name.
</para>
- <scons_output example="ex1">
- <scons_output_command>ls src</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>ls build</scons_output_command>
+ <scons_output example="separate_ex1">
+ <scons_output_command suffix="1">ls src</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
+ <scons_output_command suffix="3">ls build</scons_output_command>
</scons_output>
<para>
@@ -358,7 +358,7 @@ program using the F<build/foo.c> path name.
</para>
- <scons_example name="ex_builddir">
+ <scons_example name="separate_builddir">
<file name="SConstruct" printme="1">
VariantDir('build', 'src')
env = Environment()
@@ -389,10 +389,10 @@ program using the F<build/foo.c> path name.
</para>
- <scons_output example="ex_builddir">
- <scons_output_command>ls src</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>ls build</scons_output_command>
+ <scons_output example="separate_builddir">
+ <scons_output_command suffix="1">ls src</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
+ <scons_output_command suffix="3">ls build</scons_output_command>
</scons_output>
<para>
@@ -402,7 +402,7 @@ program using the F<build/foo.c> path name.
</para>
- <scons_example name="ex_duplicate_0">
+ <scons_example name="separate_duplicate0">
<file name="SConstruct" printme="1">
VariantDir('build', 'src', duplicate=0)
env = Environment()
@@ -420,10 +420,10 @@ program using the F<build/foo.c> path name.
</para>
- <scons_output example="ex_duplicate_0">
- <scons_output_command>ls src</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>ls build</scons_output_command>
+ <scons_output example="separate_duplicate0">
+ <scons_output_command suffix="1">ls src</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
+ <scons_output_command suffix="3">ls build</scons_output_command>
</scons_output>
</section>
@@ -442,7 +442,7 @@ program using the F<build/foo.c> path name.
</para>
- <scons_example name="example_builddir_sconscript">
+ <scons_example name="separate_builddir_sconscript">
<file name="SConstruct">
VariantDir('build', 'src')
SConscript('build/SConscript')
@@ -462,7 +462,7 @@ program using the F<build/foo.c> path name.
</para>
- <scons_example_file example="example_builddir_sconscript" name="SConstruct">
+ <scons_example_file example="separate_builddir_sconscript" name="SConstruct">
</scons_example_file>
<para>
@@ -471,10 +471,10 @@ program using the F<build/foo.c> path name.
</para>
- <scons_output example="example_builddir_sconscript">
- <scons_output_command>ls src</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>ls build</scons_output_command>
+ <scons_output example="separate_builddir_sconscript">
+ <scons_output_command suffix="1">ls src</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
+ <scons_output_command suffix="3">ls build</scons_output_command>
</scons_output>
<para>
@@ -500,7 +500,7 @@ program using the F<build/foo.c> path name.
</para>
- <scons_example name="example_glob_builddir_sconscript">
+ <scons_example name="separate_glob_builddir_sconscript">
<file name="SConstruct">
VariantDir('build', 'src')
SConscript('build/SConscript')
@@ -530,10 +530,10 @@ program using the F<build/foo.c> path name.
</para>
- <scons_output example="example_glob_builddir_sconscript">
- <scons_output_command>ls src</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>ls build</scons_output_command>
+ <scons_output example="separate_glob_builddir_sconscript">
+ <scons_output_command suffix="1">ls src</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
+ <scons_output_command suffix="3">ls build</scons_output_command>
</scons_output>
<para>
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 @@
</para>
- <scons_example name="SideEffectSimple">
+ <scons_example name="sideeffect_simple">
<file name="SConstruct" printme="1">
env = Environment()
f2 = env.Command('file2', 'log', Copy('$TARGET', '$SOURCE'))
@@ -92,8 +92,8 @@
</para>
- <scons_output example="SideEffectSimple">
- <scons_output_command>scons -Q --jobs=2</scons_output_command>
+ <scons_output example="sideeffect_simple">
+ <scons_output_command suffix="1">scons -Q --jobs=2</scons_output_command>
</scons_output>
<para>
@@ -153,7 +153,7 @@
</para>
- <scons_example name="SideEffectShared">
+ <scons_example name="sideeffect_shared">
<file name="SConstruct" printme="1">
env = Environment()
f1 = env.Command('file1.out', 'file1.in',
@@ -181,8 +181,8 @@
</para>
- <scons_output example="SideEffectShared">
- <scons_output_command>scons -Q --jobs=2</scons_output_command>
+ <scons_output example="sideeffect_shared">
+ <scons_output_command suffix="1">scons -Q --jobs=2</scons_output_command>
</scons_output>
<para>
@@ -197,7 +197,7 @@
</para>
- <scons_example name="SideEffectParallel">
+ <scons_example name="sideeffect_parallel">
<file name="SConstruct" printme="1">
env = Environment()
f1 = env.Command('file1.out', [], 'echo >$TARGET data1')
@@ -207,8 +207,8 @@
</file>
</scons_example>
- <scons_output example="SideEffectParallel">
- <scons_output_command>scons -Q --jobs=2</scons_output_command>
+ <scons_output example="sideeffect_parallel">
+ <scons_output_command suffix="1">scons -Q --jobs=2</scons_output_command>
</scons_output>
<para>
@@ -235,4 +235,4 @@
</para>
</chapter>
- \ 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 @@
</para>
- <scons_example name="ex1">
+ <scons_example name="simple_ex1">
<file name="SConstruct" printme="1">
Program('hello.c')
</file>
@@ -112,8 +112,8 @@
</para>
- <scons_output example="ex1" os="posix">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="simple_ex1" os="posix">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
@@ -123,8 +123,8 @@
</para>
- <scons_output example="ex1" os="win32">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="simple_ex1" os="win32">
+ <scons_output_command suffix="2">scons</scons_output_command>
</scons_output>
<para>
@@ -177,7 +177,7 @@
</para>
- <scons_example name="Object">
+ <scons_example name="simple_Object">
<file name="SConstruct" printme="1">
Object('hello.c')
</file>
@@ -193,8 +193,8 @@
</para>
- <scons_output example="Object" os="posix">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="simple_Object" os="posix">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
@@ -204,8 +204,8 @@
</para>
- <scons_output example="Object" os="win32">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="simple_Object" os="win32">
+ <scons_output_command suffix="2">scons</scons_output_command>
</scons_output>
</section>
@@ -226,7 +226,7 @@
</para>
- <scons_example name="java">
+ <scons_example name="simple_java">
<file name="SConstruct" printme="1">
Java('classes', 'src')
</file>
@@ -251,8 +251,8 @@
</para>
- <scons_output example="java" os="posix">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="simple_java" os="posix">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
@@ -283,7 +283,7 @@
</para>
- <scons_example name="clean">
+ <scons_example name="simple_clean">
<file name="SConstruct">
Program('hello.c')
</file>
@@ -292,9 +292,9 @@
</file>
</scons_example>
- <scons_output example="clean" os="posix">
- <scons_output_command>scons</scons_output_command>
- <scons_output_command>scons -c</scons_output_command>
+ <scons_output example="simple_clean" os="posix">
+ <scons_output_command suffix="1">scons</scons_output_command>
+ <scons_output_command suffix="2">scons -c</scons_output_command>
</scons_output>
<para>
@@ -303,9 +303,9 @@
</para>
- <scons_output example="clean" os="win32">
- <scons_output_command>scons</scons_output_command>
- <scons_output_command>scons -c</scons_output_command>
+ <scons_output example="simple_clean" os="win32">
+ <scons_output_command suffix="3">scons</scons_output_command>
+ <scons_output_command suffix="4">scons -c</scons_output_command>
</scons_output>
<para>
@@ -440,7 +440,7 @@
</para>
- <scons_example name="declarative">
+ <scons_example name="simple_declarative">
<file name="SConstruct" printme="1">
print "Calling Program('hello.c')"
Program('hello.c')
@@ -467,8 +467,8 @@
</para>
- <scons_output example="declarative" os="posix">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="simple_declarative" os="posix">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
@@ -495,8 +495,8 @@
</para>
- <scons_output example="ex1" os="win32">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="simple_ex1" os="win32">
+ <scons_output_command suffix="3">scons</scons_output_command>
</scons_output>
<para>
@@ -521,8 +521,8 @@
</para>
- <scons_output example="ex1" os="win32">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="simple_ex1" os="win32">
+ <scons_output_command suffix="4">scons -Q</scons_output_command>
</scons_output>
<para>
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 @@
</para>
- <scons_example name="ex_bitkeeper">
+ <scons_example name="sourcecode_bitkeeper">
<file name="SConstruct" printme="1">
env = Environment()
env.SourceCode('.', env.BitKeeper())
@@ -74,8 +74,8 @@
</file>
</scons_example>
- <scons_output example="ex_bitkeeper">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="sourcecode_bitkeeper">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -89,7 +89,7 @@
</para>
- <scons_example name="ex_cvs">
+ <scons_example name="sourcecode_cvs">
<file name="SConstruct" printme="1">
env = Environment()
env.SourceCode('.', env.CVS('/usr/local/CVS'))
@@ -97,8 +97,8 @@
</file>
</scons_example>
- <scons_output example="ex_cvs">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="sourcecode_cvs">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -112,7 +112,7 @@
</para>
- <scons_example name="ex_rcs">
+ <scons_example name="sourcecode_rcs">
<file name="SConstruct" printme="1">
env = Environment()
env.SourceCode('.', env.RCS())
@@ -123,8 +123,8 @@
</file>
</scons_example>
- <scons_output example="ex_rcs">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="sourcecode_rcs">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -138,7 +138,7 @@
</para>
- <scons_example name="ex_sccs">
+ <scons_example name="sourcecode_sccs">
<file name="SConstruct" printme="1">
env = Environment()
env.SourceCode('.', env.SCCS())
@@ -149,8 +149,8 @@
</file>
</scons_example>
- <scons_output example="ex_sccs">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="sourcecode_sccs">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
@@ -166,7 +166,7 @@
</para>
- <scons_example name="ex_subversion">
+ <scons_example name="sourcecode_subversion">
<file name="SConstruct" printme="1">
env = Environment()
env.SourceCode('.', env.Subversion('XXX'))
@@ -174,8 +174,8 @@
</file>
</scons_example>
- <scons_output example="ex_subversion">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="sourcecode_subversion">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</section>
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;.
</para>
-<scons_example name="ex1">
+<scons_example name="tasks_ex1">
<file name="SConstruct" printme="1">
#### SConstruct
env = Environment()
@@ -153,15 +153,15 @@ Where main.cpp looks like this:
</para>
- <scons_example_file example="ex1" name="main.cpp">
+ <scons_example_file example="tasks_ex1" name="main.cpp">
</scons_example_file>
<para>
produces this:
</para>
- <scons_output example="ex1">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="tasks_ex1">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
</example>
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 @@
</para>
- <scons_example name="explain1">
+ <scons_example name="troubleshoot_explain1">
<file name="SConstruct" printme="1">
# Intentionally misspell the output file name in the
# command used to create the file:
@@ -119,10 +119,10 @@
</para>
- <scons_output example="explain1" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="troubleshoot_explain1" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command suffix="2">scons -Q</scons_output_command>
+ <scons_output_command suffix="3">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -142,8 +142,8 @@
</para>
- <scons_output example="explain1" os="posix">
- <scons_output_command>scons -Q --debug=explain</scons_output_command>
+ <scons_output example="troubleshoot_explain1" os="posix">
+ <scons_output_command suffix="4">scons -Q --debug=explain</scons_output_command>
</scons_output>
<para>
@@ -172,7 +172,7 @@
</para>
- <scons_example name="explain2">
+ <scons_example name="troubleshoot_explain2">
<file name="SConstruct">
Program('prog', ['file1.c', 'file2.c', 'file3.c'])
</file>
@@ -187,10 +187,10 @@
</file>
</scons_example>
- <scons_output example="explain2" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command output=" [CHANGE THE CONTENTS OF file2.c]">edit file2.c</scons_output_command>
- <scons_output_command>scons -Q --debug=explain</scons_output_command>
+ <scons_output example="troubleshoot_explain2" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command output=" [CHANGE THE CONTENTS OF file2.c]" suffix="2">edit file2.c</scons_output_command>
+ <scons_output_command suffix="3">scons -Q --debug=explain</scons_output_command>
</scons_output>
<para>
@@ -210,7 +210,7 @@
</para>
- <scons_example name="explain3">
+ <scons_example name="troubleshoot_explain3">
<file name="SConstruct">
Program('prog', ['file1.c', 'file2.c', 'file3.c'], CPPPATH='.')
</file>
@@ -230,10 +230,10 @@
</file>
</scons_example>
- <scons_output example="explain3" os="posix">
- <scons_output_command>scons -Q</scons_output_command>
- <scons_output_command output=" [CHANGE THE CONTENTS OF hello.h]">edit hello.h</scons_output_command>
- <scons_output_command>scons -Q --debug=explain</scons_output_command>
+ <scons_output example="troubleshoot_explain3" os="posix">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
+ <scons_output_command output=" [CHANGE THE CONTENTS OF hello.h]" suffix="2">edit hello.h</scons_output_command>
+ <scons_output_command suffix="3">scons -Q --debug=explain</scons_output_command>
</scons_output>
<para>
@@ -276,7 +276,7 @@
</para>
- <scons_example name="Dump">
+ <scons_example name="troubleshoot_Dump">
<file name="SConstruct" printme="1">
env = Environment()
print env.Dump()
@@ -290,8 +290,8 @@
</para>
- <scons_output example="Dump" os="posix" tools="gcc">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="troubleshoot_Dump" os="posix" tools="gcc">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
@@ -301,8 +301,8 @@
</para>
- <scons_output example="Dump" os="win32" tools="msvc">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="troubleshoot_Dump" os="win32" tools="msvc">
+ <scons_output_command suffix="2">scons</scons_output_command>
</scons_output>
<para>
@@ -336,7 +336,7 @@
</para>
- <scons_example name="Dump_ENV">
+ <scons_example name="troubleshoot_Dump_ENV">
<file name="SConstruct" printme="1">
env = Environment()
print env.Dump('ENV')
@@ -349,8 +349,8 @@
</para>
- <scons_output example="Dump_ENV" os="posix">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="troubleshoot_Dump_ENV" os="posix">
+ <scons_output_command suffix="1">scons</scons_output_command>
</scons_output>
<para>
@@ -359,8 +359,8 @@
</para>
- <scons_output example="Dump_ENV" os="win32">
- <scons_output_command>scons</scons_output_command>
+ <scons_output example="troubleshoot_Dump_ENV" os="win32">
+ <scons_output_command suffix="2">scons</scons_output_command>
</scons_output>
</section>
@@ -389,7 +389,7 @@
</para>
- <scons_example name="tree1">
+ <scons_example name="troubleshoot_tree1">
<file name="SConstruct" printme="1">
env = Environment(CPPPATH = ['.'])
env.Program('prog', ['f1.c', 'f2.c', 'f3.c'])
@@ -415,8 +415,8 @@
</para>
- <scons_output example="tree1">
- <scons_output_command>scons -Q --tree=all</scons_output_command>
+ <scons_output example="troubleshoot_tree1">
+ <scons_output_command suffix="1">scons -Q --tree=all</scons_output_command>
</scons_output>
<para>
@@ -441,8 +441,8 @@
</para>
- <scons_output example="tree1">
- <scons_output_command>scons -Q --tree=all f2.o</scons_output_command>
+ <scons_output example="troubleshoot_tree1">
+ <scons_output_command suffix="2">scons -Q --tree=all f2.o</scons_output_command>
</scons_output>
<para>
@@ -457,8 +457,8 @@
</para>
- <scons_output example="tree1">
- <scons_output_command>scons -Q --tree=all f1.o f3.o</scons_output_command>
+ <scons_output example="troubleshoot_tree1">
+ <scons_output_command suffix="3">scons -Q --tree=all f1.o f3.o</scons_output_command>
</scons_output>
<para>
@@ -469,8 +469,8 @@
</para>
- <scons_output example="tree1">
- <scons_output_command>scons -Q --tree=status</scons_output_command>
+ <scons_output example="troubleshoot_tree1">
+ <scons_output_command suffix="4">scons -Q --tree=status</scons_output_command>
</scons_output>
<para>
@@ -487,8 +487,8 @@
</para>
- <scons_output example="tree1">
- <scons_output_command>scons -Q --tree=derived</scons_output_command>
+ <scons_output example="troubleshoot_tree1">
+ <scons_output_command suffix="5">scons -Q --tree=derived</scons_output_command>
</scons_output>
<para>
@@ -498,8 +498,8 @@
</para>
- <scons_output example="tree1">
- <scons_output_command>scons -Q --tree=derived,status</scons_output_command>
+ <scons_output example="troubleshoot_tree1">
+ <scons_output_command suffix="6">scons -Q --tree=derived,status</scons_output_command>
</scons_output>
<para>
@@ -521,7 +521,7 @@
</para>
- <scons_example name="tree2">
+ <scons_example name="troubleshoot_tree2">
<file name="SConstruct" printme="1">
env = Environment(CPPPATH = ['.'],
LIBS = ['foo'],
@@ -557,8 +557,8 @@
</para>
- <scons_output example="tree2">
- <scons_output_command>scons -Q --tree=all</scons_output_command>
+ <scons_output example="troubleshoot_tree2">
+ <scons_output_command suffix="1">scons -Q --tree=all</scons_output_command>
</scons_output>
<para>
@@ -579,8 +579,8 @@
</para>
- <scons_output example="tree2">
- <scons_output_command>scons -Q --tree=prune</scons_output_command>
+ <scons_output example="troubleshoot_tree2">
+ <scons_output_command suffix="2">scons -Q --tree=prune</scons_output_command>
</scons_output>
<para>
@@ -607,7 +607,7 @@
</para>
- <scons_example name="presub">
+ <scons_example name="troubleshoot_presub">
<file name="SConstruct">
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_output example="presub">
- <scons_output_command>scons -Q - -debug=presub</scons_output_command>
+ <scons_output example="troubleshoot_presub">
+ <scons_output_command suffix="1">scons -Q - -debug=presub</scons_output_command>
</scons_output>
-->
@@ -655,7 +655,7 @@
</para>
- <scons_example name="findlibs">
+ <scons_example name="troubleshoot_findlibs">
<file name="SConstruct" printme="1">
env = Environment(LIBPATH = ['libs1', 'libs2'])
env.Program('prog.c', LIBS=['foo', 'bar'])
@@ -681,8 +681,8 @@
</para>
- <scons_output example="findlibs">
- <scons_output_command>scons -Q --debug=findlibs</scons_output_command>
+ <scons_output example="troubleshoot_findlibs">
+ <scons_output_command suffix="1">scons -Q --debug=findlibs</scons_output_command>
</scons_output>
</section>
@@ -699,7 +699,7 @@
</para>
- <scons_example name="includes">
+ <scons_example name="troubleshoot_includes">
<file name="SConstruct" printme="1">
env = Environment(CPPPATH = ['inc1', 'inc2'])
env.Program('prog.c')
@@ -717,8 +717,8 @@
</file>
</scons_example>
- <scons_output example="includes">
- <scons_output_command>scons -Q - - debug=includes prog</scons_output_command>
+ <scons_output example="troubleshoot_includes">
+ <scons_output_command suffix="1">scons -Q - - debug=includes prog</scons_output_command>
</scons_output>
</section>
@@ -747,7 +747,7 @@
</para>
- <scons_example name="stacktrace">
+ <scons_example name="troubleshoot_stacktrace">
<file name="SConstruct" printme="1">
Program('prog.c')
</file>
@@ -761,8 +761,8 @@
</para>
- <scons_output example="stacktrace">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="troubleshoot_stacktrace">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
<para>
@@ -778,8 +778,8 @@
</para>
- <scons_output example="stacktrace">
- <scons_output_command>scons -Q --debug=stacktrace</scons_output_command>
+ <scons_output example="troubleshoot_stacktrace">
+ <scons_output_command suffix="2">scons -Q --debug=stacktrace</scons_output_command>
</scons_output>
<para>
@@ -827,7 +827,7 @@
</para>
- <scons_example name="taskmastertrace">
+ <scons_example name="troubleshoot_taskmastertrace">
<file name="SConstruct" printme="1">
env = Environment(CPPPATH = ['.'])
env.Program('prog.c')
@@ -841,8 +841,8 @@
</file>
</scons_example>
- <scons_output example="taskmastertrace" os="posix">
- <scons_output_command>scons -Q --taskmastertrace=- prog</scons_output_command>
+ <scons_output example="troubleshoot_taskmastertrace" os="posix">
+ <scons_output_command suffix="1">scons -Q --taskmastertrace=- prog</scons_output_command>
</scons_output>
<para>
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.
</para>
- <scons_example name="ex_variants">
+ <scons_example name="variants_ex">
<file name="SConstruct" printme="1">
platform = ARGUMENTS.get('OS', Platform())
@@ -141,8 +141,8 @@ is pretty smart about rebuilding things when you change options.
</para>
- <scons_output example="ex_variants" os="posix">
- <scons_output_command>scons -Q OS=linux</scons_output_command>
+ <scons_output example="variants_ex" os="posix">
+ <scons_output_command suffix="1">scons -Q OS=linux</scons_output_command>
</scons_output>
<para>
@@ -151,13 +151,13 @@ is pretty smart about rebuilding things when you change options.
</para>
- <scons_output example="ex_variants" os="win32">
- <scons_output_command>scons -Q OS=windows</scons_output_command>
+ <scons_output example="variants_ex" os="win32">
+ <scons_output_command suffix="2">scons -Q OS=windows</scons_output_command>
</scons_output>
<!--
- <scons_example name="ex_var2">
+ <scons_example name="variants_ex2">
<file name="SConstruct" printme="1">
env = Environment(OS = ARGUMENTS.get('OS'))
for os in ['newell', 'post']:
@@ -165,8 +165,8 @@ is pretty smart about rebuilding things when you change options.
</file>
</scons_example>
- <scons_output example="ex_var2">
- <scons_output_command>scons -Q</scons_output_command>
+ <scons_output example="variants_ex2">
+ <scons_output_command suffix="1">scons -Q</scons_output_command>
</scons_output>
-->
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 @@
<xs:attribute name="edit" type="xs:string" use="optional" />
<xs:attribute name="environment" type="xs:string" use="optional" />
<xs:attribute name="output" type="xs:string" use="optional" />
+ <xs:attribute name="suffix" type="xs:string" use="required" />
</xs:attributeGroup>
<!-- end of scons_output_command.attlist -->
<!-- end of scons_output_command.module -->