diff options
| author | William Deegan <bill@baddogconsulting.com> | 2011-09-10 00:36:56 +0000 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2011-09-10 00:36:56 +0000 |
| commit | 677f53da42ec10922f9585420e6bb223f573c1f8 (patch) | |
| tree | 5d9349f7dbb2b227060cd7f7c606f6f70e1128b6 | |
| parent | 7ae2a22bbb70b098e405fb9541f474e8e85c480b (diff) | |
| download | scons-677f53da42ec10922f9585420e6bb223f573c1f8.tar.gz | |
doc fixes for release. scons-doc.py needs some updating to not remove <xml> and the start entity
(transplanted from 6ecb8fff47dcbd511a8b9956b84ea4d4e4cb9540)
| -rw-r--r-- | doc/user/main.in | 1 | ||||
| -rw-r--r-- | doc/user/main.xml | 6 | ||||
| -rw-r--r-- | doc/user/troubleshoot.xml | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/doc/user/main.in b/doc/user/main.in index 2e3683f1..3195f3b7 100644 --- a/doc/user/main.in +++ b/doc/user/main.in @@ -85,6 +85,7 @@ <!ENTITY sconf SYSTEM "sconf.xml"> <!ENTITY separate SYSTEM "separate.xml"> <!ENTITY simple SYSTEM "simple.xml"> + <!ENTITY start SYSTEM "start.xml"> <!ENTITY sourcecode SYSTEM "sourcecode.xml"> <!ENTITY tasks SYSTEM "tasks.xml"> <!ENTITY tools SYSTEM "tools.xml"> diff --git a/doc/user/main.xml b/doc/user/main.xml index ccc3208c..3195f3b7 100644 --- a/doc/user/main.xml +++ b/doc/user/main.xml @@ -153,9 +153,9 @@ &build-install; </chapter> - <chapter id="chap-start"> - <title>Basic steps and advice</title> - &start; + <chapter id="chap-start"> + <title>Basic steps and advice</title> + &start; </chapter> <chapter id="chap-simple"> diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml index 427d5153..093574c4 100644 --- a/doc/user/troubleshoot.xml +++ b/doc/user/troubleshoot.xml @@ -375,7 +375,7 @@ '.SPP', '.sx'], 'CXX': '$CC', - 'CXXCOM': '$CXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $CXXFLAGS $CCFLAGS $_CCCOMCOM', + 'CXXCOM': '${TEMPFILE("$CXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $CXXFLAGS $CCFLAGS $_CCCOMCOM")}', 'CXXFILESUFFIX': '.cc', 'CXXFLAGS': ['$(', '/TP', '$)'], 'DSUFFIXES': ['.d'], @@ -417,7 +417,7 @@ 'SHCCFLAGS': ['$CCFLAGS'], 'SHCFLAGS': ['$CFLAGS'], 'SHCXX': '$CXX', - 'SHCXXCOM': '$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM', + 'SHCXXCOM': '${TEMPFILE("$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM")}', 'SHCXXFLAGS': ['$CXXFLAGS'], 'SHELL': None, 'SHLIBPREFIX': '', |