From 09fe35d43c33e3f4084d1c3628b1dd6f089421c9 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Wed, 22 Aug 2012 11:12:26 -0400
Subject: [PATCH] Update build to not bother building client jar. Universal is
 everything now.

---
 fml/build.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/fml/build.xml b/fml/build.xml
index bb28586dc..24c6459dd 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -89,7 +89,7 @@
     </exec>
   </target>
 
-  <target name="buildandreobfmcp" depends="buildenvsetup,recompile">
+  <target name="reobfuscate" depends="buildenvsetup,recompile">
     <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
       <arg value="${mcp.home}/runtime/reobfuscate.py" />
     </exec>
@@ -137,11 +137,7 @@
 
   <target name="merge-source" depends="buildenvsetup,merge-client,merge-common" />
 
-  <target name="build-client" depends="buildenvsetup,merge-client,merge-common,buildandreobfmcp,makeversion">
-    <antcall target="extract-built-jar">
-      <param name="side" value="client" />
-    </antcall>
-  </target>
+  <target name="build-client" depends="buildenvsetup,merge-client,merge-common,reobfuscate,makeversion"/>
 
   <target name="extract-built-jar">
     <side prop="output" src="mcp.obfoutput" side="${side}" />
@@ -171,7 +167,7 @@
     </zip>
   </target>
 
-  <target name="build-universal">
+  <target name="build-universal" depends="build-client">
     <property name="universal.jarname" value="${modname}-universal-${version}" />
     <mkdir dir="${basedir}/target" />
     <jar destfile="${basedir}/target/${universal.jarname}.zip" duplicate="preserve">
@@ -352,7 +348,7 @@
     </exec>
   </target>
 
-  <target name="makerenamedsource" depends="buildenvsetup,repatch,merge-client,merge-common,buildandreobfmcp">
+  <target name="makerenamedsource" depends="buildenvsetup,repatch,merge-client,merge-common,reobfuscate">
     <copy todir="${tmp.mcp.srcdir}">
       <fileset dir="${mcp.srcdir}"/>
     </copy>