User's Guide updates:

Mostly MSVC compilation lines so the /Fo is at the beginning of the
output line.  Also some new/modified variables in the environment dump
in the Troubleshooting appendix, and removing a leftover XXX todo comment.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3547 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/doc/user/add-method.xml b/doc/user/add-method.xml
index e6f2a670a12ddaaa7d89543985be092620c81998..d4a484e9ec4be71189d91f44f1e4e4afac617933 100644 (file)
--- a/doc/user/add-method.xml
+++ b/doc/user/add-method.xml
@@ -111,7 +111,7 @@
   <screen>
     C:\><userinput>scons -Q</userinput>
     rc /fores.res res.rc
-    cl /nologo /c test_stuff.c /Fotest_stuff.obj
+    cl /Fotest_stuff.obj /c test_stuff.c /nologo
     link /nologo /OUT:tests\test_stuff.exe test_stuff.obj res.res
   </screen>
 

diff --git a/doc/user/builders-built-in.xml b/doc/user/builders-built-in.xml
index cf09fd5cc73c1c0716f61f1409fbada5fa29ee1c..738683bce276b3c5ff72f6ef477621e053330d92 100644 (file)
--- a/doc/user/builders-built-in.xml
+++ b/doc/user/builders-built-in.xml
@@ -157,8 +157,8 @@
 
     <screen>
       C:\><userinput>scons -Q</userinput>
-      cl /nologo /c goodbye.c /Fogoodbye.obj
-      cl /nologo /c hello.c /Fohello.obj
+      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
     </screen>
 

diff --git a/doc/user/depends.xml b/doc/user/depends.xml
index 39866e2be49d5f8aa2899cecd36ea5e271338ac8..512ac6895df402984cc45dbe304ad91f57977734 100644 (file)
--- a/doc/user/depends.xml
+++ b/doc/user/depends.xml
@@ -990,7 +990,7 @@
 
     <screen>
        C:\><userinput>scons -Q hello.exe</userinput>
-       cl /nologo /Iinclude /I\home\project\inc /c hello.c /Fohello.obj
+       cl /Fohello.obj /c hello.c /nologo /Iinclude /I\home\project\inc
        link /nologo /OUT:hello.exe hello.obj
     </screen>
 

diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml
index 35b6b608a9048bc5042708c939b82095f3178577..28fc0537b428d4f6f4c5f266a734812ffe18efc1 100644 (file)
--- a/doc/user/less-simple.xml
+++ b/doc/user/less-simple.xml
@@ -100,7 +100,7 @@
 
     <screen>
        C:\><userinput>scons -Q</userinput>
-       cl /nologo /c hello.c /Fohello.obj
+       cl /Fohello.obj /c hello.c /nologo
        link /nologo /OUT:new_hello.exe hello.obj
     </screen>
 
@@ -189,9 +189,9 @@
 
     <screen>
        C:\><userinput>scons -Q</userinput>
-       cl /nologo /c file1.c /Fofile1.obj
-       cl /nologo /c file2.c /Fofile2.obj
-       cl /nologo /c prog.c /Foprog.obj
+       cl /Fofile1.obj /c file1.c /nologo
+       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
     </screen>
 

diff --git a/doc/user/libraries.xml b/doc/user/libraries.xml
index da7d835f7d76e6635e5ed4475460a83be42dd498..1fa06af9c9e4dcf9d91c708e72d1321755e1a8f1 100644 (file)
--- a/doc/user/libraries.xml
+++ b/doc/user/libraries.xml
@@ -73,9 +73,9 @@
 
     <screen>
       C:\><userinput>scons -Q</userinput>
-      cl /nologo /c f1.c /Fof1.obj
-      cl /nologo /c f2.c /Fof2.obj
-      cl /nologo /c f3.c /Fof3.obj
+      cl /Fof1.obj /c f1.c /nologo
+      cl /Fof2.obj /c f2.c /nologo
+      cl /Fof3.obj /c f3.c /nologo
       lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj
     </screen>
 
@@ -201,9 +201,9 @@
 
       <screen>
         C:\><userinput>scons -Q</userinput>
-        cl /nologo /c f1.c /Fof1.obj
-        cl /nologo /c f2.c /Fof2.obj
-        cl /nologo /c f3.c /Fof3.obj
+        cl /Fof1.obj /c f1.c /nologo
+        cl /Fof2.obj /c f2.c /nologo
+        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)
       </screen>
@@ -282,11 +282,11 @@
 
     <screen>
       C:\><userinput>scons -Q</userinput>
-      cl /nologo /c f1.c /Fof1.obj
-      cl /nologo /c f2.c /Fof2.obj
-      cl /nologo /c f3.c /Fof3.obj
+      cl /Fof1.obj /c f1.c /nologo
+      cl /Fof2.obj /c f2.c /nologo
+      cl /Fof3.obj /c f3.c /nologo
       lib /nologo /OUT:foo.lib f1.obj f2.obj f3.obj
-      cl /nologo /c prog.c /Foprog.obj
+      cl /Foprog.obj /c prog.c /nologo
       link /nologo /OUT:prog.exe /LIBPATH:. foo.lib bar.lib prog.obj
     </screen>
 
@@ -410,7 +410,7 @@
 
     <screen>
       C:\><userinput>scons -Q</userinput>
-      cl /nologo /c prog.c /Foprog.obj
+      cl /Foprog.obj /c prog.c /nologo
       link /nologo /OUT:prog.exe /LIBPATH:\usr\lib /LIBPATH:\usr\local\lib m.lib prog.obj
     </screen>
     <!-- The link command is too wide in the PDF version. 

diff --git a/doc/user/main.xml b/doc/user/main.xml
index 181b2a8df631093591a213065bfa0bea4a584ce2..4c2c1b84e57a3ad52b84c11d26b874a7f3e3ce58 100644 (file)
--- a/doc/user/main.xml
+++ b/doc/user/main.xml
@@ -104,7 +104,6 @@
   XXX ParseDepends()
   XXX Platform()
   XXX SConsignFile()
-  XXX SideEffect()
   XXX Tools()
 
   XXX GetOption('duplicate')

diff --git a/doc/user/nodes.xml b/doc/user/nodes.xml
index 4ada5b74c3397491c692411e3a5e108752cb9ff7..28af9736822e7d5ae715cca063b72d2a9de3df71 100644 (file)
--- a/doc/user/nodes.xml
+++ b/doc/user/nodes.xml
@@ -128,8 +128,8 @@
 
     <screen>
        C:\><userinput>scons -Q</userinput>
-       cl -DGOODBYE /c goodbye.c /Fogoodbye.obj
-       cl -DHELLO /c hello.c /Fohello.obj
+       cl /Fogoodbye.obj /c goodbye.c -DGOODBYE
+       cl /Fohello.obj /c hello.c -DHELLO
        link /nologo /OUT:hello.exe hello.obj goodbye.obj
     </screen>
 
@@ -268,7 +268,7 @@
       C:\><userinput>scons -Q</userinput>
       The object file is: hello.obj
       The program file is: hello.exe
-      cl /nologo /c hello.c /Fohello.obj
+      cl /Fohello.obj /c hello.c /nologo
       link /nologo /OUT:hello.exe hello.obj
     </screen>
 

diff --git a/doc/user/parseflags.xml b/doc/user/parseflags.xml
index e52bd780549430be6aaad8ba843eaf6b032a7260..632077e5f141e4febd9621a23291557219b88c44 100644 (file)
--- a/doc/user/parseflags.xml
+++ b/doc/user/parseflags.xml
@@ -91,7 +91,7 @@
     CPPPATH ['/opt/include']
     LIBPATH ['/opt/lib']
     LIBS ['foo']
-    cl /nologo /I\opt\include /c f1.c /Fof1.obj
+    cl /Fof1.obj /c f1.c /nologo /I\opt\include
     link /nologo /OUT:f1.exe /LIBPATH:\opt\lib foo.lib f1.obj
  </screen>
 

diff --git a/doc/user/simple.xml b/doc/user/simple.xml
index 4e4ff0ebf349fcc4c6e8e8632c9e50747c8633dc..82452370154c6d117a2e1ff02ecb834b32084339 100644 (file)
--- a/doc/user/simple.xml
+++ b/doc/user/simple.xml
@@ -108,7 +108,7 @@
       scons: Reading SConscript files ...
       scons: done reading SConscript files.
       scons: Building targets ...
-      cl /nologo /c hello.c /Fohello.obj
+      cl /Fohello.obj /c hello.c /nologo
       link /nologo /OUT:hello.exe hello.obj
       scons: done building targets.
    </screen>
@@ -195,7 +195,7 @@
       scons: Reading SConscript files ...
       scons: done reading SConscript files.
       scons: Building targets ...
-      cl /nologo /c hello.c /Fohello.obj
+      cl /Fohello.obj /c hello.c /nologo
       scons: done building targets.
    </screen>
 
@@ -298,7 +298,7 @@
       scons: Reading SConscript files ...
       scons: done reading SConscript files.
       scons: Building targets ...
-      cl /nologo /c hello.c /Fohello.obj
+      cl /Fohello.obj /c hello.c /nologo
       link /nologo /OUT:hello.exe hello.obj
       scons: done building targets.
       C:\><userinput>scons -c</userinput>
@@ -505,7 +505,7 @@
       scons: Reading SConscript files ...
       scons: done reading SConscript files.
       scons: Building targets ...
-      cl /nologo /c hello.c /Fohello.obj
+      cl /Fohello.obj /c hello.c /nologo
       link /nologo /OUT:hello.exe hello.obj
       scons: done building targets.
    </screen>
@@ -534,7 +534,7 @@
 
    <screen>
       C:\><userinput>scons -Q</userinput>
-      cl /nologo /c hello.c /Fohello.obj
+      cl /Fohello.obj /c hello.c /nologo
       link /nologo /OUT:hello.exe hello.obj
    </screen>
 

diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml
index 2d525b9e24b313e3d5f55a46a4614f664482fd95..75079d90f6cbf4e09f5a15d71efc3e2b74bab6b4 100644 (file)
--- a/doc/user/troubleshoot.xml
+++ b/doc/user/troubleshoot.xml
@@ -341,7 +341,6 @@
       { 'BUILDERS': {'_InternalInstall': <function InstallBuilderWrapper at 0x700000>, 'Object': <SCons.Builder.CompositeBuilder instance at 0x700000>, 'PCH': <SCons.Builder.BuilderBase instance at 0x700000>, 'RES': <SCons.Builder.BuilderBase instance at 0x700000>, 'SharedObject': <SCons.Builder.CompositeBuilder instance at 0x700000>, 'StaticObject': <SCons.Builder.CompositeBuilder instance at 0x700000>, '_InternalInstallAs': <function InstallAsBuilderWrapper at 0x700000>},
         'CC': 'cl',
         'CCCOM': <SCons.Action.FunctionAction instance at 0x700000>,
-        'CCCOMFLAGS': '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS',
         'CCFLAGS': ['/nologo'],
         'CCPCHFLAGS': ['${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}'],
         'CCPDBFLAGS': ['${(PDB and "/Z7") or ""}'],
@@ -371,7 +370,7 @@
                          '.spp',
                          '.SPP'],
         'CXX': '$CC',
-        'CXXCOM': '$CXX $CXXFLAGS $CCCOMFLAGS',
+        'CXXCOM': '$CXX /Fo$TARGET /c $SOURCES $CXXFLAGS $CCFLAGS $_CCCOMCOM',
         'CXXFILESUFFIX': '.cc',
         'CXXFLAGS': ['$CCFLAGS', '$(', '/TP', '$)'],
         'DSUFFIXES': ['.d'],
@@ -407,6 +406,7 @@
         'RC': 'rc',
         'RCCOM': <SCons.Action.FunctionAction instance at 0x700000>,
         'RCFLAGS': [],
+        'RCSUFFIXES': ['.rc', '.rc2'],
         'RDirs': <SCons.Defaults.Variable_Method_Caller instance at 0x700000>,
         'SCANNERS': [],
         'SHCC': '$CC',
@@ -414,7 +414,7 @@
         'SHCCFLAGS': ['$CCFLAGS'],
         'SHCFLAGS': ['$CFLAGS'],
         'SHCXX': '$CXX',
-        'SHCXXCOM': '$SHCXX $SHCXXFLAGS $CCCOMFLAGS',
+        'SHCXXCOM': '$SHCXX /Fo$TARGET /c $SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM',
         'SHCXXFLAGS': ['$CXXFLAGS'],
         'SHELL': None,
         'SHLIBPREFIX': '',
@@ -426,6 +426,7 @@
         'TEMPFILE': <class SCons.Platform.TempFileMunge at 0x700000>,
         'TEMPFILEPREFIX': '@',
         'TOOLS': ['msvc', 'install', 'install'],
+        '_CCCOMCOM': '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS $CCPCHFLAGS $CCPDBFLAGS',
         '_CPPDEFFLAGS': '${_defines(CPPDEFPREFIX, CPPDEFINES, CPPDEFSUFFIX, __env__)}',
         '_CPPINCFLAGS': '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
         '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
@@ -1115,9 +1116,9 @@
       % <userinput>scons -Q --debug=stacktrace</userinput>
       scons: *** Source `prog.c' not found, needed by target `prog.o'.  Stop.
       scons: internal stack trace:
-        File "bootstrap/src/engine/SCons/Job.py", line 198, in start
-        File "bootstrap/src/engine/SCons/Script/Main.py", line 169, in prepare
-        File "bootstrap/src/engine/SCons/Taskmaster.py", line 184, in prepare
+        File "bootstrap/src/engine/SCons/Job.py", line 197, in start
+        File "bootstrap/src/engine/SCons/Script/Main.py", line 167, in prepare
+        File "bootstrap/src/engine/SCons/Taskmaster.py", line 182, in prepare
         File "bootstrap/src/engine/SCons/Executor.py", line 171, in prepare
     </screen>
 

diff --git a/doc/user/variants.xml b/doc/user/variants.xml
index 3b570cdff5b3b5ccd90e593a6ebff053c5de31c9..3ae3e4a8042f5d7537ae2ee64ba502a792e17eab 100644 (file)
--- a/doc/user/variants.xml
+++ b/doc/user/variants.xml
@@ -109,8 +109,8 @@ is pretty smart about rebuilding things when you change options.
   <screen>
     C:\><userinput>scons -Q OS=windows</userinput>
     Install file: "build/windows/world/world.h" as "export/windows/include/world.h"
-    cl /nologo /Iexport\windows\include /c build\windows\hello\hello.c /Fobuild\windows\hello\hello.obj
-    cl /nologo /Iexport\windows\include /c build\windows\world\world.c /Fobuild\windows\world\world.obj
+    cl /Fobuild\windows\hello\hello.obj /c build\windows\hello\hello.c /nologo /Iexport\windows\include
+    cl /Fobuild\windows\world\world.obj /c build\windows\world\world.c /nologo /Iexport\windows\include
     lib /nologo /OUT:build\windows\world\world.lib build\windows\world\world.obj
     Install file: "build/windows/world/world.lib" as "export/windows/lib/world.lib"
     link /nologo /OUT:build\windows\hello\hello.exe /LIBPATH:export\windows\lib world.lib build\windows\hello\hello.obj