diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2013-05-03 22:30:28 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2013-05-03 22:30:28 (GMT) |
| commit | 106a09dc814071594306eed8382fd30929e605ab (patch) | |
| tree | 5cda0c7b94858ef25546d5ae059e90aaf23e9ce0 /doc | |
| parent | 6af67d1431b5d534731ff0dc17ff306639a1a854 (diff) | |
| download | SCons-106a09dc814071594306eed8382fd30929e605ab.zip SCons-106a09dc814071594306eed8382fd30929e605ab.tar.gz SCons-106a09dc814071594306eed8382fd30929e605ab.tar.bz2 | |
- removed suffix= from 'scons_output_command ' and moved it
one up in the hierarchy to the 'scons_output' tag
Diffstat (limited to 'doc')
37 files changed, 702 insertions, 668 deletions
diff --git a/doc/user/add-method.xml b/doc/user/add-method.xml index aeb85cf..f15ba22 100644 --- a/doc/user/add-method.xml +++ b/doc/user/add-method.xml @@ -81,8 +81,8 @@ This produces the following: </para> - <scons_output example="addmethod_ex1"> - <scons_output_command suffix="1">scons -Q /</scons_output_command> + <scons_output example="addmethod_ex1" suffix="1"> + <scons_output_command>scons -Q /</scons_output_command> </scons_output> <para> @@ -98,7 +98,7 @@ </para> - <scons_example name="ex2"> + <scons_example name="addmethod_ex2"> <file name="SConstruct" printme="1"> def BuildTestProg(env, testfile, resourcefile, testdir="tests"): """Build the test program; @@ -129,16 +129,16 @@ This produces the following on Linux: </para> - <scons_output example="ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="addmethod_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> And the following on Windows: </para> - <scons_output example="ex2" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="addmethod_ex2" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> diff --git a/doc/user/alias.xml b/doc/user/alias.xml index 07c5bbd..32f585f 100644 --- a/doc/user/alias.xml +++ b/doc/user/alias.xml @@ -71,8 +71,8 @@ </para> - <scons_output example="alias_ex1" os="posix"> - <scons_output_command suffix="1">scons -Q install</scons_output_command> + <scons_output example="alias_ex1" os="posix" suffix="1"> + <scons_output_command>scons -Q install</scons_output_command> </scons_output> <para> @@ -116,11 +116,11 @@ </para> - <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 example="alias_ex2" os="posix" suffix="1"> + <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> </chapter> diff --git a/doc/user/build-install.xml b/doc/user/build-install.xml index 1f1d525..c5ae6a4 100644 --- a/doc/user/build-install.xml +++ b/doc/user/build-install.xml @@ -1,5 +1,9 @@ <?xml version='1.0'?> <!DOCTYPE sconsdoc [ + + <!ENTITY % version SYSTEM "../version.xml"> + %version; + <!ENTITY % scons SYSTEM "../scons.mod"> %scons; @@ -221,7 +225,7 @@ </para> <screen> - # <userinput>rpm -Uvh scons-__VERSION__-1.noarch.rpm</userinput> + # <userinput>rpm -Uvh scons-&buildversion;-1.noarch.rpm</userinput> </screen> <para> @@ -283,7 +287,7 @@ &SCons; provides a Windows installer that makes installation extremely easy. - Download the <filename>scons-__VERSION__.win32.exe</filename> + Download the <filename>scons-&buildversion;.win32.exe</filename> file from the &SCons; download page at <ulink url="http://www.scons.org/download.php">http://www.scons.org/download.php</ulink>. Then all you need to do is execute the file @@ -393,8 +397,8 @@ <para> The first step is to download either the - <filename>scons-__VERSION__.tar.gz</filename> - or <filename>scons-__VERSION__.zip</filename>, + <filename>scons-&buildversion;.tar.gz</filename> + or <filename>scons-&buildversion;.zip</filename>, which are available from the SCons download page at <ulink url="http://www.scons.org/download.html">http://www.scons.org/download.html</ulink>. @@ -407,7 +411,7 @@ on Linux or UNIX, or <application>WinZip</application> on Windows. This will create a directory called - <filename>scons-__VERSION__</filename>, + <filename>scons-&buildversion;</filename>, usually in your local directory. Then change your working directory to that directory and install &SCons; by executing the following commands: @@ -415,7 +419,7 @@ </para> <screen> - # <userinput>cd scons-__VERSION__</userinput> + # <userinput>cd scons-&buildversion;</userinput> # <userinput>python setup.py install</userinput> </screen> @@ -483,9 +487,9 @@ This will install the &SCons; build engine in the - <filename>/usr/lib/scons-__VERSION__</filename> + <filename>/usr/lib/scons-&buildversion;</filename> or - <filename>C:\Python25\scons-__VERSION__</filename> + <filename>C:\Python25\scons-&buildversion;</filename> directory, for example. </para> @@ -542,7 +546,7 @@ relative to the specified prefix. Adding <option>--version-lib</option> to the above example would install the build engine in - <filename>/opt/scons/lib/scons-__VERSION__</filename>. + <filename>/opt/scons/lib/scons-&buildversion;</filename>. </para> diff --git a/doc/user/builders-built-in.xml b/doc/user/builders-built-in.xml index 6b47afc..37e7895 100644 --- a/doc/user/builders-built-in.xml +++ b/doc/user/builders-built-in.xml @@ -172,8 +172,8 @@ </para> - <scons_output example="buildersbuiltin_libs" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="buildersbuiltin_libs" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -182,8 +182,8 @@ </para> - <scons_output example="buildersbuiltin_libs" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="buildersbuiltin_libs" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -760,8 +760,8 @@ </file> </scons_example> - <scons_output example="buildersbuiltin_ex1" os="posix"> - <scons_output_command suffix="1">scons -Q .</scons_output_command> + <scons_output example="buildersbuiltin_ex1" os="posix" suffix="1"> + <scons_output_command>scons -Q .</scons_output_command> </scons_output> <para> @@ -789,8 +789,8 @@ </file> </scons_example> - <scons_output example="buildersbuiltin_ex2" os="posix"> - <scons_output_command suffix="1">scons -Q .</scons_output_command> + <scons_output example="buildersbuiltin_ex2" os="posix" suffix="1"> + <scons_output_command>scons -Q .</scons_output_command> </scons_output> <para> @@ -814,8 +814,8 @@ </file> </scons_example> - <scons_output example="buildersbuiltin_ex3" os="posix"> - <scons_output_command suffix="1">scons -Q .</scons_output_command> + <scons_output example="buildersbuiltin_ex3" os="posix" suffix="1"> + <scons_output_command>scons -Q .</scons_output_command> </scons_output> </section> @@ -856,8 +856,8 @@ </para> - <scons_output example="buildersbuiltin_ex4" os="posix"> - <scons_output_command suffix="1">scons -Q .</scons_output_command> + <scons_output example="buildersbuiltin_ex4" os="posix" suffix="1"> + <scons_output_command>scons -Q .</scons_output_command> </scons_output> </section> diff --git a/doc/user/builders-commands.xml b/doc/user/builders-commands.xml index f9583ca..2c99e94 100644 --- a/doc/user/builders-commands.xml +++ b/doc/user/builders-commands.xml @@ -110,8 +110,8 @@ </para> - <scons_output example="builderscommands_ex1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderscommands_ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -150,8 +150,8 @@ </para> - <scons_output example="builderscommands_ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderscommands_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> diff --git a/doc/user/builders-writing.xml b/doc/user/builders-writing.xml index e676ef2..d621929 100644 --- a/doc/user/builders-writing.xml +++ b/doc/user/builders-writing.xml @@ -224,8 +224,8 @@ This functionality could be invoked as in the following example: </para> - <scons_output example="builderswriting_ex1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -280,8 +280,8 @@ This functionality could be invoked as in the following example: </file> </scons_example> - <scons_output example="builderswriting_ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -346,8 +346,8 @@ This functionality could be invoked as in the following example: </para> - <scons_output example="builderswriting_ex3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_ex3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -403,8 +403,8 @@ This functionality could be invoked as in the following example: env.Foo('file2') </sconstruct> - <scons_output example="builderswriting_ex4"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_ex4" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -544,8 +544,8 @@ This functionality could be invoked as in the following example: </para> - <scons_output example="builderswriting_ex5"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_ex5" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -696,8 +696,8 @@ This functionality could be invoked as in the following example: env.Foo('file') </sconstruct> - <scons_output example="builderswriting_ex6"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_ex6" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -789,8 +789,8 @@ This functionality could be invoked as in the following example: </para> - <scons_output example="builderswriting_ex7"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_ex7" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -874,8 +874,8 @@ This functionality could be invoked as in the following example: </para> - <scons_output example="builderswriting_MY_EMITTER"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_MY_EMITTER" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -999,8 +999,8 @@ This functionality could be invoked as in the following example: </para> <!-- - <scons_output example="builderswriting_site1" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_site1" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> @@ -1121,8 +1121,8 @@ This functionality could be invoked as in the following example: </file> </scons_example> - <scons_output example="builderswriting_ex8"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="builderswriting_ex8" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> diff --git a/doc/user/caching.xml b/doc/user/caching.xml index 522dd65..ff8d0e3 100644 --- a/doc/user/caching.xml +++ b/doc/user/caching.xml @@ -120,10 +120,10 @@ </para> - <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 example="caching_ex1" suffix="1"> + <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> <para> @@ -170,10 +170,10 @@ </para> - <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 example="caching_ex1" suffix="2"> + <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> <para> @@ -232,10 +232,10 @@ <!-- - <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 example="caching_ex1" suffix="3"> + <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> --> @@ -284,12 +284,12 @@ </para> - <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 example="caching_ex1" suffix="4"> + <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> </section> @@ -325,12 +325,12 @@ </para> - <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 example="caching_ex1" suffix="5"> + <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> <para> @@ -385,8 +385,8 @@ </para> - <scons_output example="caching_ex-random"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="caching_ex-random" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -420,8 +420,8 @@ The following <screen> output was generated by this: - <scons_output example="caching_ex-random"> - <scons_output_command suffix="2">scons -Q - -random</scons_output_command> + <scons_output example="caching_ex-random" suffix="2"> + <scons_output_command>scons -Q - -random</scons_output_command> </scons_output> We captured it directly here to guarantee a "random" order, diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml index ba08bf9..55545b4 100644 --- a/doc/user/command-line.xml +++ b/doc/user/command-line.xml @@ -183,10 +183,10 @@ </file> </scons_example> - <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 example="commandline_SCONSFLAGS" suffix="1"> + <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> <para> @@ -344,8 +344,8 @@ </para> - <scons_output example="commandline_SetOption"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="commandline_SetOption" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -356,9 +356,9 @@ </para> - <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 example="commandline_SetOption" suffix="2"> + <scons_output_command>export NUM_CPU="4"</scons_output_command> + <scons_output_command environment="NUM_CPU=4">scons -Q</scons_output_command> </scons_output> <para> @@ -372,10 +372,10 @@ </para> - <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 example="commandline_SetOption" suffix="3"> + <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> </section> @@ -662,8 +662,8 @@ </para> - <scons_output example="commandline_AddOption"> - <scons_output_command suffix="1">scons -Q -n</scons_output_command> + <scons_output example="commandline_AddOption" suffix="1"> + <scons_output_command>scons -Q -n</scons_output_command> </scons_output> <para> @@ -674,8 +674,8 @@ </para> - <scons_output example="commandline_AddOption"> - <scons_output_command suffix="2">scons -Q -n --prefix=/tmp/install</scons_output_command> + <scons_output example="commandline_AddOption" suffix="2"> + <scons_output_command>scons -Q -n --prefix=/tmp/install</scons_output_command> </scons_output> </section> @@ -753,11 +753,11 @@ </para> - <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 example="commandline_ARGUMENTS" suffix="1"> + <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> <para> @@ -840,9 +840,9 @@ </para> - <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 example="commandline_ARGLIST" suffix="1"> + <scons_output_command>scons -Q define=FOO</scons_output_command> + <scons_output_command>scons -Q define=FOO define=BAR</scons_output_command> </scons_output> <para> @@ -950,8 +950,8 @@ </para> - <scons_output example="commandline_Variables1"> - <scons_output_command suffix="1">scons -Q RELEASE=1</scons_output_command> + <scons_output example="commandline_Variables1" suffix="1"> + <scons_output_command>scons -Q RELEASE=1</scons_output_command> </scons_output> <para> @@ -1012,8 +1012,8 @@ </para> - <scons_output example="commandline_Variables_Help"> - <scons_output_command suffix="1">scons -Q -h</scons_output_command> + <scons_output example="commandline_Variables_Help" suffix="1"> + <scons_output_command>scons -Q -h</scons_output_command> </scons_output> <para> @@ -1080,8 +1080,8 @@ </para> - <scons_output example="commandline_Variables_custom_py_1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="commandline_Variables_custom_py_1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1117,8 +1117,8 @@ </para> - <scons_output example="commandline_Variables_custom_py_2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="commandline_Variables_custom_py_2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1202,12 +1202,12 @@ </para> - <scons_output example="commandline_BoolVariable"> - <scons_output_command suffix="1">scons -Q RELEASE=yes foo.o</scons_output_command> + <scons_output example="commandline_BoolVariable" suffix="1"> + <scons_output_command>scons -Q RELEASE=yes foo.o</scons_output_command> </scons_output> - <scons_output example="commandline_BoolVariable"> - <scons_output_command suffix="2">scons -Q RELEASE=t foo.o</scons_output_command> + <scons_output example="commandline_BoolVariable" suffix="2"> + <scons_output_command>scons -Q RELEASE=t foo.o</scons_output_command> </scons_output> <para> @@ -1231,12 +1231,12 @@ </para> - <scons_output example="commandline_BoolVariable"> - <scons_output_command suffix="3">scons -Q RELEASE=no foo.o</scons_output_command> + <scons_output example="commandline_BoolVariable" suffix="3"> + <scons_output_command>scons -Q RELEASE=no foo.o</scons_output_command> </scons_output> - <scons_output example="commandline_BoolVariable"> - <scons_output_command suffix="4">scons -Q RELEASE=f foo.o</scons_output_command> + <scons_output example="commandline_BoolVariable" suffix="4"> + <scons_output_command>scons -Q RELEASE=f foo.o</scons_output_command> </scons_output> <para> @@ -1258,8 +1258,8 @@ </para> - <scons_output example="commandline_BoolVariable"> - <scons_output_command suffix="5">scons -Q RELEASE=bad_value foo.o</scons_output_command> + <scons_output example="commandline_BoolVariable" suffix="5"> + <scons_output_command>scons -Q RELEASE=bad_value foo.o</scons_output_command> </scons_output> </section> @@ -1305,10 +1305,10 @@ </para> - <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 example="commandline_EnumVariable" suffix="1"> + <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> <para> @@ -1320,8 +1320,8 @@ </para> - <scons_output example="commandline_EnumVariable"> - <scons_output_command suffix="4">scons -Q COLOR=magenta foo.o</scons_output_command> + <scons_output example="commandline_EnumVariable" suffix="2"> + <scons_output_command>scons -Q COLOR=magenta foo.o</scons_output_command> </scons_output> <para> @@ -1363,8 +1363,8 @@ </para> - <scons_output example="EnumVariable_map"> - <scons_output_command suffix="1">scons -Q COLOR=navy foo.o</scons_output_command> + <scons_output example="EnumVariable_map" suffix="1"> + <scons_output_command>scons -Q COLOR=navy foo.o</scons_output_command> </scons_output> <para> @@ -1377,10 +1377,10 @@ </para> - <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 example="commandline_EnumVariable" suffix="3"> + <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> <para> @@ -1415,11 +1415,11 @@ </para> - <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 example="commandline_EnumVariable_ic1" suffix="1"> + <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> <para> @@ -1460,10 +1460,10 @@ </para> - <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 example="commandline_EnumVariable_ic2" suffix="1"> + <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> </section> @@ -1505,9 +1505,9 @@ </para> - <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 example="commandline_ListVariable" suffix="1"> + <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> <para> @@ -1520,9 +1520,9 @@ </para> - <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 example="commandline_ListVariable" suffix="2"> + <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> <para> @@ -1532,8 +1532,8 @@ </para> - <scons_output example="commandline_ListVariable"> - <scons_output_command suffix="5">scons -Q COLORS=magenta foo.o</scons_output_command> + <scons_output example="commandline_ListVariable" suffix="3"> + <scons_output_command>scons -Q COLORS=magenta foo.o</scons_output_command> </scons_output> </section> @@ -1582,9 +1582,9 @@ </para> - <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 example="commandline_PathVariable" suffix="1"> + <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> <para> @@ -1595,8 +1595,8 @@ </para> - <scons_output example="commandline_PathVariable"> - <scons_output_command suffix="3">scons -Q CONFIG=__ROOT__/does/not/exist foo.o</scons_output_command> + <scons_output example="commandline_PathVariable" suffix="2"> + <scons_output_command>scons -Q CONFIG=__ROOT__/does/not/exist foo.o</scons_output_command> </scons_output> <para> @@ -1762,11 +1762,11 @@ </para> - <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 example="commandline_PackageVariable" suffix="1"> + <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> </section> @@ -1891,8 +1891,8 @@ </para> - <scons_output example="commandline_UnknownVariables"> - <scons_output_command suffix="1">scons -Q NOT_KNOWN=foo</scons_output_command> + <scons_output example="commandline_UnknownVariables" suffix="1"> + <scons_output_command>scons -Q NOT_KNOWN=foo</scons_output_command> </scons_output> <para> @@ -1966,9 +1966,9 @@ </para> - <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 example="commandline_COMMAND_LINE_TARGETS" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q bar</scons_output_command> </scons_output> <para> @@ -2028,10 +2028,10 @@ </para> - <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 example="commandline_Default1" suffix="1"> + <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> <para> @@ -2045,8 +2045,8 @@ </para> - <scons_output example="commandline_Default1"> - <scons_output_command suffix="4">scons -Q .</scons_output_command> + <scons_output example="commandline_Default1" suffix="2"> + <scons_output_command>scons -Q .</scons_output_command> </scons_output> <para> @@ -2104,9 +2104,9 @@ </para> - <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 example="commandline_Default2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q .</scons_output_command> </scons_output> <para> @@ -2146,10 +2146,10 @@ </para> - <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 example="commandline_Default3" suffix="1"> + <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> <para> @@ -2182,9 +2182,9 @@ </para> - <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 example="commandline_Default4" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q .</scons_output_command> </scons_output> <section> @@ -2227,8 +2227,8 @@ </para> - <scons_output example="commandline_DEFAULT_TARGETS_1"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="commandline_DEFAULT_TARGETS_1" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -2263,8 +2263,8 @@ </para> - <scons_output example="commandline_DEFAULT_TARGETS_2"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="commandline_DEFAULT_TARGETS_2" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -2356,10 +2356,10 @@ </para> - <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 example="commandline_BUILD_TARGETS_1" suffix="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> </section> diff --git a/doc/user/depends.xml b/doc/user/depends.xml index a5468dc..8e1ae21 100644 --- a/doc/user/depends.xml +++ b/doc/user/depends.xml @@ -67,9 +67,9 @@ </file> </scons_example> - <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 example="depends_ex1" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -83,9 +83,9 @@ </para> - <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 example="depends_ex1" os="posix" suffix="2"> + <scons_output_command>scons -Q hello</scons_output_command> + <scons_output_command>scons -Q hello</scons_output_command> </scons_output> <para> @@ -135,10 +135,10 @@ </para> - <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 example="depends_ex1" os="posix" suffix="3"> + <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> <para> @@ -157,10 +157,10 @@ </para> - <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 example="depends_ex1" os="posix" suffix="4"> + <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> <para> @@ -216,10 +216,10 @@ </para> - <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 example="depends_ex1" os="posix" suffix="5"> + <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> <para> @@ -286,10 +286,10 @@ </para> - <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 example="depends_newer" os="posix" suffix="1"> + <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> <para> @@ -359,10 +359,10 @@ </para> - <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 example="depends_match" os="posix" suffix="1"> + <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> <para> @@ -420,12 +420,12 @@ output seems to get this wrong. Just in-line the output for now. - <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 example="depends_MD5-timestamp" os="posix" suffix="1"> + <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> --> @@ -729,10 +729,10 @@ </para> - <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 example="depends_mixing" os="posix" suffix="1"> + <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> </section> @@ -997,11 +997,11 @@ </para> - <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 example="depends_include" os="posix" suffix="1"> + <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> <para> @@ -1062,8 +1062,8 @@ </para> - <scons_output example="depends_ex5" os="posix"> - <scons_output_command suffix="1">scons -Q hello</scons_output_command> + <scons_output example="depends_ex5" os="posix" suffix="1"> + <scons_output_command>scons -Q hello</scons_output_command> </scons_output> <para> @@ -1072,8 +1072,8 @@ </para> - <scons_output example="depends_ex5" os="win32"> - <scons_output_command suffix="2">scons -Q hello.exe</scons_output_command> + <scons_output example="depends_ex5" os="win32" suffix="2"> + <scons_output_command>scons -Q hello.exe</scons_output_command> </scons_output> </section> @@ -1126,9 +1126,9 @@ </para> - <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 example="depends_ex1" suffix="6"> + <scons_output_command>scons -Q --implicit-cache hello</scons_output_command> + <scons_output_command>scons -Q hello</scons_output_command> </scons_output> <para> @@ -1206,9 +1206,9 @@ </para> - <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 example="depends_ex1" suffix="7"> + <scons_output_command>scons -Q --implicit-deps-changed hello</scons_output_command> + <scons_output_command>scons -Q hello</scons_output_command> </scons_output> <para> @@ -1241,9 +1241,9 @@ </para> - <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 example="depends_ex1" suffix="8"> + <scons_output_command>scons -Q --implicit-deps-unchanged hello</scons_output_command> + <scons_output_command>scons -Q hello</scons_output_command> </scons_output> <para> @@ -1379,11 +1379,10 @@ </file> </scons_example> - <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]" - suffix="2">edit foo.h</scons_output_command> - <scons_output_command suffix="3">scons -Q</scons_output_command> + <scons_output example="depends_macroinc" os="posix" suffix="1"> + <scons_output_command>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> </scons_output> <para> @@ -1438,11 +1437,10 @@ </file> </scons_example> - <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]" - suffix="2">edit foo.h</scons_output_command> - <scons_output_command suffix="3">scons -Q</scons_output_command> + <scons_output example="depends_parsedep" os="posix" suffix="1"> + <scons_output_command>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> </scons_output> <para> @@ -1474,10 +1472,10 @@ </scons_example> <!-- - <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 example="depends_parsedeprebuild" os="posix" suffix="1"> + <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> --> @@ -1550,11 +1548,11 @@ <!-- XXX mention that you can use lists for target and source? --> <!-- - <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> + <scons_output example="depends_ignore" suffix="1"> + <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> XXX THIS EXAMPLE SHOULD BE UP-TO-DATE! XXX </scons_output> --> @@ -1620,10 +1618,10 @@ </file> </scons_example> - <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 example="depends_ignore_explicit" os="posix" suffix="1"> + <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> </section> @@ -1699,12 +1697,12 @@ </para> - <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 example="depends_no-Requires" suffix="1"> + <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> <para> @@ -1776,15 +1774,15 @@ </para> - <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 example="depends_Requires" suffix="1"> + <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> </section> @@ -1820,9 +1818,9 @@ </para> - <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 example="depends_AlwaysBuild" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1842,9 +1840,9 @@ </para> - <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 example="depends_AlwaysBuild" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q hello.o</scons_output_command> </scons_output> <!-- diff --git a/doc/user/environments.xml b/doc/user/environments.xml index ad810dd..4d6208e 100644 --- a/doc/user/environments.xml +++ b/doc/user/environments.xml @@ -607,8 +607,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -639,8 +639,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex6"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_ex6" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -670,8 +670,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex6b" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_ex6b" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -680,8 +680,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex6b" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="environments_ex6b" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -810,8 +810,8 @@ environment, of directory names, suffixes, etc. </file> </scons_example> - <scons_output example="environments_missing1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_missing1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -838,8 +838,8 @@ environment, of directory names, suffixes, etc. </file> </scons_example> - <scons_output example="environments_missing2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_missing2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -858,8 +858,8 @@ environment, of directory names, suffixes, etc. </file> </scons_example> - <scons_output example="environments_missing3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_missing3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <sconstruct> </sconstruct> @@ -1020,8 +1020,8 @@ environment, of directory names, suffixes, etc. </file> </scons_example> - <scons_output example="environments_ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1054,8 +1054,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_ex3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1111,8 +1111,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex4"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_ex4" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -1172,8 +1172,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex5"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_ex5" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -1208,8 +1208,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_Replace1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_Replace1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1236,8 +1236,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_Replace-nonexistent"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_Replace-nonexistent" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1285,8 +1285,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_Replace2"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="environments_Replace2" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -1368,8 +1368,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex8"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_ex8" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1393,8 +1393,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_Append-nonexistent"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_Append-nonexistent" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1468,8 +1468,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex9"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_ex9" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1493,8 +1493,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_Prepend-nonexistent"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="environments_Prepend-nonexistent" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -1666,8 +1666,8 @@ environment, of directory names, suffixes, etc. </para> - <scons_output example="environments_ex1"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="environments_ex1" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> diff --git a/doc/user/factories.xml b/doc/user/factories.xml index 35b82d5..2e5d12a 100644 --- a/doc/user/factories.xml +++ b/doc/user/factories.xml @@ -100,8 +100,8 @@ </para> - <scons_output example="factories_Copy1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="factories_Copy1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -124,8 +124,8 @@ </para> - <scons_output example="factories_Copy2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="factories_Copy2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -172,8 +172,8 @@ </para> - <scons_output example="factories_Copy3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="factories_Copy3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -224,8 +224,8 @@ </para> - <scons_output example="factories_Delete1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="factories_Delete1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -254,8 +254,8 @@ </para> - <scons_output example="factories_Delete2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="factories_Delete2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -318,8 +318,8 @@ </para> - <scons_output example="factories_Move"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="factories_Move" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -358,8 +358,8 @@ </para> - <scons_output example="factories_Touch"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="factories_Touch" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -409,8 +409,8 @@ </para> - <scons_output example="factories_Mkdir"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="factories_Mkdir" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -446,8 +446,8 @@ </para> - <scons_output example="factories_Chmod"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="factories_Chmod" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -482,8 +482,8 @@ </para> - <scons_output example="factories_Execute"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="factories_Execute" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> diff --git a/doc/user/file-removal.xml b/doc/user/file-removal.xml index 654b93f..d1db56d 100644 --- a/doc/user/file-removal.xml +++ b/doc/user/file-removal.xml @@ -103,8 +103,8 @@ </para> - <scons_output example="fileremoval_precious-ex1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="fileremoval_precious-ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -160,9 +160,9 @@ </para> - <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 example="fileremoval_noclean-ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -c</scons_output_command> </scons_output> </section> @@ -237,9 +237,9 @@ </para> - <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 example="fileremoval_clean-ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q -c</scons_output_command> </scons_output> </section> diff --git a/doc/user/hierarchy.xml b/doc/user/hierarchy.xml index ff7dd1b..8ded366 100644 --- a/doc/user/hierarchy.xml +++ b/doc/user/hierarchy.xml @@ -361,8 +361,8 @@ make no difference to the build. </para> - <scons_output example="hierarchy_ex1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="hierarchy_ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -432,8 +432,8 @@ make no difference to the build. </para> - <scons_output example="hierarchy_ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="hierarchy_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -483,8 +483,8 @@ make no difference to the build. </para> - <scons_output example="hierarchy_ex3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="hierarchy_ex3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -788,8 +788,8 @@ make no difference to the build. </para> - <scons_output example="hierarchy_Return"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="hierarchy_Return" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <!-- diff --git a/doc/user/install.xml b/doc/user/install.xml index 98c0e6d..4921bb2 100644 --- a/doc/user/install.xml +++ b/doc/user/install.xml @@ -83,9 +83,9 @@ </para> - <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 example="install_ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q __ROOT__/usr/bin</scons_output_command> </scons_output> <para> @@ -122,9 +122,9 @@ </para> - <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 example="install_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q install</scons_output_command> </scons_output> <section> @@ -176,8 +176,8 @@ </para> - <scons_output example="install_ex3"> - <scons_output_command suffix="1">scons -Q install</scons_output_command> + <scons_output example="install_ex3" suffix="1"> + <scons_output_command>scons -Q install</scons_output_command> </scons_output> </section> @@ -215,8 +215,8 @@ </para> - <scons_output example="install_ex4"> - <scons_output_command suffix="1">scons -Q install</scons_output_command> + <scons_output example="install_ex4" suffix="1"> + <scons_output_command>scons -Q install</scons_output_command> </scons_output> </section> @@ -262,8 +262,8 @@ </para> - <scons_output example="install_ex5"> - <scons_output_command suffix="1">scons -Q install</scons_output_command> + <scons_output example="install_ex5" suffix="1"> + <scons_output_command>scons -Q install</scons_output_command> </scons_output> </section> diff --git a/doc/user/java.xml b/doc/user/java.xml index 4ddc370..c8f559a 100644 --- a/doc/user/java.xml +++ b/doc/user/java.xml @@ -119,8 +119,8 @@ </para> - <scons_output example="java_java"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="java_java" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -211,9 +211,9 @@ </para> - <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 example="java_java-classes" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q classes</scons_output_command> </scons_output> <para> @@ -235,9 +235,9 @@ </para> - <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 example="java_java-classes" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q -c classes</scons_output_command> </scons_output> <para> @@ -321,8 +321,8 @@ </para> - <scons_output example="java_jar1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="java_jar1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -397,8 +397,8 @@ </para> - <scons_output example="java_jar2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="java_jar2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -462,8 +462,8 @@ </para> - <scons_output example="java_javah"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="java_javah" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -545,8 +545,8 @@ </para> - <scons_output example="java_JAVACLASSDIR"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="java_JAVACLASSDIR" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -605,8 +605,8 @@ </para> - <scons_output example="java_javah_file"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="java_javah_file" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -661,8 +661,8 @@ </para> - <scons_output example="java_RMIC"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="java_RMIC" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml index 81f4c20..eb0f821 100644 --- a/doc/user/less-simple.xml +++ b/doc/user/less-simple.xml @@ -111,8 +111,8 @@ </para> - <scons_output example="lesssimple_target" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="lesssimple_target" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -122,8 +122,8 @@ </para> - <scons_output example="lesssimple_target" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="lesssimple_target" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -166,8 +166,8 @@ </para> - <scons_output example="lesssimple_ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="lesssimple_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -213,8 +213,8 @@ </para> - <scons_output example="lesssimple_ex3" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="lesssimple_ex3" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -223,8 +223,8 @@ </para> - <scons_output example="lesssimple_ex3" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="lesssimple_ex3" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -534,8 +534,8 @@ </para> - <scons_output example="lesssimple_ex4"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="lesssimple_ex4" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -609,8 +609,8 @@ </para> - <scons_output example="lesssimple_ex5"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="lesssimple_ex5" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> diff --git a/doc/user/libraries.xml b/doc/user/libraries.xml index be09752..ad2572a 100644 --- a/doc/user/libraries.xml +++ b/doc/user/libraries.xml @@ -87,8 +87,8 @@ </para> - <scons_output example="libraries_ex1" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="libraries_ex1" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -98,8 +98,8 @@ </para> - <scons_output example="libraries_ex1" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="libraries_ex1" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -155,8 +155,8 @@ </para> - <scons_output example="libraries_objects" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="libraries_objects" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -231,8 +231,8 @@ </para> - <scons_output example="libraries_SharedLibrary" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="libraries_SharedLibrary" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -241,8 +241,8 @@ </para> - <scons_output example="libraries_SharedLibrary" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="libraries_SharedLibrary" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -313,8 +313,8 @@ </para> - <scons_output example="libraries_ex2" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="libraries_ex2" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -324,8 +324,8 @@ </para> - <scons_output example="libraries_ex2" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="libraries_ex2" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -438,8 +438,8 @@ </para> - <scons_output example="libraries_ex3" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="libraries_ex3" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -449,8 +449,8 @@ </para> - <scons_output example="libraries_ex3" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="libraries_ex3" os="win32" suffix="2"> + <scons_output_command>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/main.xml b/doc/user/main.xml index b2dbcb0..47640ec 100644 --- a/doc/user/main.xml +++ b/doc/user/main.xml @@ -64,15 +64,19 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0 scons.xsd"> <bookinfo> - <title>SCons User Guide &buildversion;</title> + <title>SCons &buildversion;</title> + <subtitle>User Guide</subtitle> <author> <firstname>Steven</firstname> <surname>Knight</surname> </author> - <edition>Revision &buildrevision; (&builddate;)</edition> + <corpauthor>Stephen Knight</corpauthor> +<!-- +Revision &buildrevision; (&builddate;)</edition> +--> <pubdate>2004, 2005, 2006, 2007, 2008, 2009, 2010</pubdate> <copyright> diff --git a/doc/user/mergeflags.xml b/doc/user/mergeflags.xml index 1c73f8a..9e0dcc6 100644 --- a/doc/user/mergeflags.xml +++ b/doc/user/mergeflags.xml @@ -81,8 +81,8 @@ </file> </scons_example> - <scons_output example="mergeflags_MergeFlags1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="mergeflags_MergeFlags1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -108,8 +108,8 @@ </file> </scons_example> - <scons_output example="mergeflags_MergeFlags2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="mergeflags_MergeFlags2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -143,8 +143,8 @@ </file> </scons_example> - <scons_output example="mergeflags_MergeFlags3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="mergeflags_MergeFlags3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> diff --git a/doc/user/misc.xml b/doc/user/misc.xml index 5264c78..42f6a2d 100644 --- a/doc/user/misc.xml +++ b/doc/user/misc.xml @@ -115,8 +115,8 @@ regardless of executing Python version by faking out the infrastructure in some way. - <scons_output example="misc_EnsurePythonVersion"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_EnsurePythonVersion" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> @@ -184,8 +184,8 @@ regardless of executing SCons version by faking out the infrastructure in some way. - <scons_output example="misc_EnsureSConsVersion"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_EnsureSConsVersion" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> @@ -223,9 +223,9 @@ </file> </scons_example> - <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 example="misc_Exit" suffix="1"> + <scons_output_command>scons -Q FUTURE=1</scons_output_command> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -278,8 +278,8 @@ </file> </scons_example> - <scons_output example="misc_FindFile1a" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_FindFile1a" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <scons_example name="misc_FindFile1b"> @@ -304,8 +304,8 @@ </file> </scons_example> - <scons_output example="misc_FindFile1b" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_FindFile1b" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <!-- The man page says this should work, but it fails. @@ -337,8 +337,8 @@ exists </scons_example> - <scons_output example="misc_FindFile1c" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_FindFile1c" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> @@ -369,8 +369,8 @@ </file> </scons_example> - <scons_output example="misc_FindFile1d" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_FindFile1d" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <!-- file may be a list of file names or a single file name. --> @@ -392,8 +392,8 @@ </file> </scons_example> - <scons_output example="misc_FindFile2" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_FindFile2" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <scons_example name="misc_FindFile2"> @@ -408,8 +408,8 @@ </file> </scons_example> - <scons_output example="misc_FindFile2" os="posix"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="misc_FindFile2" os="posix" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -431,8 +431,8 @@ </file> </scons_example> - <scons_output example="misc_FindFile3" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_FindFile3" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -482,8 +482,8 @@ </para> - <scons_output example="misc_Flatten1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_Flatten1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -528,8 +528,8 @@ </para> - <scons_output example="misc_Flatten2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_Flatten2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -563,8 +563,8 @@ TODO: can't use this now because it displays the temporary path name - <scons_output example="misc_Flatten3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="misc_Flatten3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> diff --git a/doc/user/nodes.xml b/doc/user/nodes.xml index cc17e35..8c57169 100644 --- a/doc/user/nodes.xml +++ b/doc/user/nodes.xml @@ -142,8 +142,8 @@ </para> - <scons_output example="nodes_ex1" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="nodes_ex1" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -152,8 +152,8 @@ </para> - <scons_output example="nodes_ex1" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="nodes_ex1" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -279,8 +279,8 @@ </para> - <scons_output example="nodes_print" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="nodes_print" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -289,8 +289,8 @@ </para> - <scons_output example="nodes_print" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="nodes_print" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -347,8 +347,8 @@ </para> - <scons_output example="nodes_exists" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="nodes_exists" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -384,8 +384,8 @@ </para> - <scons_output example="nodes_GetBuildPath" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="nodes_GetBuildPath" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -428,8 +428,8 @@ </para> - <scons_output example="nodes_read" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="nodes_read" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> diff --git a/doc/user/output.xml b/doc/user/output.xml index 6dd2528..05e4fe8 100644 --- a/doc/user/output.xml +++ b/doc/user/output.xml @@ -98,8 +98,8 @@ </para> - <scons_output example="output_ex1"> - <scons_output_command suffix="1">scons -h</scons_output_command> + <scons_output example="output_ex1" suffix="1"> + <scons_output_command>scons -h</scons_output_command> </scons_output> <para> @@ -147,8 +147,8 @@ </para> - <scons_output example="output_ex2" os="win32"> - <scons_output_command suffix="1">scons -h</scons_output_command> + <scons_output example="output_ex2" os="win32" suffix="1"> + <scons_output_command>scons -h</scons_output_command> </scons_output> <para> @@ -157,8 +157,8 @@ </para> - <scons_output example="output_ex2" os="posix"> - <scons_output_command suffix="2">scons -h</scons_output_command> + <scons_output example="output_ex2" os="posix" suffix="2"> + <scons_output_command>scons -h</scons_output_command> </scons_output> <para> @@ -231,8 +231,8 @@ <!-- - <scons_output example="output_COMSTR" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="output_COMSTR" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> @@ -313,10 +313,10 @@ <!-- - <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 example="output_COMSTR-VERBOSE" os="posix" suffix="1"> + <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> --> @@ -401,8 +401,8 @@ </para> - <scons_output example="output_Progress-TARGET" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="output_Progress-TARGET" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -694,9 +694,9 @@ </para> - <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 example="output_gbf2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> + <scons_output_command>scons -Q fail=1</scons_output_command> </scons_output> </section> diff --git a/doc/user/parseconfig.xml b/doc/user/parseconfig.xml index 0d619b1..ab10f96 100644 --- a/doc/user/parseconfig.xml +++ b/doc/user/parseconfig.xml @@ -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="parseconfig_ex1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="parseconfig_ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> @@ -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="parseconfig_ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="parseconfig_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> diff --git a/doc/user/parseflags.xml b/doc/user/parseflags.xml index f327f51..80e7720 100644 --- a/doc/user/parseflags.xml +++ b/doc/user/parseflags.xml @@ -93,8 +93,8 @@ </file> </scons_example> - <scons_output example="parseflags_ex1" os="posix"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="parseflags_ex1" os="posix" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -105,8 +105,8 @@ </para> - <scons_output example="parseflags_ex1" os="win32"> - <scons_output_command suffix="2">scons -Q</scons_output_command> + <scons_output example="parseflags_ex1" os="win32" suffix="2"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -132,8 +132,8 @@ </file> </scons_example> - <scons_output example="parseflags_ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="parseflags_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -158,8 +158,8 @@ </file> </scons_example> - <scons_output example="parseflags_ex3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="parseflags_ex3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -185,8 +185,8 @@ </file> </scons_example> - <scons_output example="parseflags_ex4"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="parseflags_ex4" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> diff --git a/doc/user/repositories.xml b/doc/user/repositories.xml index 902ef02..3638def 100644 --- a/doc/user/repositories.xml +++ b/doc/user/repositories.xml @@ -150,8 +150,8 @@ </para> - <scons_output example="repositories_ex1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="repositories_ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -174,8 +174,8 @@ </file> </scons_example> - <scons_output example="repositories_ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="repositories_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -197,8 +197,8 @@ </file> </scons_example> - <scons_output example="repositories_ex3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="repositories_ex3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -271,8 +271,8 @@ </para> - <scons_output example="repositories_CPPPATH"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="repositories_CPPPATH" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -310,8 +310,8 @@ </para> - <scons_output example="repositories_CPPPATH3"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="repositories_CPPPATH3" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <!-- @@ -385,8 +385,8 @@ coming into existence.) </file> </scons_example> - <scons_output example="repositories_quote1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="repositories_quote1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -530,9 +530,9 @@ coming into existence.) </file> </scons_example> - <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 example="repositories_ex4" suffix="1"> + <scons_output_command>cd /usr/repository1</scons_output_command> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -556,10 +556,10 @@ coming into existence.) </para> <!-- - <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 example="repositories_ex4" suffix="2"> + <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> --> <screen> diff --git a/doc/user/scanners.xml b/doc/user/scanners.xml index 304937c..36dfd18 100644 --- a/doc/user/scanners.xml +++ b/doc/user/scanners.xml @@ -351,11 +351,11 @@ over the file scanning rather than being called for each input line: </para> - <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 example="scanners_scan" suffix="1"> + <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> --> diff --git a/doc/user/separate.xml b/doc/user/separate.xml index ea8c71f..8fbc7a1 100644 --- a/doc/user/separate.xml +++ b/doc/user/separate.xml @@ -192,10 +192,10 @@ program using the F<build/foo.c> path name. </para> - <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 example="separate_ex1" suffix="1"> + <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> <para> @@ -389,10 +389,10 @@ program using the F<build/foo.c> path name. </para> - <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 example="separate_builddir" suffix="1"> + <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> <para> @@ -420,10 +420,10 @@ program using the F<build/foo.c> path name. </para> - <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 example="separate_duplicate0" suffix="1"> + <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> </section> @@ -471,10 +471,10 @@ program using the F<build/foo.c> path name. </para> - <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 example="separate_builddir_sconscript" suffix="1"> + <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> <para> @@ -530,10 +530,10 @@ program using the F<build/foo.c> path name. </para> - <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 example="separate_glob_builddir_sconscript" suffix="1"> + <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> <para> diff --git a/doc/user/sideeffect.xml b/doc/user/sideeffect.xml index dd0203a..f373343 100644 --- a/doc/user/sideeffect.xml +++ b/doc/user/sideeffect.xml @@ -92,8 +92,8 @@ </para> - <scons_output example="sideeffect_simple"> - <scons_output_command suffix="1">scons -Q --jobs=2</scons_output_command> + <scons_output example="sideeffect_simple" suffix="1"> + <scons_output_command>scons -Q --jobs=2</scons_output_command> </scons_output> <para> @@ -181,8 +181,8 @@ </para> - <scons_output example="sideeffect_shared"> - <scons_output_command suffix="1">scons -Q --jobs=2</scons_output_command> + <scons_output example="sideeffect_shared" suffix="1"> + <scons_output_command>scons -Q --jobs=2</scons_output_command> </scons_output> <para> @@ -207,8 +207,8 @@ </file> </scons_example> - <scons_output example="sideeffect_parallel"> - <scons_output_command suffix="1">scons -Q --jobs=2</scons_output_command> + <scons_output example="sideeffect_parallel" suffix="1"> + <scons_output_command>scons -Q --jobs=2</scons_output_command> </scons_output> <para> diff --git a/doc/user/simple.xml b/doc/user/simple.xml index 323d83f..34d5dc6 100644 --- a/doc/user/simple.xml +++ b/doc/user/simple.xml @@ -112,8 +112,8 @@ </para> - <scons_output example="simple_ex1" os="posix"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="simple_ex1" os="posix" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -123,8 +123,8 @@ </para> - <scons_output example="simple_ex1" os="win32"> - <scons_output_command suffix="2">scons</scons_output_command> + <scons_output example="simple_ex1" os="win32" suffix="2"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -193,8 +193,8 @@ </para> - <scons_output example="simple_Object" os="posix"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="simple_Object" os="posix" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -204,8 +204,8 @@ </para> - <scons_output example="simple_Object" os="win32"> - <scons_output_command suffix="2">scons</scons_output_command> + <scons_output example="simple_Object" os="win32" suffix="2"> + <scons_output_command>scons</scons_output_command> </scons_output> </section> @@ -251,8 +251,8 @@ </para> - <scons_output example="simple_java" os="posix"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="simple_java" os="posix" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -292,9 +292,9 @@ </file> </scons_example> - <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 example="simple_clean" os="posix" suffix="1"> + <scons_output_command>scons</scons_output_command> + <scons_output_command>scons -c</scons_output_command> </scons_output> <para> @@ -303,9 +303,9 @@ </para> - <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 example="simple_clean" os="win32" suffix="2"> + <scons_output_command>scons</scons_output_command> + <scons_output_command>scons -c</scons_output_command> </scons_output> <para> @@ -467,8 +467,8 @@ </para> - <scons_output example="simple_declarative" os="posix"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="simple_declarative" os="posix" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -495,8 +495,8 @@ </para> - <scons_output example="simple_ex1" os="win32"> - <scons_output_command suffix="3">scons</scons_output_command> + <scons_output example="simple_ex1" os="win32" suffix="3"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -521,8 +521,8 @@ </para> - <scons_output example="simple_ex1" os="win32"> - <scons_output_command suffix="4">scons -Q</scons_output_command> + <scons_output example="simple_ex1" os="win32" suffix="4"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> diff --git a/doc/user/sourcecode.xml b/doc/user/sourcecode.xml index 7251dce..c1a97a2 100644 --- a/doc/user/sourcecode.xml +++ b/doc/user/sourcecode.xml @@ -74,8 +74,8 @@ </file> </scons_example> - <scons_output example="sourcecode_bitkeeper"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="sourcecode_bitkeeper" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -97,8 +97,8 @@ </file> </scons_example> - <scons_output example="sourcecode_cvs"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="sourcecode_cvs" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -123,8 +123,8 @@ </file> </scons_example> - <scons_output example="sourcecode_rcs"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="sourcecode_rcs" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -149,8 +149,8 @@ </file> </scons_example> - <scons_output example="sourcecode_sccs"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="sourcecode_sccs" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> @@ -174,8 +174,8 @@ </file> </scons_example> - <scons_output example="sourcecode_subversion"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="sourcecode_subversion" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </section> diff --git a/doc/user/tasks.xml b/doc/user/tasks.xml index ea02025..a1105b1 100644 --- a/doc/user/tasks.xml +++ b/doc/user/tasks.xml @@ -160,8 +160,8 @@ Where main.cpp looks like this: produces this: </para> - <scons_output example="tasks_ex1"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="tasks_ex1" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> </example> diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml index d8bcf6e..55002db 100644 --- a/doc/user/troubleshoot.xml +++ b/doc/user/troubleshoot.xml @@ -119,10 +119,10 @@ </para> - <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 example="troubleshoot_explain1" os="posix" suffix="1"> + <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> <para> @@ -142,8 +142,8 @@ </para> - <scons_output example="troubleshoot_explain1" os="posix"> - <scons_output_command suffix="4">scons -Q --debug=explain</scons_output_command> + <scons_output example="troubleshoot_explain1" os="posix" suffix="2"> + <scons_output_command>scons -Q --debug=explain</scons_output_command> </scons_output> <para> @@ -187,10 +187,10 @@ </file> </scons_example> - <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 example="troubleshoot_explain2" os="posix" suffix="1"> + <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> <para> @@ -230,10 +230,10 @@ </file> </scons_example> - <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 example="troubleshoot_explain3" os="posix" suffix="1"> + <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> <para> @@ -290,8 +290,8 @@ </para> - <scons_output example="troubleshoot_Dump" os="posix" tools="gcc"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="troubleshoot_Dump" os="posix" tools="gcc" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -301,8 +301,8 @@ </para> - <scons_output example="troubleshoot_Dump" os="win32" tools="msvc"> - <scons_output_command suffix="2">scons</scons_output_command> + <scons_output example="troubleshoot_Dump" os="win32" tools="msvc" suffix="2"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -349,8 +349,8 @@ </para> - <scons_output example="troubleshoot_Dump_ENV" os="posix"> - <scons_output_command suffix="1">scons</scons_output_command> + <scons_output example="troubleshoot_Dump_ENV" os="posix" suffix="1"> + <scons_output_command>scons</scons_output_command> </scons_output> <para> @@ -359,8 +359,8 @@ </para> - <scons_output example="troubleshoot_Dump_ENV" os="win32"> - <scons_output_command suffix="2">scons</scons_output_command> + <scons_output example="troubleshoot_Dump_ENV" os="win32" suffix="2"> + <scons_output_command>scons</scons_output_command> </scons_output> </section> @@ -415,8 +415,8 @@ </para> - <scons_output example="troubleshoot_tree1"> - <scons_output_command suffix="1">scons -Q --tree=all</scons_output_command> + <scons_output example="troubleshoot_tree1" suffix="1"> + <scons_output_command>scons -Q --tree=all</scons_output_command> </scons_output> <para> @@ -441,8 +441,8 @@ </para> - <scons_output example="troubleshoot_tree1"> - <scons_output_command suffix="2">scons -Q --tree=all f2.o</scons_output_command> + <scons_output example="troubleshoot_tree1" suffix="2"> + <scons_output_command>scons -Q --tree=all f2.o</scons_output_command> </scons_output> <para> @@ -457,8 +457,8 @@ </para> - <scons_output example="troubleshoot_tree1"> - <scons_output_command suffix="3">scons -Q --tree=all f1.o f3.o</scons_output_command> + <scons_output example="troubleshoot_tree1" suffix="3"> + <scons_output_command>scons -Q --tree=all f1.o f3.o</scons_output_command> </scons_output> <para> @@ -469,8 +469,8 @@ </para> - <scons_output example="troubleshoot_tree1"> - <scons_output_command suffix="4">scons -Q --tree=status</scons_output_command> + <scons_output example="troubleshoot_tree1" suffix="4"> + <scons_output_command>scons -Q --tree=status</scons_output_command> </scons_output> <para> @@ -487,8 +487,8 @@ </para> - <scons_output example="troubleshoot_tree1"> - <scons_output_command suffix="5">scons -Q --tree=derived</scons_output_command> + <scons_output example="troubleshoot_tree1" suffix="5"> + <scons_output_command>scons -Q --tree=derived</scons_output_command> </scons_output> <para> @@ -498,8 +498,8 @@ </para> - <scons_output example="troubleshoot_tree1"> - <scons_output_command suffix="6">scons -Q --tree=derived,status</scons_output_command> + <scons_output example="troubleshoot_tree1" suffix="6"> + <scons_output_command>scons -Q --tree=derived,status</scons_output_command> </scons_output> <para> @@ -557,8 +557,8 @@ </para> - <scons_output example="troubleshoot_tree2"> - <scons_output_command suffix="1">scons -Q --tree=all</scons_output_command> + <scons_output example="troubleshoot_tree2" suffix="1"> + <scons_output_command>scons -Q --tree=all</scons_output_command> </scons_output> <para> @@ -579,8 +579,8 @@ </para> - <scons_output example="troubleshoot_tree2"> - <scons_output_command suffix="2">scons -Q --tree=prune</scons_output_command> + <scons_output example="troubleshoot_tree2" suffix="2"> + <scons_output_command>scons -Q --tree=prune</scons_output_command> </scons_output> <para> @@ -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="troubleshoot_presub"> - <scons_output_command suffix="1">scons -Q - -debug=presub</scons_output_command> + <scons_output example="troubleshoot_presub" suffix="1"> + <scons_output_command>scons -Q - -debug=presub</scons_output_command> </scons_output> --> @@ -681,8 +681,8 @@ </para> - <scons_output example="troubleshoot_findlibs"> - <scons_output_command suffix="1">scons -Q --debug=findlibs</scons_output_command> + <scons_output example="troubleshoot_findlibs" suffix="1"> + <scons_output_command>scons -Q --debug=findlibs</scons_output_command> </scons_output> </section> @@ -717,8 +717,8 @@ </file> </scons_example> - <scons_output example="troubleshoot_includes"> - <scons_output_command suffix="1">scons -Q - - debug=includes prog</scons_output_command> + <scons_output example="troubleshoot_includes" suffix="1"> + <scons_output_command>scons -Q - - debug=includes prog</scons_output_command> </scons_output> </section> @@ -761,8 +761,8 @@ </para> - <scons_output example="troubleshoot_stacktrace"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="troubleshoot_stacktrace" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> <para> @@ -778,8 +778,8 @@ </para> - <scons_output example="troubleshoot_stacktrace"> - <scons_output_command suffix="2">scons -Q --debug=stacktrace</scons_output_command> + <scons_output example="troubleshoot_stacktrace" suffix="2"> + <scons_output_command>scons -Q --debug=stacktrace</scons_output_command> </scons_output> <para> @@ -841,8 +841,8 @@ </file> </scons_example> - <scons_output example="troubleshoot_taskmastertrace" os="posix"> - <scons_output_command suffix="1">scons -Q --taskmastertrace=- prog</scons_output_command> + <scons_output example="troubleshoot_taskmastertrace" os="posix" suffix="1"> + <scons_output_command>scons -Q --taskmastertrace=- prog</scons_output_command> </scons_output> <para> diff --git a/doc/user/variants.xml b/doc/user/variants.xml index 8daff22..1a937e5 100644 --- a/doc/user/variants.xml +++ b/doc/user/variants.xml @@ -141,8 +141,8 @@ is pretty smart about rebuilding things when you change options. </para> - <scons_output example="variants_ex" os="posix"> - <scons_output_command suffix="1">scons -Q OS=linux</scons_output_command> + <scons_output example="variants_ex" os="posix" suffix="1"> + <scons_output_command>scons -Q OS=linux</scons_output_command> </scons_output> <para> @@ -151,8 +151,8 @@ is pretty smart about rebuilding things when you change options. </para> - <scons_output example="variants_ex" os="win32"> - <scons_output_command suffix="2">scons -Q OS=windows</scons_output_command> + <scons_output example="variants_ex" os="win32" suffix="2"> + <scons_output_command>scons -Q OS=windows</scons_output_command> </scons_output> <!-- @@ -165,8 +165,8 @@ is pretty smart about rebuilding things when you change options. </file> </scons_example> - <scons_output example="variants_ex2"> - <scons_output_command suffix="1">scons -Q</scons_output_command> + <scons_output example="variants_ex2" suffix="1"> + <scons_output_command>scons -Q</scons_output_command> </scons_output> --> diff --git a/doc/version.xml b/doc/version.xml index a52506b..f6eba1f 100644 --- a/doc/version.xml +++ b/doc/version.xml @@ -2,6 +2,6 @@ <!-- THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. --> -<!ENTITY builddate "today"> -<!ENTITY buildversion "1.0.0"> -<!ENTITY buildrevision "docdev"> +<!ENTITY builddate "2013-03-23"> +<!ENTITY buildversion "2.3.0"> +<!ENTITY buildrevision "1"> diff --git a/doc/xsd/dbpoolx.xsd b/doc/xsd/dbpoolx.xsd index b5e856f..f0a3f1c 100644 --- a/doc/xsd/dbpoolx.xsd +++ b/doc/xsd/dbpoolx.xsd @@ -2349,6 +2349,7 @@ <xs:attribute name="name" type="xs:string" /> <xs:attribute name="tools" type="xs:string" /> <xs:attribute name="example" type="xs:string" use="required" /> + <xs:attribute name="suffix" type="xs:string" use="required" /> </xs:attributeGroup> <!-- end of scons_output.attlist --> <!-- end of scons_output.module --> @@ -2380,7 +2381,6 @@ <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/xslt/to_docbook.xslt b/doc/xslt/to_docbook.xslt index 25da999..0b39c28 100644 --- a/doc/xslt/to_docbook.xslt +++ b/doc/xslt/to_docbook.xslt @@ -19,6 +19,28 @@ <xsl:copy/> </xsl:template> + <!-- Helper function for replacing strings in strings --> + <xsl:template name="string-replace-all"> + <xsl:param name="text" /> + <xsl:param name="replace" /> + <xsl:param name="by" /> + <xsl:choose> + <xsl:when test="contains($text, $replace)"> + <xsl:value-of select="substring-before($text,$replace)" /> + <xsl:value-of select="$by" /> + <xsl:call-template name="string-replace-all"> + <xsl:with-param name="text" + select="substring-after($text,$replace)" /> + <xsl:with-param name="replace" select="$replace" /> + <xsl:with-param name="by" select="$by" /> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="$text" /> + </xsl:otherwise> + </xsl:choose> + </xsl:template> + <!-- Leaving scons_example empty --> <xsl:template match="scons:scons_example"> <xsl:apply-templates select="node()"/> @@ -31,11 +53,10 @@ </xsl:element> </xsl:template> - <!-- Changing scons_output to screen --> + <!-- Leaving scons_output empty, should already + have been handled by xinclude_examples.xslt --> <xsl:template match="scons:scons_output"> - <xsl:element name="screen"> - <xsl:apply-templates select="node()"/> - </xsl:element> + <xsl:apply-templates select="node()"/> </xsl:template> <!-- Leaving scons_output_command empty, should already @@ -54,7 +75,11 @@ <xsl:template match="scons:file"> <xsl:if test="@printme='1'"> <xsl:element name="programlisting"> - <xsl:apply-templates select="node()"/> + <xsl:call-template name="string-replace-all"> + <xsl:with-param name="text" select="node()" /> + <xsl:with-param name="replace" select="'__ROOT__'" /> + <xsl:with-param name="by" select="''" /> + </xsl:call-template> </xsl:element> </xsl:if> </xsl:template> @@ -62,7 +87,11 @@ <!-- Changing sconstruct to programlisting --> <xsl:template match="scons:sconstruct"> <xsl:element name="programlisting"> - <xsl:apply-templates select="node()"/> + <xsl:call-template name="string-replace-all"> + <xsl:with-param name="text" select="node()" /> + <xsl:with-param name="replace" select="'__ROOT__'" /> + <xsl:with-param name="by" select="''" /> + </xsl:call-template> </xsl:element> </xsl:template> diff --git a/doc/xslt/xinclude_examples.xslt b/doc/xslt/xinclude_examples.xslt index 982391f..50696ac 100644 --- a/doc/xslt/xinclude_examples.xslt +++ b/doc/xslt/xinclude_examples.xslt @@ -19,11 +19,10 @@ <xsl:copy/> </xsl:template> - <!-- Changing scons_output_command to xinclude --> - <xsl:template match="scons:scons_output_command"> + <!-- Changing scons_output to xinclude --> + <xsl:template match="scons:scons_output"> <xsl:element name="xsi:include"> - <xsl:attribute name="href"><xsl:value-of select="concat('../generated/examples/',../@example,'_',@suffix,'.out')"></xsl:value-of></xsl:attribute> - <xsl:attribute name="parse">text</xsl:attribute> + <xsl:attribute name="href"><xsl:value-of select="concat('../generated/examples/',@example,'_',@suffix,'.xml')"></xsl:value-of></xsl:attribute> </xsl:element> </xsl:template> |