avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-apps/phyre build.xml
Date Wed, 02 Oct 2002 20:18:20 GMT
hammant     2002/10/02 13:18:20

  Modified:    .        build.xml
               db       build.xml
               demo     build.xml
               ftpserver build.xml
               phyre    build.xml
  Log:
  update phoenixXdoclet
  
  Revision  Changes    Path
  1.7       +6 -23     jakarta-avalon-apps/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	3 Sep 2002 07:09:15 -0000	1.6
  +++ build.xml	2 Oct 2002 20:18:19 -0000	1.7
  @@ -98,13 +98,6 @@
   	SETUP TARGETS
        ==========================================================================================
-->
   
  -	<target name="test-xdoclet" depends="module:setup" unless="override.test-xdoclet">
  -		<available classname="xdoclet.XDocletMain" classpathref="project.class.path" property="xdoclet.present"/>
  -		<echo message="-------------------------------------------------------------" />
  -		<echo message="INFO: XDoclet is available" />
  -		<echo message="-------------------------------------------------------------" />
  -	</target>
  -
   <!-- ==========================================================================================
   	COMPILE TARGETS
        ==========================================================================================
-->
  @@ -133,7 +126,7 @@
   	</target>
   
   	<!-- Make .xinfo and manifest automatically for blocks -->
  -	<target name="module:phoenix-xdoclet" depends="module:compile,module:setup,test-xdoclet"
if="xdoclet.present">
  +	<target name="module:phoenix-xdoclet" depends="module:compile,module:setup">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Compiling ${Name} xinfo files" />
   		<echo message="-------------------------------------------------------------" />
  @@ -151,15 +144,6 @@
   		</phoenix-blocks>
   	</target>
   
  -	<!-- Make .xinfo and manifest automatically for blocks -->
  -	<target name="module:no-phoenix-xdoclet" depends="module:compile,module:setup,test-xdoclet"
unless="xdoclet.present">
  -		<echo message="-------------------------------------------------------------" />
  -		<echo message="INFO: Getting ${Name} xinfo files" />
  -		<echo message="-------------------------------------------------------------" />
  -		<mkdir dir="${build.xdoclet}"/>
  -		<unzip src="${src.dir}/generated-by-xdoclet.zip" dest="${build.xdoclet}" />
  -	</target>
  -
   	<!-- Performs unit tests -->
   	<target name="module:test" depends="module:compile,module:setup" unless="override.test">
   		<echo message="-------------------------------------------------------------" />
  @@ -174,12 +158,12 @@
   
       <target name="module:jar" depends="module:override-jar,module:real-jar" unless="override.jar"/>
   
  -    <target name="module:override-jar" depends="test-xdoclet, module:phoenix-xdoclet,
module:no-phoenix-xdoclet,module:setup" if="override.jar">
  +    <target name="module:override-jar" depends="module:phoenix-xdoclet,module:setup"
if="override.jar">
           <ant antfile="${basedir}/build.xml" target="jar"/>
       </target>
   
   	<!-- Jars up project -->
  -	<target name="module:real-jar" depends="test-xdoclet, module:phoenix-xdoclet, module:no-phoenix-xdoclet,module:setup"
unless="override.jar">
  +	<target name="module:real-jar" depends="module:phoenix-xdoclet,module:setup" unless="override.jar">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Creating jar file for ${Name}" />
   		<echo message="   generated file: ${build.lib}/${name}.jar" />
  @@ -234,7 +218,7 @@
   	</target>
   
   	<!-- Completely build all dists -->
  -	<target name="module:dist" depends="module:sar,module:setup" unless="override.dist">
  +	<target name="module:dist" depends="module:setup" unless="override.dist">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Creating distributions for ${Name}" />
   		<echo message="   putting files in: ${dist.base}" />
  @@ -272,6 +256,7 @@
   				<include name="avalon-*"/>
   				<include name="cornerstone.jar"/>
   				<include name="phoenix-*"/>
  +				<include name="qdox-*"/>
   			</fileset>
   		</zip>
   
  @@ -287,6 +272,7 @@
   				<include name="avalon-*"/>
   				<include name="cornerstone.jar"/>
   				<include name="phoenix-*"/>
  +				<include name="qdox-*"/>
   			</tarfileset>
   		</tar>
   
  @@ -330,9 +316,6 @@
   		<copy todir="${src.dist.src}">
   			<fileset dir="${src.dir}"/>
   		</copy>
  -
  -		<zip zipfile="${src.dist.src}/generated-by-xdoclet.zip"
  -				basedir="${build.xdoclet}"/>
   
   		<copy todir="${src.dist.dir}">
   			<fileset dir=".">
  
  
  
  1.60      +1 -0      jakarta-avalon-apps/db/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/build.xml,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- build.xml	2 Oct 2002 19:52:58 -0000	1.59
  +++ build.xml	2 Oct 2002 20:18:19 -0000	1.60
  @@ -350,6 +350,7 @@
           <include name="common/lib/excalibur-altrmi-*"/>
           <include name="common/lib/cornerstone.jar"/>
           <include name="common/lib/phoenix-*"/>
  +        <include name="common/lib/qdox-*"/>
         </tarfileset>      
       </tar>
   
  
  
  
  1.66      +1 -0      jakarta-avalon-apps/demo/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/demo/build.xml,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- build.xml	2 Oct 2002 19:53:20 -0000	1.65
  +++ build.xml	2 Oct 2002 20:18:19 -0000	1.66
  @@ -459,6 +459,7 @@
           <include name="common/lib/avalon-*"/>
           <include name="common/lib/cornerstone.jar"/>
           <include name="common/lib/phoenix-*"/>
  +        <include name="common/lib/qdox-*"/>
   
         </tarfileset>
         
  
  
  
  1.43      +1 -0      jakarta-avalon-apps/ftpserver/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/build.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- build.xml	2 Oct 2002 19:57:31 -0000	1.42
  +++ build.xml	2 Oct 2002 20:18:20 -0000	1.43
  @@ -247,6 +247,7 @@
           <include name="common/lib/avalon-*"/>
           <include name="common/lib/cornerstone.jar"/>
           <include name="common/lib/phoenix-*"/>
  +        <include name="common/lib/qdox-*"/>
         </tarfileset>
         
       </tar>
  
  
  
  1.5       +1 -5      jakarta-avalon-apps/phyre/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/phyre/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	3 Sep 2002 07:37:25 -0000	1.4
  +++ build.xml	2 Oct 2002 20:18:20 -0000	1.5
  @@ -82,17 +82,13 @@
           <ant antfile="${basedir}/../build.xml" target="module:phoenix-xdoclet"/>
       </target>
   
  -    <target name="no-phoenix-xdoclet">
  -        <ant antfile="${basedir}/../build.xml" target="module:no-phoenix-xdoclet"/>
  -    </target>
  -
   
   <!-- ==========================================================================================
   	DISTRIBUTION TARGETS
        ==========================================================================================
-->
   
   	<!-- Jars up project -->
  -	<target name="jar" depends="phoenix-xdoclet, no-phoenix-xdoclet,setup">
  +	<target name="jar" depends="phoenix-xdoclet,setup">
   		<echo message="-------------------------------------------------------------" />
   		<echo message="INFO: Creating jar file for ${Name}" />
   		<echo message="   generated file: ${build.lib}/${name}.jar" />
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message