User: starksm
Date: 01/12/29 02:22:38
Modified: . Tag: Branch_2_4 build.xml
Log:
Use pathconvert to generate absolute paths to pass to the servlet
builds.
Revision Changes Path
No revision
No revision
1.33.2.7 +29 -3 jboss/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss/build.xml,v
retrieving revision 1.33.2.6
retrieving revision 1.33.2.7
diff -u -r1.33.2.6 -r1.33.2.7
--- build.xml 2001/12/29 08:56:05 1.33.2.6
+++ build.xml 2001/12/29 10:22:38 1.33.2.7
@@ -41,6 +41,7 @@
<property name="tomcat4x" value="jakarta-tomcat-4.0.1" />
<!-- The location of the Jetty-3.1.3-1 distribution -->
<property name="jetty" value="Jetty-3.1.3-1" />
+ <property name="jetty-jmx" value="JettyExtra-1.0.1/jmx" />
<target name="init" unless="build.time">
<tstamp>
@@ -131,10 +132,19 @@
quiet="true"
output="catalina.log"
/>
+ <echo message="Checking out Jetty"/>
+ <cvs cvsRoot="${cvsroot}"
+ command="${cvs-op}"
+ package="contrib/jetty"
+ tag="${version-tag}"
+ dest="."
+ quiet="true"
+ output="jetty.log"
+ />
</target>
<target name="cvs-co" >
- <property name="cvs-op" value="co" />
+ <property name="cvs-op" value="co -P" />
<antcall target="do-cvs" />
</target>
@@ -202,20 +212,36 @@
</target>
<target name="tomcat4x-dist" if="have-tomcat4x" depends="check-tomcat">
<echo message="+++ Building JBoss/Catalina bundle(module=contrib/catalina)" />
+ <pathconvert targetos="unix" property="catalina.dist">
+ <path id="catalina.path">
+ <pathelement location="${tomcat4x}" />
+ </path>
+ </pathconvert>
<ant antfile="src/build/build.xml" dir="contrib/catalina" target="bundle"
output="catlina.log">
- <property name="catalina.dist" value="${tomcat4x}" />
</ant>
</target>
<target name="jetty-dist" if="have-jetty" depends="check-tomcat">
<echo message="+++ Building JBoss/Jetty bundle(module=contrib/jetty)" />
+ <pathconvert targetos="unix" property="jetty.dist">
+ <path id="jetty.path">
+ <pathelement location="${jetty}" />
+ </path>
+ </pathconvert>
+ <pathconvert targetos="unix" property="jetty.jmx">
+ <path id="jetty.jmx.path">
+ <pathelement location="${jetty-jmx}" />
+ </path>
+ </pathconvert>
<ant antfile="src/build/build.xml" dir="contrib/jetty" target="bundle"
output="jetty.log">
- <property name="jetty.dist" value="${jetty}" />
</ant>
</target>
<target name="clean">
+ <delete>
+ <fileset dir="." includes="*.log" />
+ </delete>
<ant antfile="src/build/build.xml" dir="jboss" target="clean" />
<ant antfile="src/build/build.xml" dir="jboss-j2ee" target="clean" />
<ant antfile="src/build/build.xml" dir="jnp" target="clean" />
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
