Merge tag 'upstream/2.3.1'

Upstream version 2.3.1

1 files changed, 78 insertions, 50 deletions

diff --git a/doc/user/sourcecode.xml b/doc/user/sourcecode.xml
index ae84ec9..a1234fc 100644
--- a/doc/user/sourcecode.xml
+++ b/doc/user/sourcecode.xml
@@ -1,6 +1,27 @@
+<?xml version='1.0'?>
+<!DOCTYPE sconsdoc [
+    <!ENTITY % scons SYSTEM "../scons.mod">
+    %scons;
+    
+    <!ENTITY % builders-mod SYSTEM "../generated/builders.mod">
+    %builders-mod;
+    <!ENTITY % functions-mod SYSTEM "../generated/functions.mod">
+    %functions-mod;
+    <!ENTITY % tools-mod SYSTEM "../generated/tools.mod">
+    %tools-mod;
+    <!ENTITY % variables-mod SYSTEM "../generated/variables.mod">
+    %variables-mod;
+]>
+
+<chapter id="chap-sourcecode"
+         xmlns="http://www.scons.org/dbxsd/v1.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd">
+<title>Fetching Files From Source Code Management Systems</title>
+
 <!--
 
-  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+  Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -42,18 +63,20 @@
 
    </para>
 
-   <programlisting>
-      env = Environment()
-      env.SourceCode('.', env.BitKeeper())
-      env.Program('hello.c')
-   </programlisting>
+   <scons_example name="sourcecode_bitkeeper">
+      <file name="SConstruct" printme="1">
+env = Environment()
+env.SourceCode('.', env.BitKeeper())
+env.Program('hello.c')
+      </file>
+      <file name="s.hello.c">
+s.hello.c
+      </file>
+   </scons_example>
 
-   <screen>
-     % <userinput>scons -Q</userinput>
-     bk get hello.c
-     cc -o hello.o -c hello.c
-     cc -o hello hello.o
-   </screen>
+   <scons_output example="sourcecode_bitkeeper" suffix="1">
+     <scons_output_command>scons -Q</scons_output_command>
+   </scons_output>
 
  </section>
 
@@ -66,18 +89,17 @@
 
    </para>
 
-   <programlisting>
-      env = Environment()
-      env.SourceCode('.', env.CVS('/usr/local/CVS'))
-      env.Program('hello.c')
-   </programlisting>
+   <scons_example name="sourcecode_cvs">
+      <file name="SConstruct" printme="1">
+env = Environment()
+env.SourceCode('.', env.CVS('/usr/local/CVS'))
+env.Program('hello.c')
+      </file>
+   </scons_example>
 
-   <screen>
-     % <userinput>scons -Q</userinput>
-     cvs -d /usr/local/CVS co hello.c
-     cc -o hello.o -c hello.c
-     cc -o hello hello.o
-   </screen>
+   <scons_output example="sourcecode_cvs" suffix="1">
+     <scons_output_command>scons -Q</scons_output_command>
+   </scons_output>
 
  </section>
 
@@ -90,18 +112,20 @@
 
    </para>
 
-   <programlisting>
-      env = Environment()
-      env.SourceCode('.', env.RCS())
-      env.Program('hello.c')
-   </programlisting>
+   <scons_example name="sourcecode_rcs">
+      <file name="SConstruct" printme="1">
+env = Environment()
+env.SourceCode('.', env.RCS())
+env.Program('hello.c')
+      </file>
+      <file name="hello.c,v">
+hello.c,v
+      </file>
+   </scons_example>
 
-   <screen>
-     % <userinput>scons -Q</userinput>
-     co hello.c
-     cc -o hello.o -c hello.c
-     cc -o hello hello.o
-   </screen>
+   <scons_output example="sourcecode_rcs" suffix="1">
+     <scons_output_command>scons -Q</scons_output_command>
+   </scons_output>
 
  </section>
 
@@ -114,18 +138,20 @@
 
    </para>
 
-   <programlisting>
-      env = Environment()
-      env.SourceCode('.', env.SCCS())
-      env.Program('hello.c')
-   </programlisting>
+   <scons_example name="sourcecode_sccs">
+      <file name="SConstruct" printme="1">
+env = Environment()
+env.SourceCode('.', env.SCCS())
+env.Program('hello.c')
+      </file>
+      <file name="s.hello.c">
+s.hello.c
+      </file>
+   </scons_example>
 
-   <screen>
-     % <userinput>scons -Q</userinput>
-     sccs get hello.c
-     cc -o hello.o -c hello.c
-     cc -o hello hello.o
-   </screen>
+   <scons_output example="sourcecode_sccs" suffix="1">
+     <scons_output_command>scons -Q</scons_output_command>
+   </scons_output>
 
  </section>
 
@@ -140,18 +166,20 @@
 
    </para>
 
-   <scons_example name="ex_subversion">
+   <scons_example name="sourcecode_subversion">
       <file name="SConstruct" printme="1">
-      env = Environment()
-      env.SourceCode('.', env.Subversion('XXX'))
-      env.Program('hello.c')
+env = Environment()
+env.SourceCode('.', env.Subversion('XXX'))
+env.Program('hello.c')
       </file>
    </scons_example>
 
-   <scons_output example="ex_subversion">
+   <scons_output example="sourcecode_subversion" suffix="1">
      <scons_output_command>scons -Q</scons_output_command>
    </scons_output>
 
  </section>
 
  -->
+
+</chapter>