Ubujira
/
ironbarrels
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up build script.

This commit is contained in:
Christian 2012-10-21 15:29:56 -04:00
parent aa0e926532
commit db8490fd35
1 changed files with 15 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
IronChests2/build.xml
View File

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