From 3b9e42d50672ef0062bbf9611c947c555332e475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joel=20H=C3=A5kansson?= <joel.hakansson@mtm.se>
Date: Fri, 16 Nov 2012 07:47:50 +0000
Subject: [PATCH] improved build script for Jenkins

---
 .gitattributes       |   1 -
 Dotify/build.xml     | 121 ++++++++++++++++++++++++++++++++++++++++---
 Dotify/run-tests.xml | 109 --------------------------------------
 3 files changed, 114 insertions(+), 117 deletions(-)
 delete mode 100644 Dotify/run-tests.xml

diff --git a/.gitattributes b/.gitattributes
index cda28bb5..83b2e161 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -64,7 +64,6 @@ Dotify/lib/texhyphj.jar -text
 Dotify/lib/wstx-lgpl-3.2.8.jar -text
 Dotify/lib/xercesImpl.jar -text
 Dotify/logging.properties -text svneol=unset#text/plain
-Dotify/run-tests.xml -text svneol=unset#text/plain
 Dotify/src/META-INF/services/javax.xml.transform.TransformerFactory -text
 Dotify/src/META-INF/services/javax.xml.validation.SchemaFactory -text
 Dotify/src/META-INF/services/org.daisy.dotify.config.ConfigurationsProvider -text
diff --git a/Dotify/build.xml b/Dotify/build.xml
index 39c67a9e..7ca114b9 100644
--- a/Dotify/build.xml
+++ b/Dotify/build.xml
@@ -1,17 +1,50 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="buildJar">
+<project default="buildAndTest">
 	<description>Buildfile for this project</description>
-	
+
 	<import file="build-properties.xml"/>
-	
+
 	<property name="dist.jar" value="${dist.dir}/dotify.jar"/>
 	<property name="build.dir" value="${ant-output.dir}/build.temp"/>
 
+	<!-- Testing properties -->
+	<property name="test-src.dir" value="${basedir}/test"/>
+	<property name="test-build.dir" value="${ant-output.dir}/test-build.temp"/>
+	<property name="tests-jar.name" value="tests-temp.jar"/>
+	<property name="dist-unzip.dir" value="${ant-output.dir}/test-unzip"/>
+	<property name="dist-root.dir" value="${ant-output.dir}/test-unzip/${zip-foler-prefix}"/>
+	<property name="dist-lib.dir" value="${dist-unzip.dir}/${zip-foler-prefix}/lib"/>
+	<property name="test.report.dir" value="${ant-output.dir}/test-report"/>
+	<property name="test.report-temp.dir" value="${ant-output.dir}/test-report.temp"/>
+
 	<patternset id="dist-jar.patternset">
 		<include name="**/*.*"/>
 		<exclude name="**/package.html"/>
 	</patternset>
-	
+
+	<!-- Testing paths -->
+	<path id="test.classpath">
+		<!--
+		<fileset dir="${dist-lib.dir}">
+			<include name="*.jar"/>
+		</fileset>--> 
+		<fileset dir="${dist-root.dir}">
+			<include name="*.jar"/>
+		</fileset>
+		<fileset dir="${lib.dir}">
+			<include name="junit*.jar"/>
+		</fileset>
+		<fileset dir="${ant-output.dir}">
+			<include name="${tests-jar.name}"/>
+		</fileset>
+	</path>
+
+	<patternset id="test.patternset">
+		<include name="**/*.*"/>
+		<exclude name="**/doc-files/**/*.*"/>
+		<exclude name="**/package.html"/>
+	</patternset>
+
 	<!-- - - - - - - - - - - - - - - - - - 
           target: emptyBuildDir                      
          - - - - - - - - - - - - - - - - - -->
@@ -21,16 +54,17 @@
     </target>
 
 	<!-- - - - - - - - - - - - - - - - - - 
-          target: createDistDir                      
+          target: emptyDistDir                      
          - - - - - - - - - - - - - - - - - -->
-    <target name="createDistDir">
+    <target name="emptyDistDir">
+    	<delete dir="${dist.dir}"/>
 		<mkdir dir="${dist.dir}"/>
     </target>
 
 	<!-- - - - - - - - - - - - - - - - - -
           target: compile              
          - - - - - - - - - - - - - - - - - -->
-    <target name="compile" depends="emptyBuildDir, createDistDir">
+    <target name="compile" depends="emptyBuildDir, emptyDistDir">
     	<!-- Compile core files -->
         <javac srcdir="${src.dir}" destdir="${build.dir}" includeantruntime="false" encoding="UTF-8" debug="true">
 			<classpath>
@@ -39,9 +73,35 @@
 				</fileset>
 			</classpath>
         </javac>
+    </target>
 
+	<!-- - - - - - - - - - - - - - - - - - 
+          target: compileTests                      
+         - - - - - - - - - - - - - - - - - -->
+   <target name="compileTests">
+    	<!-- Unzip dotify -->
+    	<delete dir="${dist-unzip.dir}"/>
+    	<unzip src="${distribution.zip}" dest="${dist-unzip.dir}"/>
+    	
+    	<delete dir="${test-build.dir}"/>
+    	<mkdir dir="${test-build.dir}"/>
+
+    	<!-- Compile test files -->
+	    <javac srcdir="${test-src.dir}" destdir="${test-build.dir}" includeantruntime="false" encoding="UTF-8">
+			<classpath>
+				<fileset dir="${dist-root.dir}">
+					<include name="*.jar"/>
+				</fileset>
+				<fileset dir="${lib.dir}">
+					<include name="junit*.jar"/>
+				</fileset>
+			</classpath>
+	    </javac>
     </target>
 
+	<!-- ================================= 
+	          target: buildJar              
+	         ================================= -->
     <target name="buildJar" description="Builds distribution jar">
     	<antcall target="compile"></antcall>
     	<jar destfile="${dist.jar}">
@@ -65,6 +125,9 @@
     	<delete dir="${build.dir}"/>
     </target>
 
+	<!-- ================================= 
+	          target: buildZip              
+	         ================================= -->
 	<target name="buildZip" depends="buildJar" description="Builds distribution zip including all required jars">
     	<zip destfile="${distribution.zip}">
     		<zipfileset file="${dist.jar}" prefix="${zip-foler-prefix}/"/>
@@ -73,6 +136,50 @@
     			<exclude name="junit*.jar"/>
     		</zipfileset>
     	</zip>
+		<delete file="${dist.jar}"/>
+	</target>
+
+	<!-- ================================= 
+	          target: buildAndTest              
+	         ================================= -->
+	<target name="buildAndTest" description="Build distribution zip and run unit tests" depends="buildZip, compileTests">
+		<jar destfile="${ant-output.dir}/${tests-jar.name}">
+    		<fileset dir="${test-build.dir}">
+    			<patternset refid="test.patternset"/>
+    		</fileset>
+			<fileset dir="${test-src.dir}">
+				<patternset refid="test.patternset"/>
+			</fileset>
+    	</jar>
+
+    	<delete dir="${test.report.dir}"/>
+    	<mkdir dir="${test.report.dir}"/>
+
+		<mkdir dir="${test.report-temp.dir}"/>
+
+		<junit fork="yes" printsummary="no" haltonfailure="no" errorproperty="testerror" failureproperty="testfail">
+			<batchtest fork="yes" todir="${test.report-temp.dir}">
+		      <fileset dir="${test-build.dir}">
+		        <include name="**/*Test.class" />
+		      </fileset>
+		    </batchtest>
+		    <formatter type="xml" />
+		    <classpath refid="test.classpath" />
+		</junit>
+		
+		<junitreport todir="${test.report.dir}">
+			<fileset dir="${test.report-temp.dir}">
+				<include name="TEST-*.xml" />
+			</fileset>
+			<report todir="${test.report.dir}" />
+		</junitreport>
+		
+		<delete dir="${test.report-temp.dir}"/>
+		<delete dir="${test-build.dir}"/>
+		<delete file="${ant-output.dir}/${tests-jar.name}"/>
+		<delete dir="${dist-unzip.dir}"/>
+
+		<fail if="testerror" message="Error in tests"/>
 	</target>
 
 </project>
diff --git a/Dotify/run-tests.xml b/Dotify/run-tests.xml
deleted file mode 100644
index 4a177ff6..00000000
--- a/Dotify/run-tests.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="runUnitTests">
-	<description>Buildfile for this project</description>
-	
-	<import file="build-properties.xml"/>
-
-	<property name="test-src.dir" value="${basedir}/test"/>
-
-	<property name="test-build.dir" value="${ant-output.dir}/test-build.temp"/>
-	<property name="tests-jar.name" value="tests-temp.jar"/>
-
-	<property name="dist-unzip.dir" value="${ant-output.dir}/test-unzip"/>
-	<property name="dist-root.dir" value="${ant-output.dir}/test-unzip/${zip-foler-prefix}"/>
-	<property name="dist-lib.dir" value="${dist-unzip.dir}/${zip-foler-prefix}/lib"/>
-	
-	<property name="test.report.dir" value="${ant-output.dir}/test-report"/>
-	<property name="test.report-temp.dir" value="${ant-output.dir}/test-report.temp"/>
-
-	<path id="test.classpath">
-		<!--
-		<fileset dir="${dist-lib.dir}">
-			<include name="*.jar"/>
-		</fileset>--> 
-		<fileset dir="${dist-root.dir}">
-			<include name="*.jar"/>
-		</fileset>
-		<fileset dir="${lib.dir}">
-			<include name="junit*.jar"/>
-		</fileset>
-		<fileset dir="${ant-output.dir}">
-			<include name="${tests-jar.name}"/>
-		</fileset>
-	</path>
-	
-	<patternset id="test.patternset">
-		<include name="**/*.*"/>
-		<exclude name="**/doc-files/**/*.*"/>
-		<exclude name="**/package.html"/>
-	</patternset>
-	
-    <target name="compileTests">
-    	<subant target="buildZip">
-    		<fileset dir="${basedir}">
-    			<include name="build.xml"/>
-    		</fileset>
-    	</subant>
-    	
-    	<!-- Unzip dotify -->
-    	<delete dir="${dist-unzip.dir}"/>
-    	<unzip src="${distribution.zip}" dest="${dist-unzip.dir}"/>
-    	
-    	<delete dir="${test-build.dir}"/>
-    	<mkdir dir="${test-build.dir}"/>
-
-    	<!-- Compile test files -->
-	    <javac srcdir="${test-src.dir}" destdir="${test-build.dir}" includeantruntime="false" encoding="UTF-8">
-			<classpath>
-				<fileset dir="${dist-root.dir}">
-					<include name="*.jar"/>
-				</fileset>
-				<fileset dir="${lib.dir}">
-					<include name="junit*.jar"/>
-				</fileset>
-			</classpath>
-	    </javac>
-    </target>
-	
-	<target name="runUnitTests" description="Run unit tests" depends="compileTests">
-		<!-- <antcall target="compileTests"/> -->
-		<jar destfile="${ant-output.dir}/${tests-jar.name}">
-    		<fileset dir="${test-build.dir}">
-    			<patternset refid="test.patternset"/>
-    		</fileset>
-			<fileset dir="${test-src.dir}">
-				<patternset refid="test.patternset"/>
-			</fileset>
-    	</jar>
-
-    	<delete dir="${test.report.dir}"/>
-    	<mkdir dir="${test.report.dir}"/>
-
-		<mkdir dir="${test.report-temp.dir}"/>
-
-		<junit fork="yes" printsummary="no" haltonfailure="no" errorproperty="testerror" failureproperty="testfail">
-			<batchtest fork="yes" todir="${test.report-temp.dir}">
-		      <fileset dir="${test-build.dir}">
-		        <include name="**/*Test.class" />
-		      </fileset>
-		    </batchtest>
-		    <formatter type="xml" />
-		    <classpath refid="test.classpath" />
-		</junit>
-		
-		<junitreport todir="${test.report.dir}">
-			<fileset dir="${test.report-temp.dir}">
-				<include name="TEST-*.xml" />
-			</fileset>
-			<report todir="${test.report.dir}" />
-		</junitreport>
-		
-		<delete dir="${test.report-temp.dir}"/>
-		<delete dir="${test-build.dir}"/>
-		<delete file="${ant-output.dir}/${tests-jar.name}"/>
-		<delete dir="${dist-unzip.dir}"/>
-
-		<fail if="testerror" message="Error in tests"/>
-	</target>
-	
-</project>