From 1d89b2116cf0b8504fa0d77e2c19ce56b1b4a17a Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 24 Mar 2011 21:27:51 +0000 Subject: updated docs via bin/scons-doc.py -u --- doc/user/add-method.xml | 1 + doc/user/builders-built-in.xml | 1 + doc/user/command-line.xml | 8 ++++---- doc/user/depends.xml | 1 + doc/user/less-simple.xml | 2 ++ doc/user/libraries.xml | 3 +++ doc/user/main.xml | 1 - doc/user/misc.xml | 2 +- doc/user/nodes.xml | 2 ++ doc/user/parseflags.xml | 1 + doc/user/simple.xml | 4 ++++ doc/user/troubleshoot.xml | 42 ++++++++++++++++++++++-------------------- doc/user/variants.xml | 1 + 13 files changed, 43 insertions(+), 26 deletions(-) diff --git a/doc/user/add-method.xml b/doc/user/add-method.xml index d4a484e..51bc04b 100644 --- a/doc/user/add-method.xml +++ b/doc/user/add-method.xml @@ -113,6 +113,7 @@ rc /fores.res res.rc cl /Fotest_stuff.obj /c test_stuff.c /nologo link /nologo /OUT:tests\test_stuff.exe test_stuff.obj res.res + embedManifestExeCheck(target, source, env) diff --git a/doc/user/builders-built-in.xml b/doc/user/builders-built-in.xml index b5f3808..1356022 100644 --- a/doc/user/builders-built-in.xml +++ b/doc/user/builders-built-in.xml @@ -160,6 +160,7 @@ cl /Fogoodbye.obj /c goodbye.c /nologo cl /Fohello.obj /c hello.c /nologo link /nologo /OUT:hello.exe /LIBPATH:\usr\dir1 /LIBPATH:dir2 foo1.lib foo2.lib hello.obj goodbye.obj + embedManifestExeCheck(target, source, env) diff --git a/doc/user/command-line.xml b/doc/user/command-line.xml index 5ed8ed8..1bb84e2 100644 --- a/doc/user/command-line.xml +++ b/doc/user/command-line.xml @@ -1255,7 +1255,7 @@ % scons -Q COLOR=magenta foo.o - scons: *** Invalid value for option COLOR: magenta + scons: *** Invalid value for option COLOR: magenta. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> @@ -1311,15 +1311,15 @@ % scons -Q COLOR=Red foo.o - scons: *** Invalid value for option COLOR: Red + scons: *** Invalid value for option COLOR: Red. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> % scons -Q COLOR=BLUE foo.o - scons: *** Invalid value for option COLOR: BLUE + scons: *** Invalid value for option COLOR: BLUE. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> % scons -Q COLOR=nAvY foo.o - scons: *** Invalid value for option COLOR: nAvY + scons: *** Invalid value for option COLOR: nAvY. Valid values are: ('red', 'green', 'blue') File "/home/my/project/SConstruct", line 5, in <module> diff --git a/doc/user/depends.xml b/doc/user/depends.xml index 2c728eb..2853975 100644 --- a/doc/user/depends.xml +++ b/doc/user/depends.xml @@ -989,6 +989,7 @@ C:\>scons -Q hello.exe cl /Fohello.obj /c hello.c /nologo /Iinclude /I\home\project\inc link /nologo /OUT:hello.exe hello.obj + embedManifestExeCheck(target, source, env) diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml index 8b781dd..a2b5cf6 100644 --- a/doc/user/less-simple.xml +++ b/doc/user/less-simple.xml @@ -102,6 +102,7 @@ C:\>scons -Q cl /Fohello.obj /c hello.c /nologo link /nologo /OUT:new_hello.exe hello.obj + embedManifestExeCheck(target, source, env) @@ -193,6 +194,7 @@ cl /Fofile2.obj /c file2.c /nologo cl /Foprog.obj /c prog.c /nologo link /nologo /OUT:program.exe prog.obj file1.obj file2.obj + embedManifestExeCheck(target, source, env) diff --git a/doc/user/libraries.xml b/doc/user/libraries.xml index 1fa06af..9347668 100644 --- a/doc/user/libraries.xml +++ b/doc/user/libraries.xml @@ -206,6 +206,7 @@ cl /Fof3.obj /c f3.c /nologo link /nologo /dll /out:foo.dll /implib:foo.lib f1.obj f2.obj f3.obj RegServerFunc(target, source, env) + embedManifestDllCheck(target, source, env) @@ -288,6 +289,7 @@ lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj cl /Foprog.obj /c prog.c /nologo link /nologo /OUT:prog.exe /LIBPATH:. foo.lib bar.lib prog.obj + embedManifestExeCheck(target, source, env) @@ -412,6 +414,7 @@ C:\>scons -Q cl /Foprog.obj /c prog.c /nologo link /nologo /OUT:prog.exe /LIBPATH:\usr\lib /LIBPATH:\usr\local\lib m.lib prog.obj + embedManifestExeCheck(target, source, env) diff --git a/doc/user/main.xml b/doc/user/main.xml index 4b0807d..33d3ad2 100644 --- a/doc/user/main.xml +++ b/doc/user/main.xml @@ -1,4 +1,3 @@ -