From 4112d19049e27162c333bac13d908f48a4cc438a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Aug 2015 11:53:14 +0200 Subject: Imported Upstream version 2.3.6 --- doc/generated/examples/caching_ex-random_1.xml | 6 +-- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- doc/generated/variables.gen | 48 +++++++++++----------- doc/generated/variables.mod | 4 +- doc/man/scons-time.xml | 4 +- doc/man/scons.xml | 4 +- doc/man/sconsign.xml | 4 +- doc/user/repositories.xml | 2 +- doc/user/sconf.xml | 6 +-- 9 files changed, 40 insertions(+), 40 deletions(-) (limited to 'doc') diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index b864ef4..6f64f8f 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,9 +1,9 @@ % scons -Q -cc -o f1.o -c f1.c -cc -o f3.o -c f3.c -cc -o f4.o -c f4.c cc -o f2.o -c f2.c +cc -o f4.o -c f4.c +cc -o f3.o -c f3.c cc -o f5.o -c f5.c +cc -o f1.o -c f1.c cc -o prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index 0a5299b..246ee56 100644 --- a/doc/generated/examples/troubleshoot_explain1_3.xml +++ b/doc/generated/examples/troubleshoot_explain1_3.xml @@ -3,5 +3,5 @@ cp file.in file.oout scons: warning: Cannot find target file.out after building -File "/home/garyo/src/scons-scons/src/script/scons.py", line 199, in <module> +File "/home/bdbaddog/scons/as_scons/bootstrap/src/script/scons.py", line 199, in <module> diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 120b4a3..bf18796 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -950,19 +950,19 @@ DFLAGPREFIX. - - DFLAGS + + _DFLAGS -DFLAGS. +_DFLAGS. - - _DFLAGS + + DFLAGS -_DFLAGS. +DFLAGS. @@ -2819,6 +2819,15 @@ is -dNOPAUSE -dBATCH -sDEVICE=pdfwrite HOST_ARCH + + The name of the host hardware architecture used to create the Environment. + If a platform is specified when creating the Environment, then + that Platform's logic will handle setting this value. + This value is immutable, and should not be changed by the user after + the Environment is initialized. + Currently only set for Win32. + + Sets the host architecture for Visual Studio compiler. If not set, default to the detected host architecture: note that this may depend @@ -2835,16 +2844,7 @@ Valid values are the same as for This is currently only used on Windows, but in the future it will be used on other OSes as well. - - - The name of the host hardware architecture used to create the Environment. - If a platform is specified when creating the Environment, then - that Platform's logic will handle setting this value. - This value is immutable, and should not be changed by the user after - the Environment is initialized. - Currently only set for Win32. - - + HOST_OS @@ -6865,6 +6865,13 @@ that may not be set or used in a construction environment. TARGET_ARCH + + The name of the target hardware architecture for the compiled objects + created by this Environment. + This defaults to the value of HOST_ARCH, and the user can override it. + Currently only set for Win32. + + Sets the target architecture for Visual Studio compiler (i.e. the arch of the binaries generated by the compiler). If not set, default to @@ -6890,14 +6897,7 @@ and ia64 (Itanium). For example, if you want to compile 64-bit binaries, you would set TARGET_ARCH='x86_64' in your SCons environment. - - - The name of the target hardware architecture for the compiled objects - created by this Environment. - This defaults to the value of HOST_ARCH, and the user can override it. - Currently only set for Win32. - - + TARGET_OS diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index 3f254a5..fc12a92 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -76,8 +76,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DESCRIPTION_lang"> $DFILESUFFIX"> $DFLAGPREFIX"> -$DFLAGS"> $_DFLAGS"> +$DFLAGS"> $DFLAGSUFFIX"> $_DINCFLAGS"> $DINCPREFIX"> @@ -714,8 +714,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $DESCRIPTION_lang"> $DFILESUFFIX"> $DFLAGPREFIX"> -$DFLAGS"> $_DFLAGS"> +$DFLAGS"> $DFLAGSUFFIX"> $_DINCFLAGS"> $DINCPREFIX"> diff --git a/doc/man/scons-time.xml b/doc/man/scons-time.xml index 312c90a..d4ad11f 100644 --- a/doc/man/scons-time.xml +++ b/doc/man/scons-time.xml @@ -32,8 +32,8 @@ SCONS-TIME 1 -SCons 2.3.5 -SCons 2.3.5 +SCons 2.3.6 +SCons 2.3.6 scons-time diff --git a/doc/man/scons.xml b/doc/man/scons.xml index a60d72e..5cda24b 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -75,8 +75,8 @@ SCONS 1 -SCons 2.3.5 -SCons 2.3.5 +SCons 2.3.6 +SCons 2.3.6 scons diff --git a/doc/man/sconsign.xml b/doc/man/sconsign.xml index c28b684..bd26ddf 100644 --- a/doc/man/sconsign.xml +++ b/doc/man/sconsign.xml @@ -32,8 +32,8 @@ SCONSIGN 1 -SCons 2.3.5 -SCons 2.3.5 +SCons 2.3.6 +SCons 2.3.6 sconsign diff --git a/doc/user/repositories.xml b/doc/user/repositories.xml index d828773..d8820d6 100644 --- a/doc/user/repositories.xml +++ b/doc/user/repositories.xml @@ -423,7 +423,7 @@ int main() { printf("Hello, world!\n"); } Change all occurrences of #include "file.h" - to #include &lt;file.h&gt;. + to #include <file.h>. Use of #include with angle brackets does not have the same behavior--the -I directories are searched first diff --git a/doc/user/sconf.xml b/doc/user/sconf.xml index 365aa22..9096aad 100644 --- a/doc/user/sconf.xml +++ b/doc/user/sconf.xml @@ -275,7 +275,7 @@ env = conf.Finish() env = Environment() conf = Configure(env) -if not conf.CheckType('off_t', '#include &lt;sys/types.h&gt;\n'): +if not conf.CheckType('off_t', '#include <sys/types.h>\n'): print 'Did not find off_t typedef, assuming int' conf.env.Append(CCFLAGS = '-Doff_t=int') env = conf.Finish() @@ -324,7 +324,7 @@ scons: `.' is up to date. mylib_test_source_file = """ -#include &lt;mylib.h&gt; +#include <mylib.h> int main(int argc, char **argv) { MyLibrary mylib(argc, argv); @@ -401,7 +401,7 @@ conf = Configure(env, custom_tests = {'CheckMyLibrary' : CheckMyLibrary}) mylib_test_source_file = """ -#include &lt;mylib.h&gt; +#include <mylib.h> int main(int argc, char **argv) { MyLibrary mylib(argc, argv); -- cgit v1.2.3