From ddfc2b400339bdf24d839e7ed8d726fd10f9138c Mon Sep 17 00:00:00 2001
From: Andrew Hurle <fracture91@gmail.com>
Date: Sun, 17 Feb 2013 17:20:25 -0500
Subject: [PATCH] Implement dist target for Janeway and DefectTracker

---
 .gitignore              |  1 +
 DefectTracker/build.xml |  4 ++++
 Janeway/build.xml       | 16 ++++++++++++++++
 build.xml               |  5 +++++
 dependencies.xml        |  3 +++
 5 files changed, 29 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8055e507f4..5b78b0b77a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ Servers\.settings\*
 Servers\.settings
 javadoc
 test-results
+dist
 
 # Package Files #
 *.war
diff --git a/DefectTracker/build.xml b/DefectTracker/build.xml
index 791f2eb835..f7da686d0e 100644
--- a/DefectTracker/build.xml
+++ b/DefectTracker/build.xml
@@ -73,5 +73,9 @@
 			</batchtest>
 		</junit>
 	</target>
+	
+	<target name="dist" depends="compile">
+		<copy file="${janeway-jar-dest}" todir="${dist}/janeway/modules" overwrite="true"/>
+	</target>
 
 </project>
diff --git a/Janeway/build.xml b/Janeway/build.xml
index a5084e8def..0edfaa2945 100644
--- a/Janeway/build.xml
+++ b/Janeway/build.xml
@@ -36,6 +36,7 @@
 	<target name="clean">
 		<delete dir="build"/>
 		<delete dir="build-test"/>
+		<delete dir="dist"/>
 	</target>
 
 	<target name="test" depends="compile-test">
@@ -50,4 +51,19 @@
 		</junit>
 	</target>
 
+	<target name="dist" depends="compile">
+		<jar destfile="${dist}/janeway/janeway.jar" filesetmanifest="mergewithoutmain">
+			<manifest>
+				<attribute name="Main-Class" value="edu.wpi.cs.wpisuitetng.janeway.Janeway"/>
+				<attribute name="Class-Path" value="."/>
+			</manifest>
+			<fileset dir="build"/>
+			<fileset dir="../Core/WPISuite-Interfaces/build"/>
+			<fileset dir="../Network/build"/>
+			<zipfileset src="${core-lib}/gson-2.2.2.jar"/>
+			<zipfileset src="${core-lib}/commons-codec-1.7.jar"/>
+		</jar>
+		<copy file="modules.conf" todir="${dist}/janeway" overwrite="true"/>
+	</target>
+
 </project>
diff --git a/build.xml b/build.xml
index 42372780d1..08f5226914 100644
--- a/build.xml
+++ b/build.xml
@@ -12,6 +12,7 @@
 
 	<target name="clean" description="Deletes build files">
 		<delete dir="${test-results}"/>
+		<delete dir="${dist}"/>
 		<antcall target="depend.all">
 			<param name="dependency.target" value="clean"/>
 		</antcall>
@@ -24,6 +25,10 @@
 	</target>
 
 	<target name="dist" description="Creates distributable">
+		<mkdir dir="${dist}"/>
+		<mkdir dir="${dist}/janeway"/>
+		<mkdir dir="${dist}/janeway/modules"/>
+		<mkdir dir="${dist}/core"/>
 		<antcall target="depend.all">
 			<param name="dependency.target" value="dist"/>
 		</antcall>
diff --git a/dependencies.xml b/dependencies.xml
index 8a7514b4bb..9d891c6220 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -5,6 +5,9 @@
 	<!-- All test targets should output JUnit's XML reports to this directory -->
 	<property name="test-results" location="${dependencies.basedir}/test-results"/>
 
+	<!-- All dist targets should put distributables somewhere within this directory -->
+	<property name="dist" location="${dependencies.basedir}/dist"/>
+
 	<!-- This target should have dependencies such that all projects are depended upon -->
 	<target name="depend.all"
 		depends="depend.Janeway, depend.WPISuite, depend.DefectTracker, depend.PostBoard">