[jboss-cvs] jboss-seam/build ...

[Peter Muir]

  User: pmuir   
  Date: 07/09/21 11:55:48

  Modified:    build    common.build.xml
  Log:
  Less copying
  
  Revision  Changes    Path
  1.2       +23 -20    jboss-seam/build/common.build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: common.build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build/common.build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- common.build.xml	20 Sep 2007 18:36:02 -0000	1.1
  +++ common.build.xml	21 Sep 2007 15:55:48 -0000	1.2
  @@ -18,14 +18,15 @@
   		</not>
   	</condition>
   
  -	<property name="build.lib.dir" value="${build.dir}/lib" />
   	<property name="maven.dir" value="${build.dir}/maven" />
   
  -	<path id="maven-ant-tasks.classpath" path="${build.lib.dir}/maven-ant-tasks.jar" />
  -	<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
  -
   	<artifact:remoteRepository id="local.repository" url="file://${build.dir}/repository" />
   
  +	<target name="initcopy">
  +		<mkdir dir="${lib.dir}" />
  +	</target>
  +	
  +	<target name="initpoms" unless="initpomsdone">
   	<!-- POMs -->
   	<echo>Setting up dependencies</echo>
   	<pomfile name="root.pom" value="${build.dir}/root.pom.xml" />
  @@ -38,12 +39,10 @@
   	<pomfile name="pdf.pom" value="${build.dir}/pdf.pom.xml" />
   	<pomfile name="remoting.pom" value="${build.dir}/remoting.pom.xml" />
   	<pomfile name="ui.pom" value="${build.dir}/ui.pom.xml" />
  -
  -	<target name="initcopy">
  -		<mkdir dir="${lib.dir}" />
  +		<property name="initpomsdone" value="true" />
   	</target>
   	
  -	<target name="copyseamdependencies" if="mavenized.property">
  +	<target name="copyseamdependencies" if="mavenized.property" unless="copyseamdependenciesdone" depends="initcopy, initpoms">
   		<copyDependencies id="core" pom="${core.pom}" todir="${lib.dir}" scope="compile" />
   		<copyDependencies id="debug" pom="${debug.pom}" todir="${lib.dir}" scope="compile" />
   		<copyDependencies id="ioc" pom="${ioc.pom}" todir="${lib.dir}" scope="compile" />
  @@ -51,9 +50,10 @@
   		<copyDependencies id="pdf" pom="${pdf.pom}" todir="${lib.dir}" scope="compile" />
   		<copyDependencies id="remoting" pom="${remoting.pom}" todir="${lib.dir}" scope="compile" />
   		<copyDependencies id="ui" pom="${ui.pom}" todir="${lib.dir}" scope="compile" />
  +		<property name="copyseamdependenciesdone" value="true" />
   	</target>
   
  -	<target name="copyseam" if="mavenized.property">
  +	<target name="copyseam" if="mavenized.property" unless="copyseamdone" depends="initcopy, initpoms">
   		<artifact:dependencies filesetId="seam.fileset" versionsId="seam.versions">
   			<dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="${version}.${patchlevel}" />
   			<dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="${version}.${patchlevel}" />
  @@ -67,9 +67,10 @@
   			<fileset refid="seam.fileset" />
   			<mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${seam.versions}" to="flatten" />
   		</copy>
  +		<property name="copyseamdone" value="true" />
   	</target>
   	
  -	<target name="copyjbossembedded" if="mavenized.property">
  +	<target name="copyjbossembedded" if="mavenized.property" unless="copyjbossembeddeddone" depends="initpoms, initcopy">
   		<artifact:dependencies filesetId="embeddedjboss.fileset" versionsId="embeddedjboss.versions">
   			<dependency groupId="org.jboss.embedded" artifactId="jboss-embedded-all" version="beta2" />
   			<dependency groupId="org.jboss.embedded" artifactId="thirdparty-all" version="beta2" />
  @@ -80,5 +81,7 @@
   			<fileset refid="embeddedjboss.fileset" />
   			<mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${embeddedjboss.versions}" to="flatten" />
   		</copy>
  +		<property name="copyjbossembeddeddone" value="true" />
   	</target>
  +
   </project>
  \ No newline at end of file