X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=build.xml;h=30f62d25b5109c18b6956348dc39aa65dc75851f;hb=b9f83af3c80c2ecd795afd9d97efa44eb8026ded;hp=b77dd04ff00861074af6af99cdf6f43996891a61;hpb=d8776d61bfa934a68829d9971bb89311e55c67cf;p=debian%2Fopenrocket

diff --git a/build.xml b/build.xml
index b77dd04f..30f62d25 100644
--- a/build.xml
+++ b/build.xml
@@ -23,7 +23,6 @@
 	
 	<!-- The main class of the application -->
 	<property name="main-class"  value="net.sf.openrocket.startup.Startup"/>
-	<property name="main-dir" value="net/sf/openrocket/startup"/>
 
 	
 	<!-- Classpath definitions -->
@@ -36,8 +35,8 @@
 		<pathelement location="${basedir}"/>
 		<pathelement location="${build-test.dir}"/>
 		<pathelement location="${classes.dir}"/>
-<!--		<pathelement location="${ant.library.dir}/junit4.jar"/> -->
-		<pathelement location="lib-test/junit-4.7.jar"/>
+		<pathelement location="${src-test.dir}"/>
+		<fileset dir="lib-test/" includes="*.jar"/>
 	</path>
 	
 
@@ -52,10 +51,9 @@
 	<!-- BUILD -->
 	<target name="build">
 		<mkdir dir="${classes.dir}"/>
-		<echo>Compiling main classes</echo>
-		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" excludes="${main-dir}/*" classpathref="classpath"/>
-		<echo>Compiling startup classes</echo>
-		<javac debug="true" srcdir="${src.dir}/${main-dir}" destdir="${classes.dir}" source="1.4" classpathref="classpath"/>
+		<echo level="info">Compiling main classes</echo>
+		<javac debug="true" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+		<echo level="info">Copying build.properties</echo>
 		<copy file="build.properties" todir="${dist.dir}"/>
 	</target>
 	
@@ -64,7 +62,7 @@
 	<target name="jar" depends="build">
 		<copy todir="${dist.dir}/">
 			<fileset dir="." includes="LICENSE.TXT README.TXT ChangeLog ReleaseNotes build.properties fileformat.txt" />
-			<fileset dir="." includes="datafiles/ pix/" />
+			<fileset dir="." includes="datafiles/ pix/ l10n/" />
 		</copy>
 		<mkdir dir="${jar.dir}"/>
 		<jar destfile="${jar.file}" basedir="${dist.dir}">
@@ -75,6 +73,7 @@
 			<zipfileset src="lib/miglayout15-swing.jar" />
 			<zipfileset src="lib/jcommon-1.0.16.jar" />
 			<zipfileset src="lib/jfreechart-1.0.13.jar" />
+			<zipfileset src="lib/iText-5.0.2.jar" />
 		</jar>
 	</target>
 	
@@ -90,7 +89,7 @@
 			<fileset dir="." includes="*">
 				<type type="file"/>
 			</fileset>
-			<fileset dir="." includes="datafiles/ lib/ pix/ src/ test/"/>
+			<fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/"/>
 		</copy>
 		<zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
 		<delete dir="${build.dir}/${pkgname}"/>
@@ -115,7 +114,7 @@
 	
 	
 	<!-- DIST-BIN -->
-	<target name="dist-bin" depends="checktodo,clean,unittest,jar">
+	<target name="dist-bin" depends="check,clean,unittest,jar">
 		<move file="${jar.file}" tofile="${dist.bin}"/>
 	</target>
 
@@ -126,7 +125,11 @@
 	</target>
 	
 	
+	<!-- CHECK -->
+	<target name="check" depends="checktodo,checkascii"/>
+	
 	<!-- CHECK TODOs -->
+	<target name="todo" depends="checktodo"/>
 	<target name="checktodo">
 		<tempfile property="todo.file" prefix="checktodo-"/>
 		<echo>Checking project for critical TODOs.</echo>
@@ -134,6 +137,9 @@
 			<fileset dir="${src.dir}">
 			    <include name="**/*.java"/>
 			</fileset>
+			<fileset dir="${src-test.dir}">
+			    <include name="**/*.java"/>
+			</fileset>
 			<filterchain>
 				<linecontainsregexp>
 					<regexp pattern="TODO:.*CRITICAL"/>
@@ -148,6 +154,32 @@ ${criticaltodos}</fail>
 	</target>
 	
 	
+	<!-- CHECK TODOs -->
+	<target name="ascii" depends="checkascii"/>
+	<target name="checkascii">
+		<tempfile property="ascii.file" prefix="checkascii-"/>
+		<echo>Checking project for non-ASCII characters.</echo>
+		<concat destfile="${ascii.file}">
+			<fileset dir="${src.dir}">
+			    <include name="**/*.java"/>
+			</fileset>
+			<fileset dir="${src-test.dir}">
+			    <include name="**/*.java"/>
+			</fileset>
+			<filterchain>
+				<linecontainsregexp>
+					<regexp pattern="\P{ASCII}"/>
+				</linecontainsregexp>
+			</filterchain>
+		</concat>
+		<loadfile srcfile="${ascii.file}" property="nonascii"/>
+		<delete file="${ascii.file}"/>
+		<fail if="nonascii">Non-ASCII characters exist in project:
+${nonascii}</fail>
+		<echo>No non-ASCII characters in project.</echo>
+	</target>
+	
+	
 	<!--  Unit tests  -->
 	<target name="unittest" description="Execute unit tests" depends="build">
 		<echo>Building unit tests</echo>
@@ -156,14 +188,16 @@ ${criticaltodos}</fail>
 		
 		<echo>Running unit tests</echo>
 		<mkdir dir="tmp/rawtestoutput"/>
-		<junit printsummary="true" failureproperty="junit.failure">
+		<junit fork="yes" forkmode="once" printsummary="false" failureproperty="junit.failure">
 			<classpath>
 				<path refid="test-classpath"/>
 				<path location="${basedir}"/>
 			</classpath>
 			<batchtest todir="tmp/rawtestoutput">
 				<fileset dir="${build-test.dir}">
-					<include name="**/*Test*.class" />
+					<include name="**/Test*.class" />
+					<include name="**/*Test.class" />
+					<exclude name="**/*$*.class" />
 					<exclude name="Test.class" />
 				</fileset>
 				<formatter type="xml"/>
@@ -173,7 +207,10 @@ ${criticaltodos}</fail>
 			<fileset dir="tmp/rawtestoutput"/>
 			<report todir="tmp/test-reports"/>
 		</junitreport>
-		<fail if="junit.failure" message="Unit test(s) failed.  See reports!"/>
+		<fail if="junit.failure" message="Unit test(s) failed.  See report in ${basedir}/tmp/test-reports/index.html"/>
+		<echo>
+	Unit tests passed successfully.
+		</echo>
  	</target>
     
 </project>
\ No newline at end of file