X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=build.xml;h=0ebe47092b7dc3a9b1d2c9d4aea9d590726f3b4f;hb=eff42671f65849def434559fa72545f2fdfeb0d1;hp=0540b3dc611aa451d74ee2562ad63465ee2834a2;hpb=90e98a95b548c88efd882e8e74bc4b36dd9af8b7;p=debian%2Fopenrocket

diff --git a/build.xml b/build.xml
index 0540b3dc..0ebe4709 100644
--- a/build.xml
+++ b/build.xml
@@ -36,11 +36,7 @@
 		<pathelement location="${build-test.dir}"/>
 		<pathelement location="${classes.dir}"/>
 		<pathelement location="${src-test.dir}"/>
-		<pathelement location="lib-test/junit-dep-4.8.2.jar"/>
-		<pathelement location="lib-test/hamcrest-core-1.3.0RC1.jar"/>
-		<pathelement location="lib-test/hamcrest-library-1.3.0RC1.jar"/>
-		<pathelement location="lib-test/jmock-2.6.0-RC2.jar"/>
-		<pathelement location="lib-test/jmock-junit4-2.6.0-RC2.jar"/>
+		<fileset dir="lib-test/" includes="*.jar"/>
 	</path>
 	
 
@@ -66,7 +62,8 @@
 	<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/" />
+			<fileset dir="src/" includes="META-INF/" />
 		</copy>
 		<mkdir dir="${jar.dir}"/>
 		<jar destfile="${jar.file}" basedir="${dist.dir}">
@@ -77,6 +74,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>
 	
@@ -89,10 +87,10 @@
 		<mkdir dir="${build.dir}/${pkgname}"/>
 		<mkdir dir="${jar.dir}"/>
 		<copy todir="${build.dir}/${pkgname}">
-			<fileset dir="." includes="*">
+			<fileset dir="." includes="*" excludes="*.log">
 				<type type="file"/>
 			</fileset>
-			<fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/"/>
+			<fileset dir="." includes="datafiles/ lib/ lib-test/ pix/ src/ test/ l10n/"/>
 		</copy>
 		<zip destfile="${dist.src}" basedir="${build.dir}" includes="${pkgname}/"/>
 		<delete dir="${build.dir}/${pkgname}"/>
@@ -135,7 +133,7 @@
 	<target name="todo" depends="checktodo"/>
 	<target name="checktodo">
 		<tempfile property="todo.file" prefix="checktodo-"/>
-		<echo>Checking project for critical TODOs.</echo>
+		<echo>Checking project for FIXMEs.</echo>
 		<concat destfile="${todo.file}">
 			<fileset dir="${src.dir}">
 			    <include name="**/*.java"/>
@@ -145,7 +143,7 @@
 			</fileset>
 			<filterchain>
 				<linecontainsregexp>
-					<regexp pattern="TODO:.*CRITICAL"/>
+					<regexp pattern="(FIXME|TODO:.*CRITICAL)"/>
 				</linecontainsregexp>
 			</filterchain>
 		</concat>