cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
mturk 2003/06/09 22:23:18
Modified:jk/native2 build.xml
Log:
Add the aolserver build.
Revision ChangesPath
1.43 +77 -1 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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- build.xml 2 May 2003 19:52:05 - 1.42
+++ build.xml 10 Jun 2003 05:23:18 - 1.43
@@ -52,7 +52,7 @@
!-- Targets --
- target name=main depends=init,apache20,apache13,jni,iis
+ target name=main depends=init,apache20,apache13,jni,iis,aolserver
/target
target name=all depends=jkant,main
@@ -102,6 +102,8 @@
file=${mssdk.home} /
available property=iplanet.detect
file=${iplanet.home} /
+available property=aolserver.detect
+ file=${aolserver.home} /
condition property=build.jni
or
isset property=iis.detect /
@@ -112,6 +114,7 @@
echo message=Apache13 ${apache13.home} ${apache13.detect} /
echo message=IIS ${iis.home} ${iis.detect} /
echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
+echo message=AOLserver ${aolserver.home} ${aolserver.detect} /
echo message=JNI ${build.jni} /
echo message= /
/target
@@ -329,6 +332,79 @@
linkOpt value=/libpath:quot;${apache2.home}/libquot; if=win32 /
linkOpt value=/libpath:quot;${mssdk.home}/libquot; if=win32 /
linkOpt value=/libpath:quot;${mssdk.home}/../Common/MSDev98/binquot;
if=win32 /
+/so
+ /target
+
+ target name=aolserver description=Build nsjk2 module for AOLserver
depends=init if=aolserver.detect
+property name=apr.include location=${apache2.home}/include /
+mkdir dir=${build.dir}/aolserver${arch.prefix} /
+
+so sofile=nsjk2
+ buildDir=${build.dir}/aolserver${arch.prefix}
+ optimize=${so.optimize}
+ debug=${so.debug}
+ taskDebug=0
+ profile=${so.profile}
+ def name=_REENTRANT /
+ def name=CHUNK_SIZE value=4096
+info=Read/Write buffer size /
+
+ !-- Use MD5 from APU
+ def name=USE_APACHE_MD5
+info=Use the MD5 implementation that is part of apache2 /
+ --
+
+ def name=HAS_APR
+info=Allow APR specific extensions /
+ def name=HAVE_JNI
+info=Jni worker /
+ def name=HPUX11 if=hpux /
+ def name=WIN32 if=win32 /
+ def name=_WINDOWS if=win32 /
+ def name=_MBCS if=win32 /
+ def name=_USRDLL if=win32 /
+ def name=MOD_JK2_EXPORTS if=win32 /
+ src dir=.
+ include name=server/aolserver/*.c /
+ include name=common/*.c /
+ include name=jni/*.c /
+ /src
+ includes
+ include name=${native.dir}/common /
+ include name=${aolserver.home}/include /
+ include name=${aolserver.home} /
+ include name=${apr.include} /
+ include name=${apr-util.include} /
+ include name=${native.dir}/include /
+ include name=${java.home}/../include /
+include name=${java.home}/../include/linux if=linux /
+include name=${java.home}/../include/hp-ux if=hpux /
+include name=${java.home}/../include/win32 if=win32 /
+include name=${java.home}/../include/solaris if=solaris /
+include name=quot;${mssdk.home}/includequot; if=win32/
+ /includes
+ depends
+ fileset dir=${native.dir}/common includes=*.h /
+ fileset dir=${native.dir}/include includes=*.h /
+ /depends
+ resource fileName=../jk_logger_win32_message.res if=win32 /
+ import fileName=libhttpd.lib if=win32 /
+ import fileName=libapr.lib if=win32 /
+ import fileName=libaprutil.lib if=win32 /
+ import fileName=advapi32.lib if=win32 /
+ import fileName=wsock32.lib if=win32 /
+ import fileName=shell32.lib if=win32 /
+ import fileName=kernel32.lib if=win32 /
+
+ linkOpt value=/libpath:quot;${apr.lib}quot; if=win32 /
+ linkOpt value=/libpath:quot;${apr-util.lib}quot; if=win32 /
+ linkOpt value=/libpath:quot;${apache2.home}/libquot; if=win32 /
+ linkOpt value=/libpath:quot;${mssdk.home}/libquot; if=win32 /
+ linkOpt value=/libpath:quot;${mssdk.home}/../Common/MSDev98/binquot;
if=win32 /
+ linkOpt value=-L${apr.lib} /
+ linkOpt value=-lapr-0 /
+ linkOpt value=-laprutil-0 /
+ linkOpt value=-lexpat /
/so
/target
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 2003/03/03 23:12:14
Modified:jk/native2 build.xml
Log:
Few fixes to get it to compile with the default redhat apache.
As is common those days, RedHat decided to make the life easy for developers
by messing out the file locations used by apache - since they know better
how files should be named...
Revision ChangesPath
1.40 +5 -2 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- build.xml 9 Feb 2003 21:29:17 - 1.39
+++ build.xml 4 Mar 2003 07:12:13 - 1.40
@@ -223,6 +223,7 @@
includepath location=${native.dir}/include /
sysincludepath location=${apache2.home}/include /
+sysincludepath location=${apache2.home}/include/httpd /
sysincludepath location=${apr.include} /
sysincludepath location=${apr-util.include} /
@@ -267,7 +268,8 @@
/target
target name=apache20 depends=init if=apache2.detect
-property name=apr.include location=${apache2.home}/include /
+property name=apache2.include value=${apache2.home}/include /
+property name=apr.include location=${apache2.include} /
mkdir dir=${build.dir}/apache2${arch.prefix} /
so sofile=mod_jk2
buildDir=${build.dir}/apache2${arch.prefix}
@@ -297,7 +299,7 @@
/src
includes
include name=${native.dir}/common /
- include name=${apache2.home}/include /
+ include name=${apache2.include} /
include name=${apr.include} /
include name=${apr-util.include} /
include name=${native.dir}/include /
@@ -352,6 +354,7 @@
include name=${java.home}/../include /
include name=${build.compiler.base}/include /
include name=${apr.include} /
+ include name=${apr.include}/httpd /
!-- Platform specific includes --
include name=${novellndk.home}/include/nlm if=netware /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
nacho 2003/02/09 13:29:17
Modified:jk/native2 build.xml
Log:
Only build JNI, if IIS or Apache20 is detected..
Revision ChangesPath
1.39 +8 -7 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 6 Feb 2003 00:33:16 - 1.38
+++ build.xml 9 Feb 2003 21:29:17 - 1.39
@@ -27,11 +27,6 @@
!-- == Build options == --
- !-- Use the jni worker and libs whenever possible --
- property name=use.jni value=true /
- !-- Use apr whenever possible --
- property name=use.apr value=true /
-
property name=so.debug value=true /
property name=so.optimize value=false /
property name=so.profile value=false /
@@ -86,7 +81,6 @@
condition property=netware
available file=novellndk.home /
/condition
-
echo message=Linux:${linux} Win32:${win32} Netware:${netware}
Solaris:${solaris} HPUX:${hpux} /
/target
@@ -105,10 +99,17 @@
file=${mssdk.home} /
available property=iplanet.detect
file=${iplanet.home} /
+condition property=build.jni
+ or
+isset property=iis.detect /
+isset property=apache2.detect /
+ /or
+/condition
echo message=Apache2 ${apache2.home} ${apache2.detect} /
echo message=Apache13 ${apache13.home} ${apache13.detect} /
echo message=IIS ${iis.home} ${iis.detect} /
echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
+echo message=JNI ${build.jni} /
echo message= /
/target
@@ -328,7 +329,7 @@
/so
/target
- target name=jni depends=init if=use.jni
+ target name=jni depends=init if=build.jni
mkdir dir=${build.dir}/jni${arch.prefix} /
!-- can be overriden --
property name=apr.home location=${apache2.home} /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
nacho 2003/02/05 16:33:16
Modified:jk/native2 build.xml
Log:
Honor use.jni, needed to fix gump builds..
Fixed resources location for apache13 win32 builds
Revision ChangesPath
1.38 +2 -2 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.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- build.xml 11 Jun 2002 22:50:24 - 1.37
+++ build.xml 6 Feb 2003 00:33:16 - 1.38
@@ -328,7 +328,7 @@
/so
/target
- target name=jni depends=init
+ target name=jni depends=init if=use.jni
mkdir dir=${build.dir}/jni${arch.prefix} /
!-- can be overriden --
property name=apr.home location=${apache2.home} /
@@ -467,7 +467,7 @@
fileset dir=${native.dir}/common includes=*.h /
/depends
- resource fileName=jk_logger_win32_message.res if=win32/
+ resource fileName=../jk_logger_win32_message.res if=win32/
def name=EAPI info=Building with EAPI support /
def name=_REENTRANT /
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
nacho 2002/06/08 17:13:35
Modified:jk/native2 build.xml
Log:
* Added resource elements
* Ant 1.4 compatible uptodate
* More file tyopes to clean
* Changed uptodate check of mc files from *.h to *.res
Revision ChangesPath
1.36 +21 -5 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.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- build.xml 31 May 2002 19:19:44 - 1.35
+++ build.xml 9 Jun 2002 00:13:35 - 1.36
@@ -126,14 +126,21 @@
property name=build.compiler.ld location=${mssdk.home}/bin/link /
echo message=MSDEV compiler: ${mssdk.home} /
uptodate property=mc.uptodate
- targetfile=common/jk_logger_win32_message.h
- srcfile=common/jk_logger_win32_message.mc/
+ targetfile=${build.dir}/jk_logger_win32_message.res
+ srcfiles dir=common includes=*.mc/
+/uptodate
/target
target name=init.win32.mc unless=mc.uptodate if=win32
exec executable=${mssdk.home}/bin/mc dir=common
arg value=jk_logger_win32_message.mc /
/exec
+exec executable=${mssdk.home}/bin/rc dir=common
+ arg value=-r /
+ arg value=-fo/
+ arg value=${build.dir}/jk_logger_win32_message.res/
+ arg value=jk_logger_win32_message.rc /
+/exec
/target
target name=init.win32 depends=init.win32.properties,init.win32.mc
if=win32 /
@@ -304,6 +311,7 @@
fileset dir=${native.dir}/common includes=*.h /
fileset dir=${native.dir}/include includes=*.h /
/depends
+ resource fileName=../jk_logger_win32_message.res if=win32 /
import fileName=libhttpd.lib if=win32 /
import fileName=libapr.lib if=win32 /
import fileName=libaprutil.lib if=win32 /
@@ -358,7 +366,8 @@
fileset dir=${native.dir}/common includes=*.h /
fileset dir=${native.dir}/include includes=*.h /
/depends
-
+ resource fileName=../jk_logger_win32_message.res if=win32/
+
!-- Platform-specific tags --
linkOpt value=-lcrypt if=linux /
linkOpt value=-L${apr.lib} if=linux /
@@ -458,6 +467,8 @@
fileset dir=${native.dir}/common includes=*.h /
/depends
+ resource fileName=jk_logger_win32_message.res if=win32/
+
def name=EAPI info=Building with EAPI support /
def name=_REENTRANT /
def name=CHUNK_SIZE value=4096 /
@@ -536,7 +547,8 @@
depends
fileset dir=${native.dir}/common includes=*.h /
/depends
-
+ resource fileName=../jk_logger_win32_message.res/
+
!-- Platform-specific tags --
def name=WIN32 /
def name=_WINDOWS /
@@ -548,7 +560,6 @@
def name=HAS_APR /
def name=HAVE_JNI
info=Jni worker /
- def name=MOD_JK2_EXPORTS if=win32 /
import fileName=advapi32.lib /
import fileName=wsock32.lib /
@@ -580,8 +591,13 @@
include name=**/*.map/
include name=**/*.sym/
include name=**/*.NCV/
+ include name=**/*.exp/
+ include name=**/*.pdb/
+ include name=**/*.opt/
+ include name=**/*.def/
include name=**/*.obj/
include name=**/*.dll/
+ include name=**/*.res/
/fileset
/delete
/target
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/05/30 11:00:56
Modified:jk/native2 build.xml
Log:
Link jni with APR for hpux and solaris.
XXX need to create a is.unix flag - if not win or netware ( or other special cases ).
Revision ChangesPath
1.34 +4 -0 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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 29 May 2002 22:18:04 - 1.33
+++ build.xml 30 May 2002 18:00:56 - 1.34
@@ -363,6 +363,10 @@
linkOpt value=-lcrypt if=linux /
linkOpt value=-L${apr.lib} if=linux /
linkOpt value=-lapr if=linux /
+ linkOpt value=-L${apr.lib} if=solaris /
+ linkOpt value=-lapr if=solaris /
+ linkOpt value=-L${apr.lib} if=hpux /
+ linkOpt value=-lapr if=hpux /
altSoFile value=jni_conn if=netware /
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/05/29 13:13:36
Modified:jk/native2 build.xml
Log:
Add the 'mc' compiler ( if windows is detected ).
Better condition for apache1.3 detection.
Revision ChangesPath
1.32 +10 -3 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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml 29 May 2002 17:51:23 - 1.31
+++ build.xml 29 May 2002 20:13:36 - 1.32
@@ -73,7 +73,7 @@
target name=main depends=init,apache20,apache13,jni,iis
/target
- target name=all depends=jkant,init,apache20,apache13,jni
+ target name=all depends=jkant,main
/target
target name=init.taskdef
@@ -85,10 +85,14 @@
target name=guess.env
echo message=build.properties ${os.arch}.${os.name} /
!-- What servers do we have ? --
-available property=apache13.detect
- file=${apache13.home}/bin /
available property=apache2.detect
file=${apache2.home} /
+condition property=apache13.detect
+ or
+available file=${apache13.home}/bin/htpasswd /
+available file=${apache13.home}/bin/htpasswd.exe /
+ /or
+/condition
available property=iis.detect
file=${mssdk.home} /
available property=iplanet.detect
@@ -127,6 +131,9 @@
property name=build.compiler.cc location=${mssdk.home}/bin/cl /
property name=build.compiler.ld location=${mssdk.home}/bin/link /
echo message=MSDEV compiler: ${mssdk.home} /
+exec executable=${mssdk.home}/bin/mc dir=common
+ arg value=jk_logger_win32_message.mc /
+/exec
/target
target name=init.netware if=netware
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/05/29 15:18:04
Modified:jk/native2 build.xml
Log:
Add advapi32.lib to the win32 builds ( for the native logger )
Few modifications in property init - things specific to win/netware/etc
can be specified in the specific section.
( I'll try to get apache.home set to C:\Program Files\Apache Group ...
for win32, the goal is to avoid any user setting if defaults are used
at install time )
Revision ChangesPath
1.33 +50 -46jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 29 May 2002 20:13:36 - 1.32
+++ build.xml 29 May 2002 22:18:04 - 1.33
@@ -14,7 +14,6 @@
property name=arch.prefix value= /
-
!-- == Local paths, overriden in build.properties == --
property name=netscape.home location=${iplanet.home}/plugins /
@@ -22,25 +21,10 @@
!-- That's the default RedHat package --
property name=apache13.home location=/usr /
- property name=apache2.include location=${apache2.home}/include /
- !-- No!!! otherwise apache13 will think we have APR for it...
- property name=apr.include location=${apache2.home}/include /
- --
- property name=apache13.include location=${apache13.home}/include /
-
!-- Uncomment if you want to use APR in apache1.3
property name=APACHE13_APR value=true /
--
- !-- Override it in build.properties if using windows and a
- different location. I think that's the defaul location for msdev --
- property name=mssdk.home
-location=c:/Program Files/Microsoft Visual Studio/VC98/
-
- property name=mw.home location=d:/tools/mw/6.0 /
- property name=novellndk.home location=d:/tools/novell/ndk/nwsdk /
-
-
!-- == Build options == --
!-- Use the jni worker and libs whenever possible --
@@ -82,27 +66,8 @@
/target
- target name=guess.env
+ target name=guess.os
echo message=build.properties ${os.arch}.${os.name} /
-!-- What servers do we have ? --
-available property=apache2.detect
- file=${apache2.home} /
-condition property=apache13.detect
- or
-available file=${apache13.home}/bin/htpasswd /
-available file=${apache13.home}/bin/htpasswd.exe /
- /or
-/condition
-available property=iis.detect
- file=${mssdk.home} /
-available property=iplanet.detect
- file=${iplanet.home} /
-echo message=Apache2 ${apache2.home} ${apache2.detect} /
-echo message=Apache13 ${apache13.home} ${apache13.detect} /
-echo message=IIS ${iis.home} ${iis.detect} /
-echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
-echo message= /
-
!-- What OS ( it'll determine the includes ) --
condition property=linux
equals arg1=${os.name} arg2=Linux/
@@ -123,20 +88,60 @@
/condition
echo message=Linux:${linux} Win32:${win32} Netware:${netware}
Solaris:${solaris} HPUX:${hpux} /
+ /target
+
+ target name=guess.server
+!-- What servers do we have ? --
+available property=apache2.detect
+ file=${apache2.home} /
+condition property=apache13.detect
+ or
+available file=${apache13.home}/bin/htpasswd /
+available file=${apache13.home}/bin/htpasswd.exe /
+ /or
+/condition
+available property=iis.detect
+ file=${mssdk.home} /
+available property=iplanet.detect
+ file=${iplanet.home} /
+echo message=Apache2 ${apache2.home} ${apache2.detect} /
+echo message=Apache13 ${apache13.home} ${apache13.detect} /
+echo message=IIS ${iis.home} ${iis.detect} /
+echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
+echo message= /
/target
- target name=init.win32 if=win32
+ !-- Platform-specific intialization --
+ target name=init.os depends=init.win32,init.netware /
+
+ target name=init.win32.properties if=win32
+!-- Override it in build.properties if using windows and a
+different location. I think that's the defaul location for msdev --
+property name=mssdk.home
+ location=c:/Program Files/Microsoft Visual Studio/VC98/
+
property name=build.compiler.base location=${mssdk.home} /
property name=build.compiler.cc location=${mssdk.home}/bin/cl /
property name=build.compiler.ld location=${mssdk.home}/bin/link /
echo message=MSDEV compiler: ${mssdk.home} /
+uptodate property=mc.uptodate
+ targetfile=common/jk_logger_win32_message.h
+
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/05/23 09:50:35
Modified:jk/native2 build.xml
Log:
Added a target that will build mod_jk using cpptasks from sourceforge.
This is for experimental purpose only - and to facilitate an integration.
At this moment thare are major bugs in cpptasks ( libtool doesn't work,
you have to remove history.xml, etc ), and it won't work with ant1.4
unless the .jar is in ant/lib. It won't work in ant1.5 unless my patch
is accepted.
However it's worth adding it - it's clearly good to have at least a common
dtd and semantics for compiling the c code, and cpptasks has some usefull
features.
Don't use the target unless you know what you're doing :-)
Revision ChangesPath
1.29 +121 -3jakarta-tomcat-connectors/jk/native2/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build.xml 22 May 2002 23:40:02 - 1.28
+++ build.xml 23 May 2002 16:50:35 - 1.29
@@ -56,9 +56,11 @@
property name=native.dir location=${jk.src}/native2 /
property name=build.dir location=${jk.build}/jk2 /
+ property name=cpptask.jar location=${jk.src}/../lib/cpptasks.jar /
path id=jkant
pathelement location=${jk.build}/lib/jkant.jar/
+pathelement location=${cpptask.jar}/
/path
!-- Targets --
@@ -69,12 +71,14 @@
target name=all depends=jkant,init,apache20,apache13,jni
/target
- target name=guess.env
+ target name=init.taskdef
taskdef resource=META-INF/ant.tasks
classpathref=jkant /
-echo message=build.properties ${os.arch}.${os.name} /
+ /target
+ target name=guess.env
+echo message=build.properties ${os.arch}.${os.name} /
!-- What servers do we have ? --
available property=apache13.detect
file=${apache13.home}/bin/htpasswd /
@@ -110,6 +114,7 @@
/condition
echo message=Linux:${linux} Win32:${win32} Netware:${netware}
Solaris:${solaris} HPUX:${hpux} /
+
/target
target name=init.win32 if=win32
@@ -128,7 +133,7 @@
echo message=NDK: ${novellndk.home} /
/target
- target name=init depends=guess.env,init.win32,init.netware
+ target name=init depends=init.taskdef,guess.env,init.win32,init.netware
mkdir dir=${build.dir} /
/target
@@ -136,6 +141,119 @@
ant dir=${jk.src} target=jkant/
/target
+ target name=apache20-cpptask depends=init if=apache2.detect
+property name=ant.reuse.loader value=true /
+
+taskdef resource=cpptasks.tasks classpathref=jkant /
+typedef resource=cpptasks.types classpathref=jkant /
+
+property name=apr.include location=${apache2.home}/include /
+mkdir dir=${build.dir}/apache2 /
+
+defineset id=jk2-defs
+ define name=_REENTRANT /
+ define name=CHUNK_SIZE value=4096 /
+ define name=USE_APACHE_MD5 /
+ define name=HAS_APR /
+ define name=HAVE_JNI /
+
+ define name=HPUX11 if=hpux /
+ define name=WIN32 if=win32 /
+ define name=_WINDOWS if=win32 /
+ define name=_MBCS if=win32 /
+ define name=_USRDLL if=win32 /
+ define name=MOD_JK2_EXPORTS if=win32 /
+/defineset
+
+cc outtype=shared
+subsystem=console
+runtime=dynamic
+objdir=${build.dir}/apache2
+outfile=${build.dir}/apache2/mod_jk2.so
+
+compiler name=msvc if=use.msvc
+/compiler
+
+compiler name=gcc
+ warnings=diagnostic
+ debug=true /
+
+!-- Do we need this ?
+linker name=gcc
+debug=true
+/linker
+--
+
+fileset dir=.
+ include name=server/apache2/*.c /
+ include name=common/*.c /
+ include name=jni/*.c /
+/fileset
+
+includepath location=${native.dir}/common /
+includepath location=${native.dir}/include /
+
+sysincludepath location=${apache2.include} /
+ sysincludepath location=${apr.include} /
+ sysincludepath location=${apr-util.include} /
+
+ sysincludepath location=${java.home}/../include /
+sysincludepath location=${java.home}/../include/linux if=linux /
+sysincludepath location=${java.home}/../include/hp-ux if=hpux /
+sysincludepath location=${java.home}/../include/win32 if=win32 /
+sysincludepath location=${java.home}/../include/solaris if=solaris /
+sysincludepath location=quot;${mssdk.home}/includequot; if=win32/
+
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/05/22 16:40:02
Modified:jk/native2 build.xml
Log:
Added IIS to the build targets ( if detected ). We'll look for MSVC, as the
required headers are included - you don't need IIS to compile the DLL ( and
I think it'll work with the personal web server as well, probably any ISAPI
server with a bit more work ).
Added detection for solaris and hpux.
Few more tweaks.
As soon as I have some time I'll integrate the ant types that are used
in the cc-tasks ( that would be a good first step into merging, if we
use the same DTD that's already a big step forward ). This will allow
us to specify the includes, flags, etc only once.
I got it to compile on a Windows, I still have few problems with solaris
and HPUX. More targets are wellcomed - also someone should test on netware.
After we merge the syntax with cc-tasks ( on sourceforge/ant-contrib ) we
might be able to support all the compilers they support and more
environments.
Revision ChangesPath
1.28 +47 -113 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 22 May 2002 21:26:22 - 1.27
+++ build.xml 22 May 2002 23:40:02 - 1.28
@@ -63,58 +63,60 @@
!-- Targets --
- target name=main depends=init,apache20,apache13,jni
+ target name=main depends=init,apache20,apache13,jni,iis
/target
target name=all depends=jkant,init,apache20,apache13,jni
/target
target name=guess.env
-echo message=build.properties ${os.arch}.${os.name} /
taskdef resource=META-INF/ant.tasks
classpathref=jkant /
-available property=HAS_APR file=${apr.include}/apr.h /
+echo message=build.properties ${os.arch}.${os.name} /
+
+!-- What servers do we have ? --
available property=apache13.detect
file=${apache13.home}/bin/htpasswd /
available property=apache2.detect
file=${apache2.home} /
available property=iis.detect
- file=${iis.home} /
+ file=${mssdk.home} /
available property=iplanet.detect
file=${iplanet.home} /
+echo message=Apache2 ${apache2.home} ${apache2.detect} /
+echo message=Apache13 ${apache13.home} ${apache13.detect} /
+echo message=IIS ${iis.home} ${iis.detect} /
+echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
+echo message= /
+!-- What OS ( it'll determine the includes ) --
condition property=linux
equals arg1=${os.name} arg2=Linux/
/condition
+condition property=solaris
+ equals arg1=${os.name} arg2=SunOS/
+/condition
condition property=win32
os family=windows/
/condition
condition property=hpux
- equals arg1=${os.name} arg2=???/
+ equals arg1=${os.name} arg2=HP-UX/
/condition
-condition property=solaris
- equals arg1=${os.name} arg2=???/
-/condition
-
!-- I believe they are using cross-compilation, so checking the os.name
doesn't help. We'll check if the NDK is installed instead --
condition property=netware
available file=novellndk.home /
/condition
-echo message=Apache2 ${apache2.home} ${apache2.detect} /
-echo message=Apache13 ${apache13.home} ${apache13.detect} /
-echo message=IIS ${iis.home} ${iis.detect} /
-echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
-echo message= /
-echo message=Linux:${linux} Win32:${win32} Netware:${netware} /
+echo message=Linux:${linux} Win32:${win32} Netware:${netware}
Solaris:${solaris} HPUX:${hpux} /
/target
target name=init.win32 if=win32
property name=build.compiler.base location=${mssdk.home} /
property name=build.compiler.cc location=${mssdk.home}/bin/cl /
property name=build.compiler.ld location=${mssdk.home}/bin/link /
+echo message=MSDEV compiler: ${mssdk.home} /
/target
target name=init.netware if=netware
@@ -122,6 +124,8 @@
property name=build.compiler.cc
location=${build.compiler.base}/bin/mwccnlm /
property name=build.compiler.ld
location=${build.compiler.base}/bin/mwldnlm /
property name=novelllibc.dir location=${novellndk.home}/libc /
+echo message=MWCC compiler: ${mw.home} /
+echo message=NDK: ${novellndk.home} /
/target
target name=init depends=guess.env,init.win32,init.netware
@@ -171,6 +175,7 @@
include name=${java.home}/../include/linux if=linux /
include name=${java.home}/../include/hp-ux if=hpux /
include
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/05/16 15:39:35
Modified:jk/native2 build.xml
Log:
Add the HAVE_MMAP setting for apache 1.3.
Use HAS_APR consistently ( I don't know why we don't use HAVE_APR )
Revision ChangesPath
1.26 +2 -2 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- build.xml 7 May 2002 19:41:40 - 1.25
+++ build.xml 16 May 2002 22:39:34 - 1.26
@@ -59,7 +59,7 @@
echo message=build.properties.${os.arch}.${os.name} /
taskdef resource=META-INF/ant.tasks
classpathref=jkant /
-available property=HAVE_APR file=${apr.include}/apr.h /
+available property=HAS_APR file=${apr.include}/apr.h /
available property=apache13.detect
file=${apache13.home}/bin/htpasswd /
available property=apache2.detect
@@ -314,6 +314,7 @@
def name=USE_SPRINTF if=netware
info=Use the sprintf function to build strings /
+ def name=HAVE_MMAP unless=win32 /
def name=WIN32 if=win32 /
def name=_WINDOWS if=win32 /
def name=_MBCS if=win32 /
@@ -366,7 +367,6 @@
include name=jni/*.c /
exclude name=jk_apr.c
unless=netware /
-include name=common/apr/*.c unless=HAVE_APR /
/src
includes
include name=${java.home}/../include /
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/04/25 12:23:40
Modified:jk/native2 build.xml
Log:
Update build.xml for jni.
Don't build other targets - all will build jkant and jni. That will
prevent gump errors.
Revision ChangesPath
1.24 +11 -1 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- build.xml 24 Apr 2002 23:11:11 - 1.23
+++ build.xml 25 Apr 2002 19:23:40 - 1.24
@@ -52,6 +52,9 @@
target name=main depends=init,apache20,apache13,jni
/target
+ target name=all depends=jkant,init,apache20,apache13,jni
+ /target
+
target name=init
echo message=build.properties.${os.arch}.${os.name} /
taskdef resource=META-INF/ant.tasks
@@ -70,7 +73,9 @@
echo message=Apache13 ${apache13.home} ${apache13.detect} /
echo message=IIS ${iis.home} ${iis.detect} /
echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
+ /target
+ target name=jkant
ant dir=${jk.src} target=jkant/
/target
@@ -217,6 +222,9 @@
info=Building for NetWare platform /
def name=XP_NETWARE if=netware
info=Building for NetWare platform /
+ def name=HAS_APR
+info=JNI is no based on APR /
+ def name=HAVE_JNI /
import fileName=${novellndk.dir}/imports/clib.imp if=netware /
import fileName=${novellndk.dir}/imports/lib0.imp if=netware /
@@ -347,16 +355,18 @@
exclude name=common/jk_pool_apr.c/
exclude name=jk_nwmain.c
unless=netware /
+ 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 /
include name=${native.dir}/common /
+include name=${native.dir}/server/isapi /
+include name=${build.compiler.base}/include /
!--include name=quot;${build.compiler.base}/includequot; /--
include name=quot;$(mssdk.include)quot;/
/includes
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
nacho 02/04/24 16:11:11
Modified:jk/native2 build.xml
Log:
* Less libs needed to build mod_jk2
* Changed the name to isapi_redirector2
Revision ChangesPath
1.23 +3 -3 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 20 Apr 2002 22:51:10 - 1.22
+++ build.xml 24 Apr 2002 23:11:11 - 1.23
@@ -123,12 +123,12 @@
import fileName=libhttpd.lib if=win32 /
import fileName=libapr.lib if=win32 /
import fileName=libaprutil.lib if=win32 /
- import fileName=wsock32.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 /
+ import fileName=comdlg32.lib if=win32 /--
linkOpt value=/libpath:quot;${build.compiler.base}/libquot; if=win32 /
linkOpt value=/libpath:quot;${apr.lib}quot; if=win32 /
linkOpt value=/libpath:quot;${apr-util.lib}quot; if=win32 /
@@ -334,7 +334,7 @@
target name=iis depends=init if=iis.detect
mkdir dir=${build.dir}/isapi /
-so sofile=isapi_redirector
+so sofile=isapi_redirector2
buildDir=${build.dir}/isapi
optimize=${so.optimize}
debug=${so.debug}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/04/10 16:41:22
Modified:jk/native2 build.xml
Log:
Added a call to build ( or check for) jkant. It's easier than remembering
( or documenting ) that you need to build jkant before native.
Revision ChangesPath
1.19 +2 -0 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 9 Apr 2002 21:46:42 - 1.18
+++ build.xml 10 Apr 2002 23:41:22 - 1.19
@@ -70,6 +70,8 @@
echo message=Apache13 ${apache13.home} ${apache13.detect} /
echo message=IIS ${iis.home} ${iis.detect} /
echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
+
+ant dir=${jk.src} target=jkant/
/target
target name=apache20 depends=init if=apache2.detect
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/04/10 22:20:49
Modified:jk/native2 build.xml
Log:
A bigger change in the way we build native2.
So far we had a jni_connect ( I changed the name to libjkjni since it conflicts with
jk1 )
It contained a subset of jk and the native methods ( the minimum amount required to
get
jni working ). I changed this to include the whole thing - that will allow java to
access all the features of jk, including the future scoreboard and all channels/etc.
( and more APR features will be used/exposed directly or in jk objects at a higher
level)
A second change is in the mod_jk2.so - it didn't include any jni method. That's
a source of big problems since the jni worker will try to load jni_connect and is
likely to run into conflicts.
The JNI methods do not have _any_ dependency on java - just plain C methods taking
some pointer parameters. The JNI header and the pointers to functions are doing
all the magic. So if we include support for the JNI worker ( i.e. we have jni.h )
we can also include the jni methods in the same .so
Revision ChangesPath
1.20 +6 -8 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 10 Apr 2002 23:41:22 - 1.19
+++ build.xml 11 Apr 2002 05:20:48 - 1.20
@@ -97,6 +97,7 @@
include name=server/apache2/*.c /
include name=common/*.c /
include name=common/apr/*.c /
+ include name=jni/*.c /
/src
includes
include name=${native.dir}/common /
@@ -155,20 +156,15 @@
target name=jni depends=init
mkdir dir=${build.dir}/jni /
-so sofile=jni_connect
+so sofile=libjkjni
buildDir=${build.dir}/jni
optimize=${so.optimize}
debug=${so.debug}
profile=${so.profile}
src dir=${native.dir}
include name=jni/*.c /
- include name=common/jk_map.c /
- include name=common/jk_util.c /
- include name=common/jk_pool.c /
- include name=common/jk_logger.c /
-include name=common/jk_nwmain.c if=netware /
-include name=apr/*.c if=HAVE_APR /
-exclude name=jni/jk_jni_aprImpl.c unless=HAVE_APR /
+ include name=common/*.c /
+exclude name=common/jk_nwmain.c unless=netware /
/src
includes
include name=${native.dir}/common /
@@ -329,6 +325,7 @@
exclude name=jk_nwmain.c
unless=netware /
include name=common/apr/*.c unless=HAVE_APR /
+ include name=jni/*.c /
/src
includes
include name=${java.home}/../include /
@@ -378,6 +375,7 @@
exclude name=jk_nwmain.c
unless=netware /
include name=common/apr/*.c unless=HAVE_APR /
+ include name=jni/*.c /
/src
includes
include name=${native.dir}/common /
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
jfclere 02/04/09 13:57:19
Modified:jk/native2 build.xml
Log:
Add unless HAVE_APR to compile it without APR.
Revision ChangesPath
1.17 +2 -0 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 28 Feb 2002 23:36:18 - 1.16
+++ build.xml 9 Apr 2002 20:57:19 - 1.17
@@ -123,6 +123,7 @@
include name=common/jk_logger.c /
include name=common/jk_nwmain.c if=netware /
include name=apr/*.c if=HAVE_APR /
+exclude name=jni/jk_jni_aprImpl.c unless=HAVE_APR /
/src
includes
include name=${native.dir}/common /
@@ -195,6 +196,7 @@
unless=netware /
include name=common/apr/*.c if=HAVE_APR /
exclude name=common/jk_channel_apr_socket.c /
+exclude name=common/jk_pool_apr.c unless=HAVE_APR /
/src
includes
include name=${native.dir}/include /
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/04/09 14:46:42
Modified:jk/native2 build.xml
Log:
Remove WEB-INF.
Added a flag to build APR-based jk with apache13
It should work, but the build file is broken, it includes
apr by using the apache2 include dir - if detected. That creates
problem since httpd.h is there too.
We need a standalone-APR to use with apache13 ( and IIS, etc - as we add
them ).
Revision ChangesPath
1.18 +50 -8 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 9 Apr 2002 20:57:19 - 1.17
+++ build.xml 9 Apr 2002 21:46:42 - 1.18
@@ -23,8 +23,12 @@
--
property name=apache13.include location=${apache13.home}/include /
- !-- == Build options == --
+ !-- Uncomment if you want to use APR in apache1.3
+ property name=APACHE13_APR value=true /
+--
+ !-- == Build options == --
+
property name=so.debug value=true /
property name=so.optimize value=false /
property name=so.profile value=false /
@@ -37,10 +41,10 @@
property name=native.dir location=${jk.src}/native2 /
- property name=build.dir location=${jk.build}/WEB-INF/jk2 /
+ property name=build.dir location=${jk.build}/jk2 /
path id=jkant
-pathelement location=${jk.build}/WEB-INF/lib/jkant.jar/
+pathelement location=${jk.build}/lib/jkant.jar/
/path
!-- Targets --
@@ -108,6 +112,45 @@
/so
/target
+ target name=nt_service depends=init if=win
+mkdir dir=${build.dir}/nt_service /
+so execFile=nt_service
+ buildDir=${build.dir}/apache2
+ optimize=${so.optimize}
+ debug=${so.debug}
+ taskDebug=0
+ profile=${so.profile}
+ def name=_REENTRANT /
+ def name=CHUNK_SIZE value=4096
+info=Read/Write buffer size /
+ def name=USE_APACHE_MD5
+info=Use the MD5 implementation that is part of apache2 /
+ def name=HAS_APR
+info=Allow APR specific extensions /
+ def name=HAVE_JNI
+info=Jni worker /
+ def name=HPUX11 if=hpux /
+ src dir=.
+ include name=server/apache2/*.c /
+ include name=common/*.c /
+ include name=common/apr/*.c /
+ /src
+ includes
+ include name=${native.dir}/common /
+ include name=${apache2.include} /
+ include name=${apr.include} /
+ include name=${native.dir}/include /
+ include name=${java.home}/../include /
+include name=${java.home}/../include/linux if=linux /
+include name=${java.home}/../include/hp-ux if=hpux /
+ /includes
+ depends
+ fileset dir=${native.dir}/common includes=*.h /
+ fileset dir=${native.dir}/include includes=*.h /
+ /depends
+/so
+ /target
+
target name=jni depends=init
mkdir dir=${build.dir}/jni /
so sofile=jni_connect
@@ -182,9 +225,9 @@
target name=apache13 depends=init if=apache13.detect
-mkdir dir=${jk.build}/WEB-INF/jk2/apache13 /
+mkdir dir=${jk.build}/jk2/apache13 /
so sofile=mod_jk2
- buildDir=${jk.build}/WEB-INF/jk2/apache13
+ buildDir=${jk.build}/jk2/apache13
optimize=${so.optimize}
debug=${so.debug}
profile=${so.profile}
@@ -194,9 +237,8 @@
include name=common/*.c /
exclude name=jk_nwmain.c
unless=netware /
-include name=common/apr/*.c if=HAVE_APR /
-exclude name=common/jk_channel_apr_socket.c /
-exclude name=common/jk_pool_apr.c unless=HAVE_APR /
+exclude name=common/jk_pool_apr.c unless=APACHE13_APR /
+exclude name=common/jk_channel_apr_socket.c unless=APACHE13_APR /
/src
includes
include name=${native.dir}/include /
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/02/28 15:36:18
Modified:jk/native2 build.xml
Log:
Add EAPI in the default build.xml, build all files in apache13 ( i.e. service +
mod_jk )
Revision ChangesPath
1.16 +4 -2 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 23 Feb 2002 19:02:19 - 1.15
+++ build.xml 28 Feb 2002 23:36:18 - 1.16
@@ -189,12 +189,12 @@
profile=${so.profile}
src dir=.
- include name=server/apache13/mod_jk2.c /
+ include name=server/apache13/*.c /
include name=common/*.c /
exclude name=jk_nwmain.c
unless=netware /
include name=common/apr/*.c if=HAVE_APR /
-exclude name=common/apr_socket.c /
+exclude name=common/jk_channel_apr_socket.c /
/src
includes
include name=${native.dir}/include /
@@ -222,6 +222,8 @@
depends
fileset dir=${native.dir}/common includes=*.h /
/depends
+
+ def name=EAPI info=Building with EAPI support /
!-- Platform-specific tags --
def name=N_PLAT_NLM if=netware
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/02/23 11:02:19
Modified:jk/native2 build.xml
Log:
Adding apache13 to the mix, better detection, support for RedHat-style package
( apache13 is bundled with redhat, so easier to get things running with
minimal effort for users )
Revision ChangesPath
1.15 +14 -5 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 22 Feb 2002 10:06:05 - 1.14
+++ build.xml 23 Feb 2002 19:02:19 - 1.15
@@ -14,6 +14,7 @@
property name=netscape.home location=${iplanet.home}/plugins /
property name=apache2.home location=/opt/apache2 /
+ !-- That's the default RedHat package --
property name=apache13.home location=/usr /
property name=apache2.include location=${apache2.home}/include /
@@ -44,16 +45,16 @@
!-- Targets --
- target name=main depends=init,apache20,jni
+ target name=main depends=init,apache20,apache13,jni
/target
target name=init
- echo message=build.properties.${os.arch}.${os.name} /
+echo message=build.properties.${os.arch}.${os.name} /
taskdef resource=META-INF/ant.tasks
classpathref=jkant /
available property=HAVE_APR file=${apr.include}/apr.h /
available property=apache13.detect
- file=${apache13.home} /
+ file=${apache13.home}/bin/htpasswd /
available property=apache2.detect
file=${apache2.home} /
available property=iis.detect
@@ -61,6 +62,10 @@
available property=iplanet.detect
file=${iplanet.home} /
mkdir dir=${build.dir} /
+echo message=Apache2 ${apache2.home} ${apache2.detect} /
+echo message=Apache13 ${apache13.home} ${apache13.detect} /
+echo message=IIS ${iis.home} ${iis.detect} /
+echo message=Iplanet ${iplanet.home} ${iplanet.detect} /
/target
target name=apache20 depends=init if=apache2.detect
@@ -177,7 +182,7 @@
target name=apache13 depends=init if=apache13.detect
mkdir dir=${jk.build}/WEB-INF/jk2/apache13 /
-so sofile=mod_jk
+so sofile=mod_jk2
buildDir=${jk.build}/WEB-INF/jk2/apache13
optimize=${so.optimize}
debug=${so.debug}
@@ -189,11 +194,15 @@
exclude name=jk_nwmain.c
unless=netware /
include name=common/apr/*.c if=HAVE_APR /
+exclude name=common/apr_socket.c /
/src
includes
+ include name=${native.dir}/include /
include name=${native.dir}/common /
include name=${build.compiler.base}/include /
include name=${apache13.include} /
+!-- Redhat package --
+ include name=${apache13.home}/include/apache /
include name=${native.dir}/include /
include name=${java.home}/../include /
@@ -207,7 +216,7 @@
include name=${apache13.home}/os/win32 if=win32 /
include name=${java.home}/../include/win32 if=win32 /
include name=${native.dir}/common if=win32 /
-
+include name=${java.home}/../include/hp-ux if=hpux /
include name=${java.home}/../include/linux if=linux /
/includes
depends
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
hgomez 02/02/22 02:06:05
Modified:jk/native2 build.xml
Log:
Update build.xml to use mod_jk2.c and rename mod_jk.so to mod_jk2.so
Revision ChangesPath
1.14 +2 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 17 Jan 2002 21:19:35 - 1.13
+++ build.xml 22 Feb 2002 10:06:05 - 1.14
@@ -66,7 +66,7 @@
target name=apache20 depends=init if=apache2.detect
property name=apr.include location=${apache2.home}/include /
mkdir dir=${build.dir}/apache2 /
-so sofile=mod_jk
+so sofile=mod_jk2
buildDir=${build.dir}/apache2
optimize=${so.optimize}
debug=${so.debug}
@@ -184,7 +184,7 @@
profile=${so.profile}
src dir=.
- include name=server/apache13/mod_jk.c /
+ include name=server/apache13/mod_jk2.c /
include name=common/*.c /
exclude name=jk_nwmain.c
unless=netware /
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 02/01/17 13:19:35
Modified:jk/native2 build.xml
Log:
Read a platform-specific build file first. This is usefull if you use the
same dir to build on 2 platforms ( which in turn is very usefull if you want
to check that some changes on one platform are not braking the other ).
( I finally got vmware to run vc, so I'll start playing with ant's cc task
on win )
Revision ChangesPath
1.13 +2 -0 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 14 Jan 2002 09:36:13 - 1.12
+++ build.xml 17 Jan 2002 21:19:35 - 1.13
@@ -6,6 +6,7 @@
property file=${user.home}/.ant.properties /
property file=${user.home}/build.properties /
+ property file=build.properties.${os.arch}.${os.name} /
property file=build.properties /
property file=../build.properties /
@@ -47,6 +48,7 @@
/target
target name=init
+ echo message=build.properties.${os.arch}.${os.name} /
taskdef resource=META-INF/ant.tasks
classpathref=jkant /
available property=HAVE_APR file=${apr.include}/apr.h /
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 01/12/31 12:03:41
Modified:jk/native2 build.xml
Log:
Removed unused options.
Revision ChangesPath
1.7 +0 -5 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 20 Dec 2001 17:55:42 - 1.6
+++ build.xml 31 Dec 2001 20:03:41 - 1.7
@@ -68,13 +68,8 @@
taskDebug=0
profile=${so.profile}
def name=_REENTRANT /
- def name=CHANNEL if=use.channel
- info=Use the new (experimental) channel interface /
def name=CHUNK_SIZE value=4096
info=Read/Write buffer size /
- def name=REUSE_WORKER
-unless=option_no_reuse_worker
-info=Reuse the worker endpoint, using per thread data /
def name=USE_APACHE_MD5
info=Use the MD5 implementation that is part of apache2 /
src dir=.
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 01/12/19 16:15:44
Modified:jk build.xml README.txt build.properties.sample
jk/native build.xml
jk/native2 build.xml
Log:
A bit of enhancement to the build system, to make it simpler and smarter
( I hope :-)
The goals are to be able to detect what the user has and require minimal
effort. A second goal is to be able to build on all installed platforms.
( at the same time ).
Revision ChangesPath
1.16 +95 -70jakarta-tomcat-connectors/jk/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- build.xml 2001/11/27 00:51:16 1.15
+++ build.xml 2001/12/20 00:15:43 1.16
@@ -10,7 +10,7 @@
property file=${user.home}/build.properties/
property file=${user.home}/.build.properties/
-property name=jk.build value=${basedir}/build/
+property name=jk.build location=${basedir}/build/
!-- Compile options --
property name=optimize value=off /
@@ -21,16 +21,12 @@
location=../../jakarta-tomcat/build/tomcat /
property name=catalina.home
location=../../jakarta-tomcat-4.0/build /
+property name=tomcat41.home
+ location=../../jakarta-tomcat-4.1/build /
-!-- Need to build tomcat-util before jk, XXX automate --
-property name=tomcat-util.jar
- location=../util/build/lib/tomcat-util.jar /
-
path id=build-main.classpath
- pathelement location=${tomcat-util.jar}/
pathelement location=${catalina.home}/server/lib/catalina.jar/
pathelement location=${catalina.home}/common/lib/servlet.jar/
- pathelement location=${junit.jar}/
pathelement location=${tomcat33.home}/lib/common/tomcat_core.jar/
pathelement location=${tomcat33.home}/lib/common/core_util.jar/
pathelement
@@ -51,26 +47,25 @@
/path
!-- Detection and reports --
-
-target name=report-tc3 if=tomcat33.detect
- echo message=Tomcat.33 detected /
-/target
-target name=report-tc4 if=tomcat4.detect
- echo message=Tomcat4 detected /
+target name=report
+echo message=Tomcat33: ${tomcat33.detect} ${tomcat33.home} /
+echo message=Tomcat4: ${tomcat4.detect} ${catalina.home} /
+echo message=Tomcat41: ${tomcat41.detect} ${tomcat41.home} /
+echo message=Apache13: ${apache13.detect} ${apache13.home} /
+echo message=Apache20: ${apache20.detect} ${apache20.home} /
+echo message=iPlanet: ${iplanet.detect} ${iplanet.home} /
+echo message=IIS: ${iis.detect} ${iis.home} /
/target
-target name=report depends=report-tc3,report-tc4 /
-
target name=build-prepare
mkdir dir=${jk.build}/
-mkdir dir=${jk.build}/logs/
mkdir dir=${jk.build}/WEB-INF/
mkdir dir=${jk.build}/WEB-INF/conf/
mkdir dir=${jk.build}/WEB-INF/classes/
+mkdir dir=${jk.build}/WEB-INF/classes/META-INF /
mkdir dir=${jk.build}/WEB-INF/lib/
copy file=conf/web.xml tofile=${jk.build}/WEB-INF/web.xml /
- copy file=${tomcat-util.jar} todir=${jk.build}/WEB-INF/lib /
copy todir=${jk.build}/WEB-INF file=interceptors.xml/
copy todir=${jk.build}/WEB-INF/conf
fileset dir=conf includes=* /
@@ -78,22 +73,24 @@
available property=tomcat33.detect
file=${tomcat33.home}/lib/common/tomcat_core.jar /
available property=tomcat4.detect
file=${catalina.home}/server/lib/catalina.jar /
- echo message=${tomcat4.detect}
file=${catalina.home}/server/lib/catalina.jar /
+available property=tomcat41.detect
file=${tomcat41.home}/server/webapps /
/target
-target name=build-main depends=build-prepare,report
- ant dir=../util antfile=../util/build.xml/
-
+target name=build-main
+depends=build-prepare,report,jkutil,jkjava,jkant /
+
+!-- Building --
+
+target name=jkjava
+description=Build java side of the connector
javac srcdir=java
destdir=${jk.build}/WEB-INF/classes
-deprecation=on
+deprecation=off
debug=${debug}
optimize=${optimize}
-verbose=off
-excludes=**/CVS/**
+verbose=off
exclude name=org/apache/ajp/tomcat4/** unless=tomcat4.detect/
exclude name=org/apache/ajp/tomcat33/** unless=tomcat33.detect/
-exclude name=org/apache/ajp/test/** /
classpath refid=build-main.classpath/
/javac
@@ -105,15
cvs commit: jakarta-tomcat-connectors/jk/native2 build.xml
costin 01/12/04 11:11:02
Modified:jk/native2 build.xml
Log:
Include all files in the server dir ( mod_jk and all other implementations of
jk interfaces )
Revision ChangesPath
1.3 +3 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2001/12/02 01:07:12 1.2
+++ build.xml 2001/12/04 19:11:02 1.3
@@ -76,7 +76,7 @@
def name=USE_APACHE_MD5
info=Use the MD5 implementation that is part of apache2 /
src dir=.
- include name=server/apache2/mod_jk.c /
+ include name=server/apache2/*.c /
include name=common/*.c /
include name=apr/*.c /
/src
@@ -376,11 +376,12 @@
target name=clean
delete
- fileset dir=.
+ fileset dir=${build.dir}
include name=**/*.o/
include name=**/*.so/
include name=**/*.lo/
include name=**/*.la/
+ include name=**/*.a/
include name=**/.libs/
include name=**/*.lib/
include name=**/*.nlm/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
