[jboss-cvs] jboss-seam ...

[Peter Muir]

  User: pmuir   
  Date: 07/07/03 12:50:34

  Modified:    jboss-seam   .cvsignore build.xml
  Log:
  Move build output to /classes (I want /build build libraries and poms)
  
  Revision  Changes    Path
  1.19      +1 -1      jboss-seam/.cvsignore
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: .cvsignore
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/.cvsignore,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- .cvsignore	3 Apr 2007 18:32:02 -0000	1.18
  +++ .cvsignore	3 Jul 2007 16:50:34 -0000	1.19
  @@ -14,4 +14,4 @@
   testng-failures.xml
   report
   output
  -build
  +classes
  
  
  
  1.230     +20 -18    jboss-seam/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build.xml,v
  retrieving revision 1.229
  retrieving revision 1.230
  diff -u -b -r1.229 -r1.230
  --- build.xml	3 Jul 2007 15:09:08 -0000	1.229
  +++ build.xml	3 Jul 2007 16:50:34 -0000	1.230
  @@ -45,15 +45,15 @@
   
   
   	<!-- Targets -->
  -	<property name="build.dir" value="build" />
  -	<property name="classes.core.dir" value="${build.dir}/classes" />
  -	<property name="classes.pdf.dir" value="${build.dir}/pdfclasses" />
  -	<property name="classes.ioc.dir" value="${build.dir}/iocclasses" />
  -	<property name="classes.mail.dir" value="${build.dir}/mailclasses" />
  -	<property name="classes.debug.dir" value="${build.dir}/debugclasses" />
  -	<property name="classes.remoting.dir" value="${build.dir}/remotingclasses" />
  -	<property name="classes.gen.dir" value="${build.dir}/genclasses" />
  -	<property name="coverage.dir" value="${build.dir}/coverage" />
  +	<property name="classes.dir" value="classes" />
  +	<property name="classes.core.dir" value="${classes.dir}/classes" />
  +	<property name="classes.pdf.dir" value="${classes.dir}/pdfclasses" />
  +	<property name="classes.ioc.dir" value="${classes.dir}/iocclasses" />
  +	<property name="classes.mail.dir" value="${classes.dir}/mailclasses" />
  +	<property name="classes.debug.dir" value="${classes.dir}/debugclasses" />
  +	<property name="classes.remoting.dir" value="${classes.dir}/remotingclasses" />
  +	<property name="classes.gen.dir" value="${classes.dir}/genclasses" />
  +	<property name="coverage.dir" value="${classes.dir}/coverage" />
   
   	<property name="ui.dir" value="ui" />
   	<property name="seamgen.dir" value="${basedir}/seam-gen" />
  @@ -130,7 +130,7 @@
   	</path>
   
   	<path id="test.classpath">
  -		<path path="${build.dir}/test" />
  +		<path path="${classes.dir}/test" />
   		<path path="${coverage.dir}/classes" />
   		<path refid="classpath.emma" />
   		<fileset refid="lib" />
  @@ -176,7 +176,7 @@
   	<!-- ########################## BUILD TARGETS ##########################-->
   
   	<target name="clean" description="Cleans up the build directory">
  -		<delete dir="${build.dir}" />
  +		<delete dir="${classes.dir}" />
   		<delete dir="test-output" />
   		<delete dir="report" />
   		<cdk target="clean" />
  @@ -524,10 +524,12 @@
   				<include name="remoting/gwt/**/*" />
   				<include name="readme.txt" />
   				<include name="seam-examples.html" />
  -				<exclude name="*/build" />
  -				<exclude name="*/build/**/*" />
  -				<exclude name="*/test-output" />
  -				<exclude name="*/test-output/**/*" />
  +				<exclude name="*/exploded-archives" />
  +				<exclude name="*/exploded-archives/**/*" />
  +				<exclude name="*/test-build" />
  +				<exclude name="*/test-build/**/*" />
  +				<exclude name="*/dist" />
  +				<exclude name="*/dist/**/*" />
   			</fileset>
   		</copy>
   	</target>
  @@ -626,7 +628,7 @@
   
   	<target name="testcore" depends="compilecore,compiletest" description="Run the core unit tests">
   		<taskdef resource="testngtasks" classpath="${testng.jar}" />
  -		<copy todir="${build.dir}/test">
  +		<copy todir="${classes.dir}/test">
   			<fileset dir="${classes.core.dir}" includes="**/*.*" />
   		</copy>
   		<delete dir="test-output" />
  @@ -655,7 +657,7 @@
   
   		<taskdef resource="emma_ant.properties" classpathref="classpath.emma" />
   
  -		<copy todir="${build.dir}/test">
  +		<copy todir="${classes.dir}/test">
   			<fileset dir="${classes.core.dir}" includes="**/*.*" />
   		</copy>
   
  @@ -663,7 +665,7 @@
   
   		<!-- Apply instrumentation to the classes -->
   		<emma>
  -			<instr instrpath="${build.dir}/test" destdir="${coverage.dir}/classes" mode="copy" metadatafile="${coverage.dir}/coverage.em">
  +			<instr instrpath="${classes.dir}/test" destdir="${coverage.dir}/classes" mode="copy" metadatafile="${coverage.dir}/coverage.em">
   				<!-- Exclude packages we don't want coverage for -->
   				<filter excludes="org.jboss.seam.annotations.*" />
   				<filter excludes="org.jboss.seam.test.*" />