From e67c5c7f247e0d7a6563d6210adb4733e54a0b04 Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Tue, 8 Mar 2011 21:54:18 -0700
Subject: [PATCH] put build.xml back to upstream version

---
 build.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index 3482ffec..30f62d25 100644
--- a/build.xml
+++ b/build.xml
@@ -13,6 +13,7 @@
 	
 	<property name="classes.dir" value="${dist.dir}"/>	<!-- Directory for classes -->
 	<property name="jar.dir"     value="${build.dir}/jar"/>	<!-- Directory for built jar's -->
+	<property name="lib.dir"     value="lib"/>				<!-- Library source directory -->
 
 	<property name="pkgname"     value="${ant.project.name}-${build.version}"/>
 	
@@ -26,10 +27,7 @@
 	
 	<!-- Classpath definitions -->
 	<path id="classpath">
-		<!-- update manifest class-path definition below too when making changes here -->
-		<pathelement location="/usr/share/java/jcommon.jar"/>
-		<pathelement location="/usr/share/java/jfreechart.jar"/>
-		<pathelement location="/usr/share/java/miglayout.jar"/>
+		<fileset dir="${lib.dir}" includes="**/*.jar"/>
 	</path>
 	
 	<path id="test-classpath">
@@ -38,7 +36,7 @@
 		<pathelement location="${build-test.dir}"/>
 		<pathelement location="${classes.dir}"/>
 		<pathelement location="${src-test.dir}"/>
-		<pathelement location="/usr/share/java/junit4.jar"/>
+		<fileset dir="lib-test/" includes="*.jar"/>
 	</path>
 	
 
@@ -71,9 +69,11 @@
 			<manifest>
 				<attribute name="Main-Class" value="${main-class}"/>
 				<attribute name="SplashScreen-Image" value="pix/splashscreen.png"/>
-				<attribute name="Class-Path" value="/usr/share/j
-ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /usr/share/java/itext.jar"/>
 			</manifest>
+			<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,7 +89,7 @@ ava/jcommon.jar /usr/share/java/jfreechart.jar /usr/share/java/miglayout.jar /us
 			<fileset dir="." includes="*">
 				<type type="file"/>
 			</fileset>
-			<fileset dir="." includes="datafiles/ 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}"/>
@@ -213,4 +213,4 @@ ${nonascii}</fail>
 		</echo>
  	</target>
     
-</project>
+</project>
\ No newline at end of file
-- 
2.47.2