Merge remote-tracking branch 'upstream/13.09dev' into feature-motorfilter

build.xml

@@ -1,24 +1,56 @@
 <project name="OpenRocket" basedir="." default="jar">
 
-	<target name="clean">
+    <!-- CLEAN -->
+
+	<target name="clean" depends="clean-core, clean-swing">
+	</target>
+
+	<target name="clean-core">
 		<ant dir="core" target="clean"/>
+	</target>
+
+	<target name="clean-swing">
 		<ant dir="swing" target="clean"/>
 	</target>
 
-	<target name="build">
+
+    <!-- BUILD -->
+
+	<target name="build" depends="build-core, build-swing">
+	</target>
+
+	<target name="build-core">
 		<ant dir="core" target="build"/>
+	</target>
+	
+	<target name="build-swing" depends="jar-core">
 		<ant dir="swing" target="build"/>
 	</target>
 
-	<target name="jar">
+    <!-- JAR -->
+	
+	<target name="jar" depends="jar-core,jar-swing">
+	</target>
+	
+	<target name="jar-core" depends="build-core">
 		<ant dir="core" target="jar"/>
+	</target>
+	
+	<target name="jar-swing" depends="build-swing">
 		<ant dir="swing" target="jar"/>
 	</target>
 
+    <!-- TEST -->
 	
-	<target name="unittest" depends="jar">
+	<target name="unittest" depends="unittest-core, unittest-swing">
-		<ant dir="core" target="unittest"/>
+	</target>
-		<ant dir="swing" target="unittest"/>
+	
+	<target name="unittest-core" depends="jar-core">
+		<ant dir="core" target="unittest" inheritAll="false" />
+	</target>
+	
+	<target name="unittest-swing" depends="jar-swing">
+		<ant dir="swing" target="unittest" inheritAll="false" />
 	</target>
 
     <!-- CHECK -->
@@ -55,7 +87,6 @@ ${criticaltodos}</fail>
         <echo>No critical TODOs in project.</echo>
     </target>
 
-	
     <!-- CHECK ASCII -->
     <target name="ascii" depends="checkascii"/>
     <target name="checkascii">
@@ -87,5 +118,4 @@ ${nonascii}</fail>
         <echo>No non-ASCII characters in project.</echo>
     </target>
 
-	
 </project>