mmanders 01/11/12 15:36:13
Modified: jk/native build.xml
Log:
Updated apache13 target to add win32 dependencies in. Added linkOpt tags in.
Revision Changes Path
1.13 +39 -16 jakarta-tomcat-connectors/jk/native/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 2001/11/11 01:16:20 1.12
+++ build.xml 2001/11/12 23:36:13 1.13
@@ -114,32 +114,36 @@
<include name="${apache13.home}/include" />
<!-- Platform specific includes -->
- <include name="${apache13.home}/os/netware"
- if="netware" />
- <include name="${novellndk.dir}/include/nlm"
- if="netware" />
- <include name="${novellndk.dir}/include"
- if="netware" />
- <include name="${novellndk.dir}/include/winsock"
- if="netware" />
+ <include name="${apache13.home}/os/netware" if="netware" />
+ <include name="${novellndk.dir}/include/nlm" if="netware" />
+ <include name="${novellndk.dir}/include" if="netware" />
+ <include name="${novellndk.dir}/include/winsock" if="netware" />
+
+ <include name="${apache13.home}/os/win32" if="win32" />
+ <include name="${java.home}/../include/win32" if="win32" />
+ <include name="${native.dir}/common" if="win32" />
</includes>
<depends>
<fileset dir="${native.dir}/common" includes="*.h" />
</depends>
<!-- Platform-specific tags -->
- <def name="N_PLAT_NLM"
- if="netware"
+ <def name="N_PLAT_NLM" if="netware"
info="Building for NetWare platform" />
- <def name="NETWARE"
- if="netware"
+ <def name="NETWARE" if="netware"
info="Building for NetWare platform" />
- <def name="XP_NETWARE"
- if="netware"
+ <def name="XP_NETWARE" if="netware"
info="Building for NetWare platform" />
- <def name="USE_SPRINTF"
- if="netware"
+ <def name="USE_SPRINTF" if="netware"
info="Use the sprintf function to build strings" />
+
+ <def name="WIN32" if="win32" />
+ <def name="NDEBUG" if="win32" />
+ <def name="_WINDOWS" if="win32" />
+ <def name="_MBCS" if="win32" />
+ <def name="_USRDLL" if="win32" />
+ <def name="MOD_JK_EXPORTS" if="win32" />
+
<nlmmodule value="apache" if="netware" />
<import fileName="${novellndk.dir}/imports/clib.imp" if="netware" />
<import fileName="${novellndk.dir}/imports/lib0.imp" if="netware" />
@@ -149,6 +153,22 @@
<import fileName="${novellndk.dir}/imports/ws2nlm.imp" if="netware" />
<import fileName="${apache13.home}/os/netware/ApacheCore.imp" if="netware" />
<export symbol="jk_module" if="netware" />
+ <linkOpt value="-desc "Apache 1.3 plugin for Tomcat"" if="netware"
/>
+ <linkOpt value="-screenname "System Console"" if="netware" />
+ <linkOpt value="-nlmversion 1,20,2" if="netware" />
+ <linkOpt value="-threadname "mod_jk Thread"" if="netware" />
+ <linkOpt value="-stacksize 64000" if="netware" />
+
+ <import fileName="ApacheCore.lib" if="win32" />
+ <import fileName="wsock32.lib" if="win32" />
+ <import fileName="kernel32.lib" if="win32" />
+ <import fileName="user32.lib" if="win32" />
+ <import fileName="gdi32.lib" if="win32" />
+ <import fileName="winspool.lib" if="win32" />
+ <import fileName="comdlg32.lib" if="win32" />
+ <linkOpt value="/libpath:"${build.compiler.base}/lib"" if="win32" />
+ <linkOpt value="/libpath:"${apache13.home}/CoreR"" if="win32" />
+ <linkOpt value="/libpath:"${apache13.home}/Release"" if="win32" />
</so>
</target>
@@ -163,6 +183,8 @@
<include name="**/*.nlm"/>
<include name="**/*.map"/>
<include name="**/*.sym"/>
+ <include name="**/*.obj"/>
+ <include name="**/*.dll"/>
</fileset>
</delete>
</target>
@@ -205,6 +227,7 @@
<export symbol="HttpExtensionProc"/>
<export symbol="TerminateFilter"/>
<export symbol="TerminateExtension"/>
+ <linkOpt value="/libpath:${build.compiler.base}/lib" if="win32" />
</so>
</target>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
