Merge tag 'upstream/2.3.1'

Upstream version 2.3.1

1 files changed, 79 insertions, 20 deletions

diff --git a/src/engine/SCons/Tool/f90.xml b/src/engine/SCons/Tool/f90.xml
index d60c17d..c1c895e 100644
--- a/src/engine/SCons/Tool/f90.xml
+++ b/src/engine/SCons/Tool/f90.xml
@@ -1,79 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-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
 
 This file is processed by the bin/SConsDoc.py module.
 See its __doc__ string for a discussion of the format.
 -->
+
+<!DOCTYPE sconsdoc [
+<!ENTITY % scons SYSTEM '../../../../doc/scons.mod'>
+%scons;
+<!ENTITY % builders-mod SYSTEM '../../../../doc/generated/builders.mod'>
+%builders-mod;
+<!ENTITY % functions-mod SYSTEM '../../../../doc/generated/functions.mod'>
+%functions-mod;
+<!ENTITY % tools-mod SYSTEM '../../../../doc/generated/tools.mod'>
+%tools-mod;
+<!ENTITY % variables-mod SYSTEM '../../../../doc/generated/variables.mod'>
+%variables-mod;
+]>
+
+<sconsdoc 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">
+
 <tool name="f90">
 <summary>
+<para>
 Set construction variables for generic POSIX Fortran 90 compilers.
+</para>
 </summary>
 <sets>
-F90
-F90FLAGS
-F90COM
-F90PPCOM
-SHF90
-SHF90FLAGS
-SHF90COM
-SHF90PPCOM
-_F90INCFLAGS
+<item>F90</item>
+<item>F90FLAGS</item>
+<item>F90COM</item>
+<item>F90PPCOM</item>
+<item>SHF90</item>
+<item>SHF90FLAGS</item>
+<item>SHF90COM</item>
+<item>SHF90PPCOM</item>
+<item>_F90INCFLAGS</item>
 </sets>
 <uses>
-F90COMSTR
-F90PPCOMSTR
-SHF90COMSTR
-SHF90PPCOMSTR
+<item>F90COMSTR</item>
+<item>F90PPCOMSTR</item>
+<item>SHF90COMSTR</item>
+<item>SHF90PPCOMSTR</item>
 </uses>
 </tool>
 
 <cvar name="F90">
 <summary>
+<para>
 The Fortran 90 compiler.
 You should normally set the &cv-link-FORTRAN; variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
 You only need to set &cv-link-F90; if you need to use a specific compiler
 or compiler version for Fortran 90 files.
+</para>
 </summary>
 </cvar>
 
 <cvar name="F90COM">
 <summary>
+<para>
 The command line used to compile a Fortran 90 source file to an object file.
 You only need to set &cv-link-F90COM; if you need to use a specific
 command line for Fortran 90 files.
 You should normally set the &cv-link-FORTRANCOM; variable,
 which specifies the default command line
 for all Fortran versions.
+</para>
 </summary>
 </cvar>
 
 <cvar name="F90COMSTR">
 <summary>
+<para>
 The string displayed when a Fortran 90 source file
 is compiled to an object file.
 If this is not set, then &cv-link-F90COM; or &cv-link-FORTRANCOM;
 (the command line) is displayed.
+</para>
 </summary>
 </cvar>
 
 <cvar name="F90FILESUFFIXES">
 <summary>
+<para>
 The list of file extensions for which the F90 dialect will be used. By
 default, this is ['.f90']
+</para>
 </summary>
 </cvar>
 
 <cvar name="F90PPFILESUFFIXES">
 <summary>
+<para>
 The list of file extensions for which the compilation + preprocessor pass for
 F90 dialect will be used. By default, this is empty
+</para>
 </summary>
 </cvar>
 
 <cvar name="F90FLAGS">
 <summary>
+<para>
 General user-specified options that are passed to the Fortran 90 compiler.
 Note that this variable does
 <emphasis>not</emphasis>
@@ -91,11 +123,13 @@ You should normally set the &cv-link-FORTRANFLAGS; variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
+</para>
 </summary>
 </cvar>
 
 <cvar name="_F90INCFLAGS">
 <summary>
+<para>
 An automatically-generated construction variable
 containing the Fortran 90 compiler command-line options
 for specifying directories to be searched for include files.
@@ -103,11 +137,13 @@ The value of &cv-link-_F90INCFLAGS; is created
 by appending &cv-link-INCPREFIX; and &cv-link-INCSUFFIX;
 to the beginning and end
 of each directory in &cv-link-F90PATH;.
+</para>
 </summary>
 </cvar>
 
 <cvar name="F90PATH">
 <summary>
+<para>
 The list of directories that the Fortran 90 compiler will search for include
 directories. The implicit dependency scanner will search these
 directories for include files. Don't explicitly put include directory
@@ -123,20 +159,24 @@ You should normally set the &cv-link-FORTRANPATH; variable,
 which specifies the include path
 for the default Fortran compiler
 for all Fortran versions.
+</para>
 
-<example>
+<example_commands>
 env = Environment(F90PATH='#/include')
-</example>
+</example_commands>
 
+<para>
 The directory look-up can also be forced using the
 &Dir;()
 function:
+</para>
 
-<example>
+<example_commands>
 include = Dir('include')
 env = Environment(F90PATH=include)
-</example>
+</example_commands>
 
+<para>
 The directory list will be added to command lines
 through the automatically-generated
 &cv-link-_F90INCFLAGS;
@@ -150,15 +190,17 @@ of each directory in &cv-link-F90PATH;.
 Any command lines you define that need
 the F90PATH directory list should
 include &cv-link-_F90INCFLAGS;:
+</para>
 
-<example>
+<example_commands>
 env = Environment(F90COM="my_compiler $_F90INCFLAGS -c -o $TARGET $SOURCE")
-</example>
+</example_commands>
 </summary>
 </cvar>
 
 <cvar name="F90PPCOM">
 <summary>
+<para>
 The command line used to compile a Fortran 90 source file to an object file
 after first running the file through the C preprocessor.
 Any options specified in the &cv-link-F90FLAGS; and &cv-link-CPPFLAGS; construction variables
@@ -168,31 +210,37 @@ C-preprocessor command line for Fortran 90 files.
 You should normally set the &cv-link-FORTRANPPCOM; variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
+</para>
 </summary>
 </cvar>
 
 <cvar name="F90PPCOMSTR">
 <summary>
+<para>
 The string displayed when a Fortran 90 source file
 is compiled after first running the file through the C preprocessor.
 If this is not set, then &cv-link-F90PPCOM; or &cv-link-FORTRANPPCOM;
 (the command line) is displayed.
+</para>
 </summary>
 </cvar>
 
 <cvar name="SHF90">
 <summary>
+<para>
 The Fortran 90 compiler used for generating shared-library objects.
 You should normally set the &cv-link-SHFORTRAN; variable,
 which specifies the default Fortran compiler
 for all Fortran versions.
 You only need to set &cv-link-SHF90; if you need to use a specific compiler
 or compiler version for Fortran 90 files.
+</para>
 </summary>
 </cvar>
 
 <cvar name="SHF90COM">
 <summary>
+<para>
 The command line used to compile a Fortran 90 source file
 to a shared-library object file.
 You only need to set &cv-link-SHF90COM; if you need to use a specific
@@ -200,20 +248,24 @@ command line for Fortran 90 files.
 You should normally set the &cv-link-SHFORTRANCOM; variable,
 which specifies the default command line
 for all Fortran versions.
+</para>
 </summary>
 </cvar>
 
 <cvar name="SHF90COMSTR">
 <summary>
+<para>
 The string displayed when a Fortran 90 source file
 is compiled to a shared-library object file.
 If this is not set, then &cv-link-SHF90COM; or &cv-link-SHFORTRANCOM;
 (the command line) is displayed.
+</para>
 </summary>
 </cvar>
 
 <cvar name="SHF90FLAGS">
 <summary>
+<para>
 Options that are passed to the Fortran 90 compiler
 to generated shared-library objects.
 You only need to set &cv-link-SHF90FLAGS; if you need to define specific
@@ -222,11 +274,13 @@ You should normally set the &cv-link-SHFORTRANFLAGS; variable,
 which specifies the user-specified options
 passed to the default Fortran compiler
 for all Fortran versions.
+</para>
 </summary>
 </cvar>
 
 <cvar name="SHF90PPCOM">
 <summary>
+<para>
 The command line used to compile a Fortran 90 source file to a
 shared-library object file
 after first running the file through the C preprocessor.
@@ -237,15 +291,20 @@ C-preprocessor command line for Fortran 90 files.
 You should normally set the &cv-link-SHFORTRANPPCOM; variable,
 which specifies the default C-preprocessor command line
 for all Fortran versions.
+</para>
 </summary>
 </cvar>
 
 <cvar name="SHF90PPCOMSTR">
 <summary>
+<para>
 The string displayed when a Fortran 90 source file
 is compiled to a shared-library object file
 after first running the file through the C preprocessor.
 If this is not set, then &cv-link-SHF90PPCOM; or &cv-link-SHFORTRANPPCOM;
 (the command line) is displayed.
+</para>
 </summary>
 </cvar>
+
+</sconsdoc>
\ No newline at end of file