[jboss-cvs] jboss-seam ...

[Peter Muir]

  User: pmuir   
  Date: 07/07/14 11:29:10

  Modified:    jboss-seam  build.xml
  Log:
  Nightly templates
  
  Revision  Changes    Path
  1.242     +64 -24    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.241
  retrieving revision 1.242
  diff -u -b -r1.241 -r1.242
  --- build.xml	14 Jul 2007 14:48:41 -0000	1.241
  +++ build.xml	14 Jul 2007 15:29:10 -0000	1.242
  @@ -128,7 +128,11 @@
   	
   	<property name="testng.jar" value="${basedir}/lib/testng-5.6-jdk15.jar" />
   
  -	<property name="bootstrap.dir" value="${basedir}/bootstrap"/>
  +	<property name="bootstrap.dir" value="${basedir}/bootstrap" />
  +
  +	<!-- CI -->
  +
  +	<property name="ci.dir" value="${basedir}/ci" />
   
   
   	<property name="javac.debug" value="true" />
  @@ -369,7 +373,8 @@
   		<delete dir="${classes.dir}" />
   		<delete dir="${test.dir}" />
   		<delete dir="${report.dir}" />
  -		<delete dir="${coverage.dir}"/>
  +		<delete dir="${coverage.dir}" />
  +		<delete dir="${ci.dir}" />
   		<cdk target="clean" />
   	</target>
   
  @@ -629,7 +634,7 @@
   		</target>
   
   		<target name="compiletest" depends="inittest,select-compiler,antlr,jarremoting">
  -			<compile classesdir="${classes.test.dir}" srcdir="${src.test.dir}" classpath="test.classpath"/>
  +		<compile classesdir="${classes.test.dir}" srcdir="${src.test.dir}" classpath="test.classpath" />
   		</target>
   
   
  @@ -728,8 +733,43 @@
   		
   	<target name="coverageall" depends="instrumentall, testall, coveragecore" description="Run the core unit tests and all example tests with code coverage" />
   	
  -	<!-- Target for continuous integration, faster than running the targets indepently -->
  -	<target name="ci" depends="cleanall, coverageall, copytestoutput, dist" />
  +	<!-- Target for continuous integration, including copying output to jboss.org -->
  +	<target name="ci" depends="cleanall, coverageall, copytestoutput, dist, testreport, builddownloadable, copydownloadbletojbossorg" />
  +
  +	<target name="builddownloadable">
  +		<mkdir dir="${ci.dir}" />
  +		<copy todir="${ci.dir}">
  +			<fileset dir="${build.dir}/ci">
  +				<include name="**/*.template.html" />
  +			</fileset>
  +			<filterset>
  +				<filter token="build.version" value="${version}.${patchlevel}" />
  +				<filter token="build.file" value="${dist.name}.zip" />
  +			</filterset>
  +			<mapper type="glob" from="*.template.html" to="*.html" />
  +		</copy>
  +		<copy todir="${ci.dir}">
  +			<fileset dir="${build.dir}/ci">
  +				<exclude name="**/*.template.html" />
  +			</fileset>
  +		</copy>
  +		<copy todir="${ci.dir}/build">
  +			<fileset dir="${report.dir}">
  +				<include name="**/*" />
  +			</fileset>
  +		</copy>
  +		<copy todir="${ci.dir}/build" file="${basedir}/${dist.name}.zip" />
  +		<mkdir dir="${version}.${patchlevel}" />
  +		<move todir="${ci.dir}/${version}.${patchlevel}">
  +			<fileset dir="${ci.dir}/build" />
  +		</move>
  +	</target>
  +
  +	<target name="copydownloadbletojbossorg">
  +		<scp todir="jbossqa at download.jboss.org:/htdocs/jbossseam/build">
  +			<fileset dir="${ci.dir}" />
  +		</scp>
  +	</target>
   
   	<!-- ########################## DIST TARGETS ###########################-->
   
  @@ -922,7 +962,7 @@
   
   	<target name="testcore" depends="inittestcore,compiletest" description="Run the core unit tests">
   		<taskdef resource="testngtasks" classpath="${testng.jar}" />
  -		<property name="test.cp" refid="test.classpath"/>
  +		<property name="test.cp" refid="test.classpath" />
   		<testng>
   			<jvmarg value="-Djava.awt.headless=true" />
   			<classpath refid="test.classpath" />
  @@ -946,17 +986,17 @@
   		<mkdir dir="${report.dir}/tests" />
   		<copy todir="${report.dir}/tests">
   			<fileset dir="${test.dir}">
  -				<include name="**/*.xml"/>
  -				<exclude name="**/testng-*.xml"/>
  +				<include name="**/*.xml" />
  +				<exclude name="**/testng-*.xml" />
   			</fileset>
  -			<mapper type="flatten"/>
  +			<mapper type="flatten" />
   		</copy>
   	</target>
   
   	<target name="instrumentcore" depends="inittestcore">
   		<taskdef resource="emma_ant.properties" classpathref="classpath.emma" />
   		<mkdir dir="${classes.coverage.core.dir}" />
  -		<mkdir dir="${coverage.dir}/core"/>
  +		<mkdir dir="${coverage.dir}/core" />
   		<move todir="${classes.coverage.core.dir}">
   			<fileset dir="${classes.test.core.dir}" />
   		</move>
  @@ -972,7 +1012,7 @@
   	</target>
   
   	<target name="coveragecore" depends="instrumentcore,testcore" description="Generate a test coverage report for the core tests">
  -		<move file="${basedir}/coverage.ec" tofile="${coverage.dir}/coveragecore.ec"/>
  +		<move file="${basedir}/coverage.ec" tofile="${coverage.dir}/coveragecore.ec" />
   		<emma>
   			<report sourcepath="${src.core.dir}" depth="method">
   				<infileset dir="${coverage.dir}" includes="coveragecore.em,coveragecore.ec" />