nacho 02/04/20 15:51:10
Modified: jk/native2 build.xml
jk build.properties.sample
Log:
* Fixed IIS ant build
* Added Miscrosoft SDK properties for includes and libs
Revision Changes Path
1.22 +19 -14 jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.xml 12 Apr 2002 22:53:56 -0000 1.21
+++ build.xml 20 Apr 2002 22:51:10 -0000 1.22
@@ -76,7 +76,6 @@
<target name="apache20" depends="init" if="apache2.detect">
<property name="apr.include" location="${apache2.home}/include" />
- <echo message="${apr.include}"/>
<mkdir dir="${build.dir}/apache2" />
<so sofile="mod_jk2"
buildDir="${build.dir}/apache2"
@@ -95,7 +94,6 @@
info="Jni worker" />
<def name="HPUX11" if="hpux" />
<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" />
@@ -234,7 +232,8 @@
<def name="HPUX11" if="hpux" />
<def name="WIN32" if="win32" />
- <def name="NDEBUG" if="win32" />
+ <def name="NDEBUG" if="win32.release" />
+ <def name="_DEBUG" if="win32.debug" />
<def name="_WINDOWS" if="win32" />
<def name="_MBCS" if="win32" />
<def name="_USRDLL" if="win32" />
@@ -300,7 +299,6 @@
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" />
@@ -335,28 +333,32 @@
</target>
<target name="iis" depends="init" if="iis.detect">
+ <mkdir dir="${build.dir}/isapi" />
<so sofile="isapi_redirector"
- buildDir="iis"
+ buildDir="${build.dir}/isapi"
optimize="${so.optimize}"
debug="${so.debug}"
profile="${so.profile}">
<src dir=".">
- <include name="iis/jk_isapi_plugin.c" />
+ <include name="server/isapi/*.c" />
<include name="common/*.c" />
+ <exclude name="common/jk_channel_apr_socket.c"/>
+ <exclude name="common/jk_pool_apr.c"/>
<exclude name="jk_nwmain.c"
unless="netware" />
- <include name="common/apr/*.c" unless="HAVE_APR" />
- <include name="jni/*.c" />
+ <exclude name="jk_apr.c"
+ unless="netware" />
+ <include name="common/apr/*.c" unless="HAVE_APR" />
+ <!-- include name="jni/*.c" /-->
</src>
<includes>
<include name="${java.home}/../include" />
<include name="${native.dir}/include" />
<include name="${java.home}/../include/win32" />
- <!-- JFC why not conditional? -->
- <include name="${java.home}/../include/linux" />
<include name="${native.dir}/common" />
- <include name="${build.compiler.base}/include" />
+ <!--include name=""${build.compiler.base}/include"" /-->
+ <include name=""$(mssdk.include)""/>
</includes>
<depends>
<fileset dir="${native.dir}/common" includes="*.h" />
@@ -364,8 +366,9 @@
<!-- Platform-specific tags -->
<def name="WIN32" />
- <def name="NDEBUG" />
<def name="_WINDOWS" />
+ <def name="NDEBUG" if="win32.release" />
+ <def name="_DEBUG" if="win32.debug" />
<def name="_MBCS" />
<def name="_USRDLL" />
<def name="ISAPI_EXPORTS" />
@@ -377,7 +380,8 @@
<export symbol="HttpExtensionProc"/>
<export symbol="TerminateFilter"/>
<export symbol="TerminateExtension"/>
- <linkOpt value="/libpath:${build.compiler.base}/lib" if="win32" />
+ <!--linkOpt value="/libpath:"${build.compiler.base}/lib""
if="win32" /-->
+ <linkOpt value="/libpath:"$(mssdk.lib)"" if="win32" />
</so>
</target>
@@ -434,7 +438,8 @@
info="Use the sprintf function to build strings" />
<def name="WIN32" if="win32" />
- <def name="NDEBUG" if="win32" />
+ <def name="NDEBUG" if="win32.release" />
+ <def name="_DEBUG" if="win32.debug" />
<def name="_WINDOWS" if="win32" />
<def name="_MBCS" if="win32" />
<def name="_USRDLL" if="win32" />
1.11 +17 -3 jakarta-tomcat-connectors/jk/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties.sample 12 Apr 2002 16:01:30 -0000 1.10
+++ build.properties.sample 20 Apr 2002 22:51:10 -0000 1.11
@@ -21,12 +21,20 @@
apache2.home=/opt/apache2
apache13.home=/opt/apache13
iplanet.home=/opt/iplanet6
-
+# iplanet.home=d:/tools/sdk/netscape
+# iis.home=e:/
# APR location - by default the version included in Apache2 is used.
# Don't edit unless you install 'standalone' apr.
-apr.include=${apache2.home}/include
-apr.lib=${apache2.home}/lib
+apr.home=$(apache2.home)
+
+apr.include=${apr.home}/include
+apr-util.include=${apr.home}/include
+
+apr.lib=${apr.home}/lib
+apr-util.lib=${apr.home}/lib
+apache2.lib=$(apache2.home)/lib
+
# Compile-time options for native code
so.debug=true
@@ -50,4 +58,10 @@
# build.compiler.base=c:/Program Files/Microsoft Visual Studio/VC98
# build.compiler.cc=${build.compiler.base}/bin/cl
# build.compiler.ld=${build.compiler.base}/bin/link
+
+# Microsft SDK
+
+# mssdk.home=c:/Program Files/Microsoft SDK
+# mssdk.include=$(mssdk.home)/include
+# mssdk.lib=$(mssdk.home)/lib
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
