Return-Path: <mattbaird@apache.org>
Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm
Delivered-To: mailing list ojb-dev@db.apache.org
Received: (qmail 45622 invoked by uid 500); 3 Jul 2003 00:46:10 -0000
Received: (qmail 45597 invoked from network); 3 Jul 2003 00:46:10 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 3 Jul 2003 00:46:10 -0000
Received: (qmail 79103 invoked by uid 1518); 3 Jul 2003 00:46:09 -0000
Date: 3 Jul 2003 00:46:09 -0000
Message-ID: <20030703004609.79102.qmail@icarus.apache.org>
From: mattbaird@apache.org
To: db-ojb-cvs@apache.org
Subject: cvs commit: db-ojb build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

mattbaird    2003/07/02 17:46:09

  Modified:    .        build.xml
  Log:
  refactor build so we don't have redundant targets we need to maintain
  
  Revision  Changes    Path
  1.96      +42 -42    db-ojb/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/build.xml,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -u -r1.95 -r1.96
  --- build.xml	1 Jul 2003 21:05:40 -0000	1.95
  +++ build.xml	3 Jul 2003 00:46:09 -0000	1.96
  @@ -356,56 +356,46 @@
                target="project-datadump-classpath"/>
       </target>
   
  -
       <!-- ================================================================== -->
       <!-- Build the JAR file using main-opt                                  -->
       <!-- ================================================================== -->
  -    <target name="jar" depends="main-opt"
  -            description="Builds the binary ojb-xxx.jar in the dist directory.">
  -        <delete file="${dist}/${archive}.jar"/>
  -        <delete file="${dist}/${archive}-junit.jar"/>
  -        <delete file="${dist}/${archive}-src.jar"/>
  -        <delete file="${build.dest}/MANIFEST.MF"/>
  -        <copy file="${source}/etc/MANIFEST.MF" tofile="${build.dest}/MANIFEST.MF"/>
  -        <replace file="${build.dest}/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
  -        <copy todir="${build.dest}">
  -            <fileset dir="${source}/etc" excludes="MANIFEST.MF"/>
  -        </copy>
  -        <jar jarfile="${dist}/${archive}.jar" basedir="${build.dest}"
  -             manifest="${build.dest}/MANIFEST.MF"
  -             includes="LICENSE,README,javax/**,org/**"/>
  -
  -        <jar jarfile="${dist}/${archive}-junit.jar" basedir="${build.desttest}"
  -             manifest="${build.dest}/MANIFEST.MF"
  -             includes="LICENSE,README,org/**"/>
  -
  -        <jar jarfile="${dist}/${archive}-src.jar" basedir="${build.src}"
  -             manifest="${build.dest}/MANIFEST.MF"
  -             includes="LICENSE,README,org/**"/>
   
  +    <target name="jar" description="Builds the binary ojb-xxx.jar in the dist directory.">
  +		<antcall target="main-opt"/>
  +		<antcall target="jar-internal"/>
       </target>
  +
   	<!-- ================================================================== -->
       <!-- Build the JAR file using main-debug                                  -->
       <!-- ================================================================== -->
  -    <target name="jar-debug" depends="main"
  -            description="Builds the binary ojb-xxx.jar in the dist directory in debug mode.">
  -        <delete file="${dist}/${archive}.jar"/>
  -        <delete file="${dist}/${archive}-junit.jar"/>
  -        <delete file="${build.dest}/MANIFEST.MF"/>
  -        <copy file="${source}/etc/MANIFEST.MF" tofile="${build.dest}/MANIFEST.MF"/>
  -        <replace file="${build.dest}/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
  -        <copy todir="${build.dest}">
  -            <fileset dir="${source}/etc" excludes="MANIFEST.MF"/>
  -        </copy>
  -        <jar jarfile="${dist}/${archive}.jar" basedir="${build.dest}"
  -             manifest="${build.dest}/MANIFEST.MF"
  -             includes="LICENSE,README,javax/**,org/**"/>
  -
  -        <jar jarfile="${dist}/${archive}-junit.jar" basedir="${build.desttest}"
  -             manifest="${build.dest}/MANIFEST.MF"
  -             includes="LICENSE,README,org/**"/>
   
  -    </target>
  +    <target name="jar-debug" description="Builds the binary ojb-xxx.jar in the dist directory in debug mode.">
  +  		<antcall target="main"/>
  +		<antcall target="jar-internal"/>
  +    </target>
  +
  +	<target name="jar-internal">
  +		<delete file="${dist}/${archive}.jar"/>
  +		<delete file="${dist}/${archive}-junit.jar"/>
  +		<delete file="${dist}/${archive}-src.jar"/>
  +		<delete file="${build.dest}/MANIFEST.MF"/>
  +		<copy file="${source}/etc/MANIFEST.MF" tofile="${build.dest}/MANIFEST.MF"/>
  +		<replace file="${build.dest}/MANIFEST.MF" token="$$VERSION$$" value="${version}"/>
  +		<copy todir="${build.dest}">
  +		<fileset dir="${source}/etc" excludes="MANIFEST.MF"/>
  +		</copy>
  +		<jar jarfile="${dist}/${archive}.jar" basedir="${build.dest}"
  +			manifest="${build.dest}/MANIFEST.MF"
  +			includes="LICENSE,README,javax/**,org/**"/>
  +
  +		<jar jarfile="${dist}/${archive}-junit.jar" basedir="${build.desttest}"
  +			manifest="${build.dest}/MANIFEST.MF"
  +			includes="LICENSE,README,org/**"/>
  +
  +		<jar jarfile="${dist}/${archive}-src.jar" basedir="${build.src}"
  +			manifest="${build.dest}/MANIFEST.MF"
  +			includes="LICENSE,README,org/**"/>
  +	</target>
       <!-- ================================================================== -->
       <!-- Build sample war-file for deployment in tomcat                     -->
       <!-- ================================================================== -->
  @@ -1164,7 +1154,17 @@
   	<!-- Generate the JCA adapter for the OTM					            -->
   	<!-- ================================================================== -->
   
  -	<target name="rar" depends="jar" description="builds the resource adapter">
  +	<target name="rar" description="Builds the RAR for the OTM in optimized mode">
  +		<antcall target="jar"/>
  +		<antcall target="rar-internal"/>
  +	</target>
  +
  +	<target name="rar-debug" description="Builds the RAR for the OTM in debug mode">
  +		<antcall target="jar-debug"/>
  +		<antcall target="rar-internal"/>
  +	</target>
  +
  +	<target name="rar-internal">
   		<delete file="${dist}/ojb-jca.rar"/>
   		<mkdir dir="${build.destjca}/META-INF/"/>
   		<copy file="${src.dir}/etc/MANIFEST.MF" todir="${build.destjca}/META-INF/"/>