User: starksm 
  Date: 01/12/02 17:43:40

  Modified:    .        Tag: Branch_2_4 build.xml
  Log:
  Clean up the build further
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.33.2.4  +65 -16    jboss/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/build.xml,v
  retrieving revision 1.33.2.3
  retrieving revision 1.33.2.4
  diff -u -r1.33.2.3 -r1.33.2.4
  --- build.xml 2001/11/28 21:14:01     1.33.2.3
  +++ build.xml 2001/12/03 01:43:39     1.33.2.4
  @@ -11,8 +11,8 @@
   your system/environment. This can be done by editing this file,
   or creating an .ant.properties file in the directory from step 1.
   a. version-tag: set this to the cvs tag you want to build. For example,
  -to build the JBoss_2_4_2 version use:
  -  version-tag="JBoss_2_4_2"
  +to build the JBoss_2_4_4 version use:
  +  version-tag="JBoss_2_4_4"
   To build the latest 2.4 branch chode use:
     version-tag="Branch_2_4"
   b. tomcat3x: set to the absolute path of the jakarta-tomcat-3.2.3 distribution
  @@ -20,7 +20,7 @@
   c. tomcat4x: set to the absolute path of the jakarta-tomcat-4.0 distribution 
   This is required to build the contrib/catalina bundle
   
  -3. Execute the dist target by running Ant1.3 in the directory created
  +3. Execute the dist target by running Ant1.4.1 in the directory created
   in step 1. This will create a jboss/dist directory with the JBoss
   server version and contrib/tomcat/bundle/JBoss_x_Tomcat-3.x directory
   with the JBoss/Tomcat bundle, and a contrib/catalina/bundle/JBoss_x_Tomcat-4.x
  @@ -36,9 +36,9 @@
     <!-- The CVSROOT value -->
     <property name="cvsroot" 
value=":pserver:[EMAIL PROTECTED]:/cvsroot/jboss" />
     <!-- The location of the jakarta-tomcat-3.2.3 distribution -->
  -  <property name="tomcat3x" value="/home/starksm/cvsroot/jakarta-tomcat-3.2.4" />
  +  <property name="tomcat3x" value="jakarta-tomcat-3.2.4" />
     <!-- The location of the jakarta-tomcat-4.0 distribution -->
  -  <property name="tomcat4x" value="/home/starksm/cvsroot/jakarta-tomcat-4.0.1" />
  +  <property name="tomcat4x" value="jakarta-tomcat-4.0.1" />
   
     <target name="init" unless="build.time">
       <tstamp>
  @@ -137,21 +137,70 @@
     </target>
   
     <target name="build" depends = "cvs-co,init">
  -    <ant antfile="src/build/build.xml" dir="jboss" target="main" />
  -    <ant antfile="src/build/build.xml" dir="jnp" target="src-install" />
  -    <ant antfile="src/build/build.xml" dir="jbosssx" target="src-install" />
  -    <ant antfile="src/build/build.xml" dir="jbossmq" target="src-install" />
  -    <ant antfile="src/build/build.xml" dir="jbosscx" target="src-install" />
  -    <ant antfile="src/build/build.xml" dir="jbosspool" target="src-install" />
  -    <ant antfile="src/build/build.xml" dir="jboss-j2ee" target="src-install" />
  +     <antcall target="build-jboss" />
  +     <antcall target="build-jbossj2ee" />
  +     <antcall target="build-jbossns" />
  +     <antcall target="build-jbosssx" />
  +     <antcall target="build-jbosscx" />
  +     <antcall target="build-jbossmq" />
  +     <antcall target="build-jbossdist" />
     </target>
   
  +  <target name="build-jboss">
  +    <echo message="+++ Building JBossServer(module=jboss) for compilation" />
  +    <ant antfile="src/build/build.xml" dir="jboss" target="main" output="jboss.log" 
/>
  +  </target>
  +  <target name="build-jbossj2ee">
  +    <echo message="+++ Building JBoss-J2EE(module=jboss-j2ee)" />
  +    <ant antfile="src/build/build.xml" dir="jboss-j2ee" target="src-install" 
output="jboss-j2ee.log"/>
  +  </target>
  +  <target name="build-jbossns">
  +    <echo message="+++ Building JBossNS(module=jnp)" />
  +    <ant antfile="src/build/build.xml" dir="jnp" target="src-install" 
output="jnp.log" />
  +  </target>
  +  <target name="build-jbosssx">
  +    <echo message="+++ Building JBossSX(module=jbosssx)" />
  +    <ant antfile="src/build/build.xml" dir="jbosssx" target="src-install" 
output="jbosssx.log" />
  +  </target>
  +  <target name="build-jbosscx">
  +    <echo message="+++ Building JBossCX(module=jbosscx)" />
  +    <ant antfile="src/build/build.xml" dir="jbosscx" target="src-install" 
output="jbosscx.log" />
  +    <echo message="+++ Building JBossCX(module=jbosspool)" />
  +    <ant antfile="src/build/build.xml" dir="jbosspool" target="src-install" 
output="jbosspool.log" />
  +  </target>
  +  <target name="build-jbossmq">
  +    <echo message="+++ Building JBossMQ(module=jbossmq)" />
  +    <ant antfile="src/build/build.xml" dir="jbossmq" target="src-install" 
output="jbossmq.log" />
  +  </target>
  +  <target name="build-jbossdist">
  +    <echo message="+++ Rebuilding JBossServer(module=jboss)" />
  +    <ant antfile="src/build/build.xml" dir="jboss" target="main" 
output="jboss2.log" />
  +  </target>
  +
  +  <target name="check-tomcat">
  +    <available property="have-tomcat3x" file="${tomcat3x}" />
  +    <available property="have-tomcat4x" file="${tomcat4x}" />
  +  </target>
     <target name="dist" depends="build">
  -    <ant antfile="src/build/build.xml" dir="jboss" target="main" />
  -    <ant antfile="src/build/build.xml" dir="contrib/tomcat" target="bundle">
  -      <property name="tomcat.dist" value="${tomcat3x}" />
  +    <ant antfile="src/build/build.xml" dir="jboss" target="dist-zip" />
  +    <antcall target="tomcat3x-dist" />
  +    <antcall target="tomcat4x-dist" />
  +  </target>
  +  <target name="tomcat3x-dist" if="have-tomcat3x" depends="check-tomcat">
  +    <echo message="+++ Building JBoss/Tomcat bundle(module=contrib/tomcat)" />
  +    <pathconvert targetos="unix" property="tomcat.dist">
  +      <path id="tomcat.path">
  +        <pathelement location="${tomcat3x}" />
  +      </path>
  +    </pathconvert>
  +    <ant antfile="src/build/build.xml" dir="contrib/tomcat" target="bundle"
  +        output="tomcat.log">
       </ant>
  -    <ant antfile="src/build/build.xml" dir="contrib/catalina" target="bundle">
  +  </target>
  +  <target name="tomcat4x-dist" if="have-tomcat4x" depends="check-tomcat">
  +    <echo message="+++ Building JBoss/Catalina bundle(module=contrib/catalina)" />
  +    <ant antfile="src/build/build.xml" dir="contrib/catalina" target="bundle"
  +        output="catlina.log">
         <property name="catalina.dist" value="${tomcat4x}" />
       </ant>
     </target>
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to