Documentation update for MSBuild.

diff --git a/docs/win32-compilation.html b/docs/win32-compilation.html
index 6b19082b70d7cdc728e970ce185d86dd015da72f..0c28d03b4d5d75ce5cf520a8c82c493450c44d75 100644 (file)
--- a/docs/win32-compilation.html
+++ b/docs/win32-compilation.html
@@ -12,7 +12,7 @@
 <p>
 This page describes how to build the PostgreSQL ODBC Driver on Windows. There
 are three methods to build: from command line using nmake makefiles, from
-command line using MSBuild files, and from Visual Studio IDE.
+Powershell using MSBuild files, and from Visual Studio IDE.
 </p>
 
 <p>
@@ -24,24 +24,14 @@ The following 3rd party software are required for the build:
      Download the latest version from <a href="http://www.microsoft.com/downloads/">Microsoft's download page</a>
 </li>
 <li> PostgreSQL Client library (libpq.dll) and headers. Download the latest
-     version from the <a href="http://www.postgresql.org/download/windows/">
-     PostgreSQL downloads page</a>. If you download the graphical installer,
-     it is not necessary to install the server. You can pass
-     "--extract-only yes" option to the installer to just extract the files
-     without setting up the server.
-</li>
-<li> OpenSSL library and header files. Download the latest version from the
-     <a href="https://www.openssl.org/related/binaries.html">OpenSSL website</a>.
+     version from the <a href="http://www.enterprisedb.com/products-services-training/pgbindownload/">
+     PostgreSQL Binaries Download page</a>.
 </li>
 <li> WiX Toolset. Required for building the installer. Download the latest
      version from the <a href="http://wixtoolset.org/">WiX Toolset website</a>
 </ul>
 </p>
 
-<p>
-For the MSBuild method, you will also need PowerShell.
-</p>
-
 <h2>Building with nmake.exe</h2>
 
 Use NMAKE.exe to build the driver for the currently active target:<br><br>
@@ -124,25 +114,28 @@ by creating a file called "windows-local.mak".
 
 <h2>Building with MSBuild</h2>
 
-See winbuild/readme.txt in the source directory for details.
+This is a recommendation method in recent environment where Powershell is included as standard equipment and installed Visual C++ is VC10 or later.
+<br>In fact the binaries of official release are built using this method.
 
-<h2>IDE Method</h2>
+<p>
+Use Powershell.exe or Powershell Prompt to build the driver:<br><br>
 
-<p>A Microsoft Visual Studio project file (and workspace) is included in the source tree.
-</p>
+    <code>C:\psqlodbc\winbuild\&gt; (Powershell) BuildAll.ps1 &lt;options&gt;</code><br><br>
 
-<p><strong>psqlodbc.dsp</strong>
- can be used with Microsoft Visual C++ 6.0.
-</p>
+<p>
+By default, BuildAll.ps1 builds all the dlls at once.<br>
+Note that neither Microsoft Windows SDK Command Prompt nor Visual Studio Command Prompt is needed.<br>
+(See win32_compilation_using_MSBuild.txt for details.)
 
-<p><strong>psqlodbc.proj</strong> and
-<strong>psqlodbc.sln</strong>
-can be used with Microsoft Visual C++ 2005 Edition (including the Express edition which can be downloaded free of charge from <a href="http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/default.aspx">http://msdn.microsoft.com/vstudio/express/visualc/usingpsdk/default.aspx</a>)
-</p>
+<p><iframe src="../winbuild/README.txt" width="60%" height="200%" border="0" frameborder="0" seamless></iframe>
+<p>
+To build the .msi installer file:<br><br>
+
+    <code>C:\psqlodbc\installer\&gt; (Powershell) buildInstallers.ps1 &lt;optios&gt;</code><br><br>
 
 <p>
-     Preparation before the build:
-</p>
+By default, buildInstallers.ps1 builds bootstrapper program psqlodbc-setup.exe together.
+
 <ol>
   <li>The Windows distribution of PostgreSQL will install the required headers and libraries into C:\Program Files\PostgreSQL\9.2
   <li>OpenSSL should be installed into C:\OpenSSL (OpenSSL binaries can be downloaded from <a href="http://www.slproweb.com/products/Win32OpenSSL.html">http://www.slproweb.com/products/Win32OpenSSL.html</a>)