From c3cc4f04d2abb93c746ab467e07e2ca11dd0e54e Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Thu, 27 Mar 2003 11:47:45 +0000 Subject: Man page fixes. --- doc/man/scons.1 | 16 ++++++++-------- src/CHANGES.txt | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/doc/man/scons.1 b/doc/man/scons.1 index 5da2c94..367cc37 100644 --- a/doc/man/scons.1 +++ b/doc/man/scons.1 @@ -1538,7 +1538,7 @@ Installs one or more files in a destination directory. The file names remain the same. .ES -env.Install(dir = '/usr/local/bin', source = 'foo bar') +env.Install(dir = '/usr/local/bin', source = ['foo', 'bar']) .EE .TP @@ -1552,8 +1552,8 @@ list different numbers of files. .ES env.InstallAs(target = '/usr/local/bin/foo', source = 'foo_debug') -env.InstallAs(target = '../lib/libfoo.a ../lib/libbar.a', - source = 'libFOO.a libBAR.a') +env.InstallAs(target = ['../lib/libfoo.a', '../lib/libbar.a'], + source = ['libFOO.a', 'libBAR.a']) .EE .TP @@ -2720,7 +2720,7 @@ method: env2 = env.Copy(CC="cl.exe") .EE -.SS Costruction Variable Options +.SS Construction Variable Options Often when building software, various options need to be specified at build time that are not known when the SConstruct/SConscript files are @@ -4361,7 +4361,7 @@ or by specifying a dot ("scons ."). .ES env = Environment() -env.Program(target = 'foo', source = 'f1.c f2.c f3.c') +env.Program(target = 'foo', source = Split('f1.c f2.c f3.c')) .EE .SS Setting a Compilation Flag @@ -4579,18 +4579,18 @@ SConstruct: libA/SConscript: Import('env') - env.Library('a', 'a1.c a2.c a3.c') + env.Library('a', Split('a1.c a2.c a3.c')) libB/SConscript: Import('env') - env.Library('b', 'b1.c b2.c b3.c') + env.Library('b', Split('b1.c b2.c b3.c')) Main/SConscript: Import('env') e = env.Copy(LIBS = ['a', ','b']) - e.Program('foo', 'm1.c m2.c m3.c') + e.Program('foo', Split('m1.c m2.c m3.c')) .EE The '#' in the LIBPATH directories specify that they're relative to the diff --git a/src/CHANGES.txt b/src/CHANGES.txt index ddfe712..c73a6b1 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -49,8 +49,9 @@ RELEASE 0.12 - XXX - Add support for Tar and Zip files. - Better documentation of the different ways to export variables to a - subsidiary SConscript file. Fix a documentation bug in a tools - example. + subsidiary SConscript file. Fix documentation bugs in a tools + example, places that still assumed SCons split strings on white + space, and typos. - Support fetching arbitrary files from the TARGETS or SOURCES lists (e.g. ${SOURCES[2]}) when calculating the build signature of a -- cgit v0.12