Merged in bdbaddog/scons (pull request #230), extending docs for InstallVersionedLib and SharedLibrary

2 files changed, 22 insertions, 6 deletions

diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen
index 259fe79..02dc04b 100644
--- a/doc/generated/builders.gen
+++ b/doc/generated/builders.gen
@@ -486,6 +486,14 @@ and
 source
 arguments list different numbers of files or directories.
 </para>
+
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+env.InstallAs(target = '/usr/local/bin/foo',
+              source = 'foo_debug')
+env.InstallAs(target = ['../lib/libfoo.a', '../lib/libbar.a'],
+              source = ['libFOO.a', 'libBAR.a'])
+</example_commands>
+
 </listitem>
   </varlistentry>
   <varlistentry id="b-InstallVersionedLib">
@@ -500,14 +508,17 @@ arguments list different numbers of files or directories.
 Installs a versioned shared library. The <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link>
 construction variable should be defined in the environment
 to confirm the version number in the library name.
+If <link xmlns="http://www.scons.org/dbxsd/v1.0" linkend="cv-SHLIBVERSION"><envar>$SHLIBVERSION</envar></link> is not defined a warning will be issued
+and the name of the library will be parsed to derive the version. 
 The symlinks appropriate to the architecture will be generated.
 </para>
 
 <example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
-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.InstallVersionedLib(target = '/usr/local/bin/foo',
+              source = 'libxyz.1.5.2.so')
+env.InstallVersionedLib(target = '/usr/local/bin/foo',
+              source = 'libxyz.1.5.2.so',
+              SHLIBVERSION='1.5.2')
 </example_commands>
 </listitem>
   </varlistentry>
@@ -1989,6 +2000,11 @@ and Y are numbers, and Z is a number but can also contain letters to designate
 alpha, beta, or release candidate patch levels.
 </para>
 
+<example_commands xmlns="http://www.scons.org/dbxsd/v1.0">
+env.SharedLibrary(target = 'bar', source = ['bar.c', 'foo.o'], SHLIBVERSION='1.5.2')
+</example_commands>
+
+
 <para xmlns="http://www.scons.org/dbxsd/v1.0">
 This builder may create multiple links to the library. On a POSIX system,
 for the shared library libbar.so.2.3.1, the links created would be
diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 08a942b..c3abb64 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -54,10 +54,10 @@
 
     <corpauthor>Steven Knight and the SCons Development Team</corpauthor>
 
-    <pubdate>2004 - 2014</pubdate>
+    <pubdate>2004 - 2015</pubdate>
 
     <copyright>
-      <year>2004 - 2014</year>
+      <year>2004 - 2015</year>
       <holder>The SCons Foundation</holder>
     </copyright>