From e44515304ae84d8f7a4dcfa0cc1b96f5bc7866a0 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Thu, 2 Aug 2012 10:30:52 -0230
Subject: [PATCH] Try and fix the jenkins build

---
 fml/build.xml | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/fml/build.xml b/fml/build.xml
index c6222bb00..2c4ad6952 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -90,7 +90,7 @@
     </exec>
   </target>
 
-  <target name="buildandreobfmcp" depends="buildenvsetup">
+  <target name="buildandreobfmcp" depends="buildenvsetup,fmldecompile">
     <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
       <arg value="${mcp.home}/runtime/recompile.py" />
     </exec>
@@ -230,23 +230,7 @@
       <arg value="${basedir}/download_fernflower.py" />
       <arg value="${mcp.home}"/>
     </exec>-->
-    <exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${mcp.home}/runtime/cleanup.py" />
-      <arg value="-f" />
-    </exec>
-    <exec executable="${python.exe}" dir="${basedir}">
-      <arg value="${basedir}/decompile.py" />
-      <arg value="${mcp.home}" />
-      <arg value="${basedir}" />
-    </exec>
-    <!--<exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${basedir}/cleanup_source.py" />
-      <arg value="${mcp.srcdir}" />
-    </exec>-->
-    <!--<exec executable="${python.exe}" dir="${mcp.home}">
-      <arg value="${mcp.home}/runtime/updatemd5.py" />
-      <arg value="-f" />
-    </exec>-->
+  	<antcall target="fmldecompile"/>
     <echo>Moving old patched sources at ${patch.mcp.srcdir} out of the way</echo>
     <move todir="${mcp.home}/src-work${timestamp}" failonerror="false" verbose="true">
       <fileset dir="${patch.mcp.srcdir}"/>
@@ -266,6 +250,26 @@
     <antcall target="writeversion"/>
     <echo>Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML-Server and FML-Client projects</echo>
   </target>
+	
+  <target name="fmldecompile" depends="buildenvsetup">
+    <exec executable="${python.exe}" dir="${mcp.home}">
+      <arg value="${mcp.home}/runtime/cleanup.py" />
+      <arg value="-f" />
+    </exec>
+    <exec executable="${python.exe}" dir="${basedir}">
+      <arg value="${basedir}/decompile.py" />
+      <arg value="${mcp.home}" />
+      <arg value="${basedir}" />
+    </exec>
+    <!--<exec executable="${python.exe}" dir="${mcp.home}">
+      <arg value="${basedir}/cleanup_source.py" />
+      <arg value="${mcp.srcdir}" />
+    </exec>-->
+    <!--<exec executable="${python.exe}" dir="${mcp.home}">
+      <arg value="${mcp.home}/runtime/updatemd5.py" />
+      <arg value="-f" />
+    </exec>-->
+  </target>
 
   <target name="repatch" depends="buildenvsetup,checkpatches">
     <echo>Moving old patched sources at ${mcp.home}/src-work out of the way</echo>