Author: rjung
Date: Tue Sep 1 15:38:11 2015
New Revision: 1700600
URL: http://svn.apache.org/r1700600
Log:
Start improving Windows build docs.
Document what currently there is.
mod_jk for Apache 1.3 build might be broken,
never tested it. mod_jk for 2.x and isapi
look OK in all variants.
Easy future improvements:
- support 64 Bit builds using the IDE (dsp files).
Currently they are hard coded to 32 Bit.
- Unify architecture choice mechanism between
isapi and mod_jk build. isapi currently uses
multiple nmake files, mod_jk a variable defined
in the nmake file. See whether we can use a
single file for any architecture but choose the
architecture via an env var.
Modified:
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
tomcat/jk/trunk/xdocs/webserver_howto/iis.xml
Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1700600&r1=1700599&r2=1700600&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Tue Sep 1 15:38:11 2015
@@ -1046,62 +1046,105 @@ However those locks does not work on NFS
</section>
-<section name="Building mod_jk for Apache on Windows NT/2K/XP">
+<section name="Building mod_jk for Apache on Windows">
<p>
-The module was developed using Visual C++ version 6.0, so having this
environment is a prerequisite
-if you want to perform a custom build.
+The module was developed using Microsoft Visual C++, so having Visual Studio
installed
+is a prerequisite if you want to perform your own build.</p>
+<p>
+You can build the source using the IDE GUI, or using a pure
+commandline build based on nmake. The IDE build currently only
+supports building 32 Bit binaries. The nmake builds are available
+for 32 Bit and 64 Bit binaries.
</p>
<p>
-The steps that you need to take are:
+The common steps for all build procedures are:
+<ul>
+<li>
+Set up your build environment for 32 Bits or 64 Bits.
+The IDE build only supports 32 Bits.
+</li>
+<li>
+Download the sources as a zip file and unpack it.
+</li>
+<li>
+Change directory to the ISAPI redirector source directory.
+</li>
+<li>
+Set your path to the Apache web server directory in your
+environment.
+</li>
+</ul>
+<screen>
+<note>Set up 32 or 64 Bit build environment</note>
+<typedos>setenv /Release /X86</typedos>
+<note>or (not available for IDE build)</note>
+<typedos>setenv /Release /X64</typedos>
+<note>Download tomcat-connectors-xxx-src.zip from</note>
+<note>https://tomcat.apache.org/download-connectors.cgi</note>
+<note>and unpack it</note>
+<typedos>unzip tomcat-connectors-xxx-src.zip</typedos>
+<note>Change directory to the mod_jk source directory.</note>
+<note>To build mod_jk for the Apache HTTP server 2.0, 2.2 or 2.4,</note>
+<note>use the "apache-2.0" directory, for the old</note>
+<note>Apache HTTP server 1.3, the "apache-1.3" directory.</note>
+<typedos>cd tomcat-connectors-xxx-src\native\apache-2.0</typedos>
+<note>Set the environment variable "APACHE1_HOME" resp.</note>
+<note>"APACHE2_HOME" resp. "APACHE22_HOME" resp. "APACHE24_HOME"</note>
+<note>to the installation path of your Apache web server.</note>
+<typedos>set APACHE24_HOME=D:\software\Apache\httpd-2.4.16</typedos>
+</screen>
</p>
+<p>
+The steps for an IDE build are then:
<ul>
<li>
-Change directory to the apache-1.3 or apache-2.0 source directory depending on
your version of Apache.
+Start Visual Studio using "start mod_jk.dsp"
</li>
<li>
-If you want to build mod_jk for Apache 1.3, set an <b>APACHE1_HOME</b>
environment variable which points
-to where your Apache 1.3 is installed.
-A mod_jk module for Apache 2.x build will require <b>APACHE2_HOME</b>
environment variable to be set.
+During IDE startup choose "Yes" in all conversion popups.
</li>
<li>
-Copy mod_jk.so to Apache's modules directory.
+Next choose a Configuration form the dropdown. There are pre-defined
+configurations for debug and release builds and in the
+"apache-2.0" directory each of them is available as a configuration
+to build against the web server versions 2.0, 2.2 and 2.4.
+</li>
+<li>
+Finally choose "Build Solution" in the "Build" menue.
</li>
</ul>
+The resulting file mod_jk.so (and the debug symbol file
+mod_jk.pdb) is located in the "Debug" resp. "Release" sub
+directory depending on the build Configuration chosen. For
+the "apache-2.0" module the directories are named "Debug_20",
+"Release_20", "Debug_22", "Release_22", "Debug_24" and "Release_24"
+depending on the chosen build configuration.
+</p>
<p>
-An example on how to build mod_jk for Apache 1.3:
+Alternatively the steps for an nmake commandline build are:
+<ul>
+<li>
+Set your target architecture to X86 or X64 by editing the "ARCH="
+line in the file Makefile.vc.
+</li>
+<li>
+Issue "nmake -f Makefile.vc"
+</li>
+</ul>
+The resulting file mod_jk.so (and the debug symbol file
+mod_jk.pdb) is located in the "Debug" resp. "Release" sub
+directory depending on the build Configuration chosen. For
+the "apache-2.0" module the directories are named "Debug_20",
+"Release_20", "Debug_22", "Release_22", "Debug_24" and "Release_24"
+depending on the chosen build configuration.
</p>
-<screen>
-<note>Set location for Apache 1.3 sources</note>
-<typedos>set APACHE1_HOME=c:\apache13</typedos>
-<note>Change directory to the mod_jk module for Apache 1.3</note>
-<typedos>cd c:\tomcat-connectors-xxx-src\native\apache-1.3</typedos>
-<note>Build the sources using MSDEV</note>
-<typedos>MSDEV mod_jk.dsp /MAKE ALL</typedos>
-<note>Copy the dll to your Apache modules directory</note>
-<typedos>cp release\mod_jk.so c:\apache13\modules\</typedos>
-</screen>
-
<p>
-An example on how to build mod_jk for Apache 2.x:
+Finally you need to copy the file mod_jk.so to the modules directory
+of your Apache HTTP server (resp. the libexec directory for the old Apache
1.3).
</p>
-<screen>
-<note>Set location for Apache 2.x sources</note>
-<typedos>set APACHE2_HOME=c:\apache20</typedos>
-<note>Change directory to the mod_jk module for Apache 2.x</note>
-<typedos>cd c:\tomcat-connectors-xxx-src\native\apache-2.0</typedos>
-<note>Build the sources using MSDEV</note>
-<typedos>MSDEV mod_jk.dsp /MAKE ALL</typedos>
-<note>Copy the dll to your Apache modules directory</note>
-<typedos>cp release\mod_jk.so c:\apache20\modules\</typedos>
-</screen>
-
<p>
-If msdev is not in your path, enter the full path to msdev.exe.
-Also, ApacheCore.lib is expected to exist in the
<b>${APACHEX_HOME}\src\CoreD</b> and
-<b>${APACHEX_HOME}\src\CoreR</b> directories before linking will succeed.
-You will need to build enough of the Apache source to create these libraries.
-This will build both release and debug versions of the redirector plug-in
(mod_jk).
-An alternative will be to open mod_jk.dsp in msdev and build it using the
build menu.
+For Apache HTTP Server 1.3, ApacheCore.lib is expected to exist before
+linking mod_jk will succeed.
</p>
</section>
Modified: tomcat/jk/trunk/xdocs/webserver_howto/iis.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/iis.xml?rev=1700600&r1=1700599&r2=1700600&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/iis.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/iis.xml Tue Sep 1 15:38:11 2015
@@ -451,32 +451,83 @@ and in the <a href="../reference/workers
</section>
-<section name="Building ISAPI redirector">
+<section name="Building the ISAPI redirector">
<p>
-The redirector was developed using Visual C++ Ver.6.0, so having this
environment is a prerequisite if you want
-to perform a custom build. You should also have the IIS developer SDK.
-
-The steps that you need to take are:
+The redirector was developed using Microsoft Visual C++, so having Visual
Studio installed
+is a prerequisite if you want to perform your own build.</p>
+<p>
+You can build the source using the IDE GUI, or using a pure
+commandline build based on nmake. The IDE build currently only
+supports building 32 Bit binaries. The nmake builds are available
+for 32 Bit, 64 Bit and Itanium binaries.
+</p>
+<p>
+The common steps for all build procedures are:
<ul>
<li>
-Change directory to the ISAPI redirector source directory.
+Set up your build environment for 32 Bits or 64 Bits.
+The IDE build only supports 32 Bits.
+</li>
+<li>
+Download the sources as a zip file and unpack it.
</li>
<li>
-Make the source with MSDEV
+Change directory to the ISAPI redirector source directory.
</li>
</ul>
<screen>
+<note>Set up 32 or 64 Bit build environment</note>
+<typedos>setenv /Release /X86</typedos>
+<note>or (not available for IDE build)</note>
+<typedos>setenv /Release /X64</typedos>
+<note>Download tomcat-connectors-xxx-src.zip from</note>
+<note>https://tomcat.apache.org/download-connectors.cgi</note>
+<note>and unpack it</note>
+<typedos>unzip tomcat-connectors-xxx-src.zip</typedos>
<note>Change directory to the ISAPI redirector source directory</note>
-<typedos>cd c:\tomcat-connectors-xxx-src\native\iis</typedos>
-<note>Build the sources using MSDEV</note>
-<typedos>MSDEV isapi.dsp /MAKE ALL</typedos>
+<typedos>cd tomcat-connectors-xxx-src\native\iis</typedos>
</screen>
</p>
<p>
-If msdev is not in your path, enter the full path to msdev.exe.
-This will build both release and debug versions of the ISAPI redirector plugin.
-An alternative will be to open the ISAPI redirector workspace file (isapi.dsw)
in msdev and
-build it using the build menu.
+The steps for an IDE build are then:
+<ul>
+<li>
+Start Visual Studio using "start isapi.dsw"
+</li>
+<li>
+During IDE startup choose "Yes" in all conversion popups.
+</li>
+<li>
+Next choose "Debug" or "Release" in the Configuration dropdown.
+</li>
+<li>
+Finally choose "Build Solution" in the "Build" menue.
+</li>
+</ul>
+The resulting file isapi_redirect.dll (and the debug symbol file
+isapi_redirect.pdb) is located in the "Debug" resp. "Release" sub
+directory depending on the build Configuration chosen. As an
+intermediate step the build first creates a static PCRE library
+named pcre.lib in the sub directory "pcre/LibD" resp. "pcre/LibR".
+</p>
+<p>
+Alternatively the steps for an nmake commandline build are:
+<ul>
+<li>
+Issue "nmake -f Makefile.x86" for a 32 Bit build, or
+</li>
+<li>
+Issue "nmake -f Makefile.amd64" for a 64 Bit build, or
+</li>
+<li>
+Issue "nmake -f Makefile.i64" for a Itanium Bit build
+</li>
+</ul>
+The resulting file isapi_redirect.dll (and the debug symbol file
+isapi_redirect.pdb) is located in the "Release_x86" resp. "Release_amd64"
+resp. "Release_ia64" sub directory. As an intermediate step the build
+first creates a static PCRE library named pcre.lib in the sub directory
+"pcre/Release_x86" resp. "pcre/Release_amd64" resp. "pcre/Release_ia64.
</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
