Clean up build script.

IronChests2/build.xml

@@ -9,20 +9,6 @@
      ====================================================================== -->
 <project name="IronChest" default="build">
   <description>Iron Chest</description>
-  <macrodef name="side">
-    <attribute name="prop" />
-    <attribute name="src" />
-    <attribute name="side" />
-    <sequential>
-      <property name="@{prop}" value="${@{side}.@{src}}" />
-      <condition property="is.client">
-        <equals arg1="@{side}" arg2="client" />
-      </condition>
-      <condition property="is.server">
-        <equals arg1="@{side}" arg2="server" />
-      </condition>
-    </sequential>
-  </macrodef>
   <target name="writeversion" depends="buildenvsetup">
     <exec executable="${python.exe}" dir="${basedir}" failonerror="true">
       <arg value="${basedir}/getversion.py" />
@@ -40,7 +26,7 @@
     </tstamp>
     <property environment="env" />
     <property file="build.properties" />
-    <property name="modname" value="mod_ironchests" />
+    <property name="modname" value="ironchest" />
     <condition property="dev.home" value="${env.WORKSPACE}" else="${default.dev.home}">
       <isset property="env.WORKSPACE" />
     </condition>
@@ -51,14 +37,12 @@
       <os family="Windows" />
     </condition>
     <property name="mcp.obfoutput" location="${mcp.home}/reobf" />
-    <property name="client.mcp.obfoutput" location="${mcp.obfoutput}/minecraft" />
-    <property name="server.mcp.obfoutput" location="${mcp.obfoutput}/minecraft_server" />
+    <property name="mcp.obfoutput.classes" location="${mcp.obfoutput}/minecraft" />
     <property name="mcp.srcdir" location="${mcp.home}/src" />
     <property name="client.mcp.srcdir" location="${mcp.srcdir}/minecraft" />
-    <property name="server.mcp.srcdir" location="${mcp.srcdir}/minecraft_server" />
+    <property name="common.mcp.srcdir" location="${mcp.srcdir}/common" />
     <property name="common.src.dir" location="${basedir}/common" />
     <property name="client.src.dir" location="${basedir}/client" />
-    <property name="server.src.dir" location="${basedir}/server" />
     <property name="deploy.dir" location="${user.home}/.minecraft/mods" />
     <property name="resource.dir" location="${basedir}/resources" />
     <condition property="version.build" value="${env.BUILD_NUMBER}" else="1">
@@ -79,12 +63,7 @@
   </target>
 
   <target name="clean">
-    <antcall target="clean-source">
-      <param name="side" value="client" />
-    </antcall>
-    <antcall target="clean-source">
-      <param name="side" value="server" />
-    </antcall>
+    <antcall target="clean-source"/>
     <exec executable="${python.exe}" dir="${mcp.home}">
       <arg value="${mcp.home}/runtime/updatemd5.py" />
       <arg value="-f" />
@@ -101,34 +80,28 @@
   </target>
 
   <target name="merge-client" depends="init,clean">
-    <antcall target="merge-source">
-      <param name="side" value="client" />
-    </antcall>
+    <antcall target="merge-source"/>
   </target>
 
   <target name="merge-source">
-    <side prop="merge-to" src="mcp.srcdir" side="${side}" />
-    <side prop="side-from" src="src.dir" side="${side}" />
-
-    <copy todir="${merge-to}" overwrite="true" verbose="true">
-      <fileset dir="${side-from}" includes="**/*.java" />
+    <copy todir="${client.mcp.srcdir}" overwrite="true" verbose="true">
+      <fileset dir="${client.src.dir}" includes="**/*.java" />
+    </copy>
+    <copy todir="${common.mcp.srcdir}" overwrite="true" verbose="true">
       <fileset dir="${common.src.dir}" includes="**/*.java" />
     </copy>
   </target>
 
   <target name="build-client" depends="init,clean,merge-client,buildandreobfmcp">
     <antcall target="writeversion" />
-    <antcall target="extract-built-jar">
-      <param name="side" value="client" />
-    </antcall>
+    <antcall target="extract-built-jar"/>
   </target>
 
   <target name="extract-built-jar">
-    <side prop="output" src="mcp.obfoutput" side="${side}" />
-    <property name="jarname" value="${modname}-${side}-${version}" />
+    <property name="jarname" value="${modname}-universal-${version}" />
     <mkdir dir="${basedir}/target" />
     <jar destfile="${basedir}/target/${jarname}.zip">
-      <fileset dir="${output}" includes="**/*.class" />
+      <fileset dir="${mcp.obfoutput.classes}" includes="**/*.class" />
       <zipfileset dir="${basedir}" includes="version.properties"/>
       <mappedresources>
         <concat>
@@ -157,13 +130,11 @@
 
   <!-- antcall target to merge source to a side -->
   <target name="clean-source">
-    <side prop="delete-targ" src="mcp.srcdir" side="${side}" />
-    <side prop="side-from" src="src.dir" side="${side}" />
     <delete verbose="true">
-      <fileset dir="${delete-targ}">
-        <present present="both" targetdir="${side-from}" />
+      <fileset dir="${client.mcp.srcdir}">
+        <present present="both" targetdir="${client.src.dir}" />
       </fileset>
-      <fileset dir="${delete-targ}">
+      <fileset dir="${common.mcp.srcdir}">
         <present present="both" targetdir="${common.src.dir}" />
       </fileset>
     </delete>