You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2005/03/16 07:40:34 UTC

svn commit: r157709 - in apr/site/trunk: docs/compiling_win32.html xdocs/compiling_win32.html xdocs/compiling_win32.xml

Author: jerenkrantz
Date: Tue Mar 15 22:40:34 2005
New Revision: 157709

URL: http://svn.apache.org/viewcvs?view=rev&rev=157709
Log:
Convert the Win32 instructions into XML and clean it all up.

Added:
    apr/site/trunk/xdocs/compiling_win32.xml
      - copied, changed from r157701, apr/site/trunk/xdocs/compiling_win32.html
Removed:
    apr/site/trunk/xdocs/compiling_win32.html
Modified:
    apr/site/trunk/docs/compiling_win32.html

Modified: apr/site/trunk/docs/compiling_win32.html
URL: http://svn.apache.org/viewcvs/apr/site/trunk/docs/compiling_win32.html?view=diff&r1=157708&r2=157709
==============================================================================
--- apr/site/trunk/docs/compiling_win32.html (original)
+++ apr/site/trunk/docs/compiling_win32.html Tue Mar 15 22:40:34 2005
@@ -1,116 +1,183 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+               "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
-<head>
-<title>Compiling APR for Microsoft Windows</title>
-</head>
-
-<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
-<body
- bgcolor="#FFFFFF"
- text="#000000"
- link="#0000FF"
- vlink="#000080"
- alink="#FF0000"
->
-
-<h1 align="center">Compiling APR for Microsoft Windows</h1>
-
-<h3><a name="requirements">Requirements</a></h3>
-
+ <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+       <meta name="author" content="APR Developers" /><meta name="email" content="dev@apr.apache.org" />
+    <title>Compiling APR for Microsoft Windows - The Apache Portable Runtime Project</title>
+ </head>
+ <body bgcolor="#ffffff" text="#000000" link="#525D76">
+<p><a href="/"><img src="./images/apr_logo_wide.png" alt="The Apache Portable Runtime Project" border="0"/></a></p>
+ <table border="0" width="100%" cellspacing="4">
+   <tr>
+    <!-- LEFT SIDE NAVIGATION -->
+    <td valign="top" nowrap="nowrap">
+           <p><b>Get Involved</b></p>
+    <menu compact="compact">
+          <li><a href="anonsvn.txt">SVN</a></li>
+          <li><a href="mailing-lists.html">Mailing Lists</a></li>
+          <li><a href="http://svn.apache.org/snapshots/apr/">Snapshots</a></li>
+          <li><a href="compiling_win32.html">Build on Win32</a></li>
+          <li><a href="compiling_unix.html">Build on Unix</a></li>
+        </menu>
+      <p><b>Download!</b></p>
+    <menu compact="compact">
+          <li><a href="download.cgi">from a mirror</a></li>
+        </menu>
+      <p><b>Docs</b></p>
+    <menu compact="compact">
+          <li><a href="docs/apr/">APR</a></li>
+          <li><a href="docs/apr-util/">APR-util</a></li>
+          <li><a href="docs/apr-iconv/">APR-iconv</a></li>
+        </menu>
+      <p><b>Guidelines</b></p>
+    <menu compact="compact">
+          <li><a href="guidelines.html">Project Guidelines</a></li>
+          <li><a href="patches.html">Contributing</a></li>
+          <li><a href="versioning.html">Version Numbers</a></li>
+        </menu>
+      <p><b>Miscellaneous</b></p>
+    <menu compact="compact">
+          <li><a href="http://www.apache.org/LICENSE.txt">License</a></li>
+          <li><a href="projects.html">Projects using APR</a></li>
+        </menu>
+    </td>
+    <!-- RIGHT SIDE INFORMATION -->
+    <td align="left" valign="top">
+                <table border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+  <font color="#ffffff" face="arial,helvetica,sanserif">
+   <a name="requirements"><strong>Requirements</strong></a>
+  </font>
+ </td></tr>
+ <tr><td>
+  <blockquote>
 <p>Compiling apr, apr-iconv and/or apr-util requires the following environment 
-   to be properly installed;
-
+   to be properly installed:</p>
 <ul>
 
-<li>A <a
-    href="http://msdn.microsoft.com/vstudio/">suitable Microsoft compiler</a>:
+<li>A <a href="http://msdn.microsoft.com/vstudio/">suitable Microsoft compiler</a>:
     such as: Microsoft Visual C++ 5.0 or higher; Microsoft Visual Studio .NET
-    2002 or higher (with Visual C++ .NET compiler).  APR can be built using the
-    <a href="#commandline">command line tools</a>, or from within the
-    <a href="#workspace">graphical IDE</a> (Visual Studio IDE Workbench or
-    Microsoft Development Environment).  We have not yet tried the 'Express'
-    versions of Visual Studio .NET and are unable to provide support.
+    2002 or higher (with Visual C++ .NET compiler).  We have not yet tried
+    the 'Express' versions of Visual Studio .NET 2005 and are unable to
+    provide support for them.
 </li>
 
-<li><strong>Visual C++ 5.0 users only</strong>: The Windows Platform SDK.
+<li>Follow the <a href="#layout">required directory layout</a>.</li>
+
+</ul>
+<p>APR can be built using the <a href="#commandline">command line tools</a>, or
+from within the <a href="#workspace">graphical IDE</a> (Visual Studio IDE
+Workbench or Microsoft Development Environment).</p>
+<table border="1" cellpadding="5"><tr><td>
+<strong>Visual C++ 5.0 users only</strong>: The Windows Platform SDK.
     Visual C++ 5.0 developers need the updated Microsoft Windows Platform SDK
     to enable some APR features.  The Platform SDK files distributed with
     Visual C++ 6.0 and later are sufficient, so those users may skip this
-    requirement.  <strong>Note</strong> that the Windows Platform SDK update
-    is required to enable all supported features with MSVC++ 5.0.  Without a
-    current version, APR will issue warnings under MSVC++ 5.0 or fail to build
-    entirely.  Look for the update on Microsoft's website - we are afraid they
-    change the link too often to cite.
-</li>
-
-<li><strong>Historical APR releases only</strong>: Current versions of APR 
+    requirement.  The Windows Platform SDK update is required to enable all
+    supported features with MSVC++ 5.0.  Without a current version, APR will
+    issue warnings under MSVC++ 5.0 or fail to build entirely.  Look for the
+    update on Microsoft's website - we are afraid they change the link too
+    often to cite.
+
+</td></tr></table>
+<table border="1" cellpadding="5"><tr><td>
+<strong>Historical APR releases only</strong>: Current versions of APR 
     do <strong>not</strong> need awk - however, older versions of APR (prior
     to APR 1.1.1) <strong>require</strong> awk.  You may find a Win32 binary
-    version of awk at: <a href="http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe"
-    >http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe</a>
-    <br /><br />
-    For Visual Studio 5.0/6.0 Graphical builds, it will only find awk.exe from
-    the <u>T</u>ools menu <u>O</u>ptions... Directories settings for the
-    Executable files.  Add the path for awk.exe to this list, as needed.
-    For Visual Studio .NET 2003 and newer, you may need to copy awk to the
-    Common7\Tools\Bin directory (i.e. where RC.exe is) - it no longer has
-    the specific PATH options (as far as we can tell).</li>
-
-</ul>
-
-<h3><a name="layout">Required Directory Layout</a></h3>
+    version of awk at: <a href="http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe">http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe</a> You
+    <strong>must</strong> have awk installed as awk.exe.
 
+</td></tr></table>
+  </blockquote>
+ </td></tr>
+</table>
+           <table border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+  <font color="#ffffff" face="arial,helvetica,sanserif">
+   <a name="layout"><strong>Required Directory Layout</strong></a>
+  </font>
+ </td></tr>
+ <tr><td>
+  <blockquote>
 <p>For a supported build, you must have apr, apr-iconv, and apr-util
    checked-out in parallel directories.  For example:</p>
-
 <ul>
    <li><code>C:\work\apr\</code></li>
    <li><code>C:\work\apr-iconv\</code></li>
    <li><code>C:\work\apr-util\</code></li>
 </ul>
-
-<h3><a name="workspace">Developer Studio Workspace/Microsoft Development Environment IDE Build</a></h3>
-
+<p>For a release, unzipping the release files into this directory layout
+should be sufficient.</p>
+<p>To track development, please read the information on <a href="anonsvn.txt">checking out from Subversion</a>.  We recommend <a href="http://tortoisesvn.tigris.org/">TortoiseSVN</a> on Win32 platforms.</p>
+<p>Currently, the directories <strong>must</strong> be called apr, apr-iconv,
+and apr-util.  No exceptions.</p>
+  </blockquote>
+ </td></tr>
+</table>
+           <table border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+  <font color="#ffffff" face="arial,helvetica,sanserif">
+   <a name="workspace"><strong>Developer Studio Workspace/Microsoft Development Environment IDE Build</strong></a>
+  </font>
+ </td></tr>
+ <tr><td>
+  <blockquote>
 <p>APR can be compiled using Visual C++'s graphical environment.
    To simplify this process, a complete Visual Studio workspace,
    <code>apr-util/aprutil.dsw</code>, is provided.  This workspace exposes the
    entire list of working .dsp projects that are required for the complete APR
    binary release.  It includes dependencies between the projects to assure
    that they are built in the appropriate order.</p>
-
 <p>These workspaces are shipped in the Visual Studio 6.0 format - however,
    you can safely 'upgrade' them to your current Visual Studio release (i.e.
    Visual Studio 2003 .NET).  However, for compatibility and simplicity, we
-   only distribute Visual Studio 6.0 workspaces.  See below for <a
-   href="convert5">converting the workspaces for Visual Studio 5.0</a>.</p>
-
+   only distribute Visual Studio 6.0 workspaces.  See below for <a href="convert5">converting the workspaces for Visual Studio 5.0</a>.</p>
 <p>Open the apr-util/aprutil.dsw workspace, and choose either aprutil or
    libaprutil (for static or dynamic libraries) with the Release or Debug
    build as the Active Project.  aprutil.dsw causes all related projects to 
    be built.</p>
-
+<p>You can then choose 'Build Solution' or 'Build Project' to build the
+   libraries and the dependencies.</p>
 <p>The apr test environment can be compiled using VC++'s Visual Studio
    development environment with the apr/test/aprtest.dsw project.
    This workspace exposes the apr/apr.dsp static library and the 
    apr/test/aprtest.dsp projects that allow the developer to assemble the
    entire test application suite.</p>
+<table border="1" cellpadding="5"><tr><td>
 
-<h3><a name="commandline">Command-Line Build</a></h3>
-
+   <strong>Historical Build Note</strong> (does not apply to releases after
+   1.1.1):
+   If you are doing a Visual Studio 5.0/6.0 Graphical build, it will only find
+   awk.exe from the <u>T</u>ools menu <u>O</u>ptions... Directories settings
+   for the Executable files.  Add the path for awk.exe to this list, as needed.
+   For Visual Studio .NET 2003 and newer, you may need to copy awk to the
+   Common7\Tools\Bin directory (i.e. where RC.exe is) - it no longer has the
+   specific PATH options (as far as we can tell).
+
+</td></tr></table>
+  </blockquote>
+ </td></tr>
+</table>
+           <table border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+  <font color="#ffffff" face="arial,helvetica,sanserif">
+   <a name="commandline"><strong>Command-Line Build</strong></a>
+  </font>
+ </td></tr>
+ <tr><td>
+  <blockquote>
 <p>If you use the command line, you must configure it:</p>
 <pre>
   "C:\Program Files\DevStudio\VC\Bin\vcvars32.bat"
 </pre>
-
-<p>If necessary, you will need to prepare the Platform SDK environment:</p>
+<p>If necessary, you will also need to prepare the Platform SDK environment:</p>
 <pre>
-  "c:\Program Files\Platform SDK\setenv.bat"
+  "C:\Program Files\Platform SDK\setenv.bat"
 </pre>
-
 <p>cd to the apr-util directory.  Now, simply use one of the following
    commands to compile the static or dynamic libraries, respectively, on
    Visual C++ 6.0 or later:</p>
-
 <pre>
   msdev aprutil.dsw /MAKE \
     apriconv - Win32 Release" \
@@ -127,36 +194,58 @@
     xml - Win32 Release" \
     libaprutil - Win32 Release" \
 </pre>
-
 <p>Either command will compile APR. The latter will build the libraries as
    .dll dynamic shared libraries, rather than static libraries.</p>
-
 <p>Replace <code>Release</code> with <code>Debug</code> to include debugging
    information in the resulting files, making it easier to find bugs and
    track down problems.</p>
+<table border="1" cellpadding="5"><tr><td>
+<strong>For Visual Studio C++ 5.0 command line users</strong>:
+   Only the .dsp files are maintained within SVN.  Win32 .mak files
+   are NOT maintained in SVN, due to the tremendous waste of
+   reviewer's time.  Therefore, you cannot rely on the NMAKE commands
+   above to build revised .dsp project files unless you then export
+   all .mak files yourself from the project.
 
-<h3><a name="integrating">Integrating the Library</a></h3>
-
-<h3><a name="components">Library Components</a></h3>
-
+</td></tr></table>
+  </blockquote>
+ </td></tr>
+</table>
+           <table border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+  <font color="#ffffff" face="arial,helvetica,sanserif">
+   <a name="integrating"><strong>Integrating the Library</strong></a>
+  </font>
+ </td></tr>
+ <tr><td>
+  <blockquote>
+<p>We should tell ya'll 'bout this, no?</p>
+  </blockquote>
+ </td></tr>
+</table>
+           <table border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+  <font color="#ffffff" face="arial,helvetica,sanserif">
+   <a name="components"><strong>Library Components</strong></a>
+  </font>
+ </td></tr>
+ <tr><td>
+  <blockquote>
 <p>The apr-util/aprutil.dsw workspace builds the .dsp projects of the 
    Apache server listed with dependent projects preceeding their
    dependencies:</p>
-
 <ol>
-   <li><code>apr-util\aprutil.dsp</code>
-   <li><code>apr-util\libaprutil.dsp</code>
-   <li><code>apr-util\uri\gen_uri_delims.dsp</code>
-   <li><code>apr-util\xml\expat\lib\xml.dsp</code>
-   <li><code>apr-iconv\apriconv.dsp</code>
-   <li><code>apr-iconv\libapriconv.dsp</code>
-   <li><code>apr\apr.dsp</code>
-   <li><code>apr\libapr.dsp</code>
+   <li><code>apr-util\aprutil.dsp</code></li>
+   <li><code>apr-util\libaprutil.dsp</code></li>
+   <li><code>apr-util\uri\gen_uri_delims.dsp</code></li>
+   <li><code>apr-util\xml\expat\lib\xml.dsp</code></li>
+   <li><code>apr-iconv\apriconv.dsp</code></li>
+   <li><code>apr-iconv\libapriconv.dsp</code></li>
+   <li><code>apr\apr.dsp</code></li>
+   <li><code>apr\libapr.dsp</code></li>
 </ol>
-
 <p>The libXXX projects create .dll targets, dynamic shared libraries.
    Their non-libXXX counterparts create static .lib targets.</p>
-
 <p>To compile code for the libraries, the consuming compiliation must
    include the apr/include and apr-util/include directories in their
    include file search paths.  To target the static .lib versions of
@@ -164,18 +253,17 @@
    APR_DECLARE_STATIC and APU_DECLARE_STATIC.  This prevents the apr
    and apr-util symbols from being tagged as __declspec(dllimport),
    eliminating compiliation warnings and speeding up execution.</p>
-
-<p><strong>Warning about building APR from the development tree</strong></p>
-
-<p><strong>For Visual Studio C++ 5.0 command line users</strong>:
-   Only the .dsp files are maintained within SVN.  Win32 .mak files
-   are NOT maintained in SVN, due to the tremendous waste of
-   reviewer's time.  Therefore, you cannot rely on the NMAKE commands
-   above to build revised .dsp project files unless you then export
-   all .mak files yourself from the project.</p>
-
-<h3><a name="convert5">Converting the Project for Visual C++ 5.0</a></h3>
-
+  </blockquote>
+ </td></tr>
+</table>
+           <table border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#525D76">
+  <font color="#ffffff" face="arial,helvetica,sanserif">
+   <a name="convert5"><strong>Converting the Project for Visual C++ 5.0</strong></a>
+  </font>
+ </td></tr>
+ <tr><td>
+  <blockquote>
 <p>The .dsp project files are distributed in Visual C++ 6.0 format.  Visual
    C++ 5.0 (97) will recognize them.  To quickly prepare the .dsp files in 
    the native Visual Studio 5.0 (97) format, you can run this command
@@ -183,12 +271,24 @@
 <pre>
      perl apr\build\cvtdsp.pl -5
 </pre>
-
 <p>You must type this command from the <em>top level</em> directory of the apr
 source tree.  Every VC6 .dsp project file within the current directory and
 below will be listed as it is converted.  If you contribute back a patch that
 revises project files, please convert them back with the the -6 option instead
 of -5, which returns the project files to Visual Studio 6.0 format.</p>
-
-</body>
+  </blockquote>
+ </td></tr>
+</table>
+         </td>
+   </tr>
+   <!-- FOOTER -->
+   <tr><td colspan="2"><hr noshade="noshade" size="1"/></td></tr>
+   <tr><td colspan="2" align="center">
+        <font size="-1">
+         <em>Copyright &#169; 1999-2003, The Apache Software Foundation</em>
+        </font>
+       </td>
+   </tr>
+  </table>
+ </body>
 </html>

Copied: apr/site/trunk/xdocs/compiling_win32.xml (from r157701, apr/site/trunk/xdocs/compiling_win32.html)
URL: http://svn.apache.org/viewcvs/apr/site/trunk/xdocs/compiling_win32.xml?view=diff&rev=157709&p1=apr/site/trunk/xdocs/compiling_win32.html&r1=157701&p2=apr/site/trunk/xdocs/compiling_win32.xml&r2=157709
==============================================================================
--- apr/site/trunk/xdocs/compiling_win32.html (original)
+++ apr/site/trunk/xdocs/compiling_win32.xml Tue Mar 15 22:40:34 2005
@@ -1,64 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<title>Compiling APR for Microsoft Windows</title>
-</head>
-
-<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
-<body
- bgcolor="#FFFFFF"
- text="#000000"
- link="#0000FF"
- vlink="#000080"
- alink="#FF0000"
->
+<?xml version="1.0"?>
+<document>
+  <properties>
+    <author email="dev@apr.apache.org">APR Developers</author>
+    <title>Compiling APR for Microsoft Windows</title>
+  </properties>
+<body>
 
-<h1 align="center">Compiling APR for Microsoft Windows</h1>
-
-<h3><a name="requirements">Requirements</a></h3>
+<section id="requirements">
+<title>Requirements</title>
 
 <p>Compiling apr, apr-iconv and/or apr-util requires the following environment 
-   to be properly installed;
+   to be properly installed:</p>
 
 <ul>
 
 <li>A <a
     href="http://msdn.microsoft.com/vstudio/">suitable Microsoft compiler</a>:
     such as: Microsoft Visual C++ 5.0 or higher; Microsoft Visual Studio .NET
-    2002 or higher (with Visual C++ .NET compiler).  APR can be built using the
-    <a href="#commandline">command line tools</a>, or from within the
-    <a href="#workspace">graphical IDE</a> (Visual Studio IDE Workbench or
-    Microsoft Development Environment).  We have not yet tried the 'Express'
-    versions of Visual Studio .NET and are unable to provide support.
+    2002 or higher (with Visual C++ .NET compiler).  We have not yet tried
+    the 'Express' versions of Visual Studio .NET 2005 and are unable to
+    provide support for them.
 </li>
 
-<li><strong>Visual C++ 5.0 users only</strong>: The Windows Platform SDK.
+<li>Follow the <a href="#layout">required directory layout</a>.</li>
+
+</ul>
+
+<p>APR can be built using the <a href="#commandline">command line tools</a>, or
+from within the <a href="#workspace">graphical IDE</a> (Visual Studio IDE
+Workbench or Microsoft Development Environment).</p>
+
+<note><strong>Visual C++ 5.0 users only</strong>: The Windows Platform SDK.
     Visual C++ 5.0 developers need the updated Microsoft Windows Platform SDK
     to enable some APR features.  The Platform SDK files distributed with
     Visual C++ 6.0 and later are sufficient, so those users may skip this
-    requirement.  <strong>Note</strong> that the Windows Platform SDK update
-    is required to enable all supported features with MSVC++ 5.0.  Without a
-    current version, APR will issue warnings under MSVC++ 5.0 or fail to build
-    entirely.  Look for the update on Microsoft's website - we are afraid they
-    change the link too often to cite.
-</li>
+    requirement.  The Windows Platform SDK update is required to enable all
+    supported features with MSVC++ 5.0.  Without a current version, APR will
+    issue warnings under MSVC++ 5.0 or fail to build entirely.  Look for the
+    update on Microsoft's website - we are afraid they change the link too
+    often to cite.
+</note>
 
-<li><strong>Historical APR releases only</strong>: Current versions of APR 
+<note><strong>Historical APR releases only</strong>: Current versions of APR 
     do <strong>not</strong> need awk - however, older versions of APR (prior
     to APR 1.1.1) <strong>require</strong> awk.  You may find a Win32 binary
     version of awk at: <a href="http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe"
-    >http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe</a>
-    <br /><br />
-    For Visual Studio 5.0/6.0 Graphical builds, it will only find awk.exe from
-    the <u>T</u>ools menu <u>O</u>ptions... Directories settings for the
-    Executable files.  Add the path for awk.exe to this list, as needed.
-    For Visual Studio .NET 2003 and newer, you may need to copy awk to the
-    Common7\Tools\Bin directory (i.e. where RC.exe is) - it no longer has
-    the specific PATH options (as far as we can tell).</li>
+    >http://cm.bell-labs.com/cm/cs/who/bwk/awk95.exe</a> You
+    <strong>must</strong> have awk installed as awk.exe.
+</note>
 
-</ul>
+</section>
 
-<h3><a name="layout">Required Directory Layout</a></h3>
+<section id="layout">
+<title>Required Directory Layout</title>
 
 <p>For a supported build, you must have apr, apr-iconv, and apr-util
    checked-out in parallel directories.  For example:</p>
@@ -69,7 +63,20 @@
    <li><code>C:\work\apr-util\</code></li>
 </ul>
 
-<h3><a name="workspace">Developer Studio Workspace/Microsoft Development Environment IDE Build</a></h3>
+<p>For a release, unzipping the release files into this directory layout
+should be sufficient.</p>
+
+<p>To track development, please read the information on <a
+href="anonsvn.txt">checking out from Subversion</a>.  We recommend <a
+href="http://tortoisesvn.tigris.org/">TortoiseSVN</a> on Win32 platforms.</p>
+
+<p>Currently, the directories <strong>must</strong> be called apr, apr-iconv,
+and apr-util.  No exceptions.</p>
+
+</section>
+
+<section id="workspace">
+<title>Developer Studio Workspace/Microsoft Development Environment IDE Build</title>
 
 <p>APR can be compiled using Visual C++'s graphical environment.
    To simplify this process, a complete Visual Studio workspace,
@@ -89,22 +96,39 @@
    build as the Active Project.  aprutil.dsw causes all related projects to 
    be built.</p>
 
+<p>You can then choose 'Build Solution' or 'Build Project' to build the
+   libraries and the dependencies.</p>
+
 <p>The apr test environment can be compiled using VC++'s Visual Studio
    development environment with the apr/test/aprtest.dsw project.
    This workspace exposes the apr/apr.dsp static library and the 
    apr/test/aprtest.dsp projects that allow the developer to assemble the
    entire test application suite.</p>
 
-<h3><a name="commandline">Command-Line Build</a></h3>
+<note>
+   <strong>Historical Build Note</strong> (does not apply to releases after
+   1.1.1):
+   If you are doing a Visual Studio 5.0/6.0 Graphical build, it will only find
+   awk.exe from the <u>T</u>ools menu <u>O</u>ptions... Directories settings
+   for the Executable files.  Add the path for awk.exe to this list, as needed.
+   For Visual Studio .NET 2003 and newer, you may need to copy awk to the
+   Common7\Tools\Bin directory (i.e. where RC.exe is) - it no longer has the
+   specific PATH options (as far as we can tell).
+</note>
+
+</section>
+
+<section id="commandline">
+<title>Command-Line Build</title>
 
 <p>If you use the command line, you must configure it:</p>
 <pre>
   "C:\Program Files\DevStudio\VC\Bin\vcvars32.bat"
 </pre>
 
-<p>If necessary, you will need to prepare the Platform SDK environment:</p>
+<p>If necessary, you will also need to prepare the Platform SDK environment:</p>
 <pre>
-  "c:\Program Files\Platform SDK\setenv.bat"
+  "C:\Program Files\Platform SDK\setenv.bat"
 </pre>
 
 <p>cd to the apr-util directory.  Now, simply use one of the following
@@ -135,23 +159,38 @@
    information in the resulting files, making it easier to find bugs and
    track down problems.</p>
 
-<h3><a name="integrating">Integrating the Library</a></h3>
+<note><strong>For Visual Studio C++ 5.0 command line users</strong>:
+   Only the .dsp files are maintained within SVN.  Win32 .mak files
+   are NOT maintained in SVN, due to the tremendous waste of
+   reviewer's time.  Therefore, you cannot rely on the NMAKE commands
+   above to build revised .dsp project files unless you then export
+   all .mak files yourself from the project.
+</note>
+
+</section>
+<section id="integrating">
+<title>Integrating the Library</title>
 
-<h3><a name="components">Library Components</a></h3>
+<p>We should tell ya'll 'bout this, no?</p>
+
+</section>
+
+<section id="components">
+<title>Library Components</title>
 
 <p>The apr-util/aprutil.dsw workspace builds the .dsp projects of the 
    Apache server listed with dependent projects preceeding their
    dependencies:</p>
 
 <ol>
-   <li><code>apr-util\aprutil.dsp</code>
-   <li><code>apr-util\libaprutil.dsp</code>
-   <li><code>apr-util\uri\gen_uri_delims.dsp</code>
-   <li><code>apr-util\xml\expat\lib\xml.dsp</code>
-   <li><code>apr-iconv\apriconv.dsp</code>
-   <li><code>apr-iconv\libapriconv.dsp</code>
-   <li><code>apr\apr.dsp</code>
-   <li><code>apr\libapr.dsp</code>
+   <li><code>apr-util\aprutil.dsp</code></li>
+   <li><code>apr-util\libaprutil.dsp</code></li>
+   <li><code>apr-util\uri\gen_uri_delims.dsp</code></li>
+   <li><code>apr-util\xml\expat\lib\xml.dsp</code></li>
+   <li><code>apr-iconv\apriconv.dsp</code></li>
+   <li><code>apr-iconv\libapriconv.dsp</code></li>
+   <li><code>apr\apr.dsp</code></li>
+   <li><code>apr\libapr.dsp</code></li>
 </ol>
 
 <p>The libXXX projects create .dll targets, dynamic shared libraries.
@@ -165,16 +204,11 @@
    and apr-util symbols from being tagged as __declspec(dllimport),
    eliminating compiliation warnings and speeding up execution.</p>
 
-<p><strong>Warning about building APR from the development tree</strong></p>
 
-<p><strong>For Visual Studio C++ 5.0 command line users</strong>:
-   Only the .dsp files are maintained within SVN.  Win32 .mak files
-   are NOT maintained in SVN, due to the tremendous waste of
-   reviewer's time.  Therefore, you cannot rely on the NMAKE commands
-   above to build revised .dsp project files unless you then export
-   all .mak files yourself from the project.</p>
+</section>
 
-<h3><a name="convert5">Converting the Project for Visual C++ 5.0</a></h3>
+<section id="convert5">
+<title>Converting the Project for Visual C++ 5.0</title>
 
 <p>The .dsp project files are distributed in Visual C++ 6.0 format.  Visual
    C++ 5.0 (97) will recognize them.  To quickly prepare the .dsp files in 
@@ -190,5 +224,6 @@
 revises project files, please convert them back with the the -6 option instead
 of -5, which returns the project files to Visual Studio 6.0 format.</p>
 
+</section>
 </body>
-</html>
+</document>