Fix build for jenkins?

This commit is contained in:
Christian Weeks 2012-03-29 02:18:58 -04:00
parent 735659022a
commit 1574da4102
1 changed files with 55 additions and 50 deletions

View File

@ -11,16 +11,41 @@
<description> <description>
Iron Chests Iron Chests
</description> </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="init">
<tstamp>
<format pattern="yyMMddHHmmss" property="timestamp" />
</tstamp>
<property environment="env" />
<property name="modname" value="mod_ironchests" /> <property name="modname" value="mod_ironchests" />
<property name="version.file" value="cpw/mods/ironchest/Version.java"/> <property name="version.file" value="cpw/mods/ironchest/Version.java" />
<property name="version.major" value="3"/> <property name="version.major" value="3" />
<property name="version.minor" value="2"/> <property name="version.minor" value="2" />
<property name="version.rev" value="0"/> <property name="version.rev" value="0" />
<property name="version.build" value="${BUILD_NO}" else="0"/> <condition property="version.build" value="${env.BUILD_NO}" else="0">
<isset property="env.WORKSPACE" />
</condition>
<property name="version" value="${version.major}.${version.minor}.${version.rev}.${version.build}" /> <property name="version" value="${version.major}.${version.minor}.${version.rev}.${version.build}" />
<property name="mcdev.home" location="${WORKSPACE}" else="/home/cpw/projects/mcworkspace"/> <condition property="mcdev.home" value="${env.WORKSPACE}" else="/home/cpw/projects/mcworkspace">
<property name="mcp.home" location="${WORKSPACE}/mcpworkspace" else="${mcdev.home}/forge67" /> <isset property="env.WORKSPACE" />
</condition>
<condition property="mcp.home" value="${env.WORKSPACE}/mcpworkspace" else="${mcdev.home}/forge67">
<isset property="env.WORKSPACE" />
</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="client.mcp.obfoutput" location="${mcp.obfoutput}/minecraft" />
<property name="server.mcp.obfoutput" location="${mcp.obfoutput}/minecraft_server" /> <property name="server.mcp.obfoutput" location="${mcp.obfoutput}/minecraft_server" />
@ -32,26 +57,6 @@
<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="server.src.dir" location="${basedir}/server" />
<property name="resource.dir" location="${basedir}/resources" /> <property name="resource.dir" location="${basedir}/resources" />
<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="init">
<tstamp>
<format pattern="yyMMddHHmmss" property="timestamp" />
</tstamp>
</target> </target>
<target name="clean"> <target name="clean">
<antcall target="clean-source"> <antcall target="clean-source">
@ -61,7 +66,7 @@
<param name="side" value="server" /> <param name="side" value="server" />
</antcall> </antcall>
<exec executable="${mcp.home}/updatemd5.sh" dir="${mcp.home}"> <exec executable="${mcp.home}/updatemd5.sh" dir="${mcp.home}">
<arg value="-f"/> <arg value="-f" />
</exec> </exec>
</target> </target>
@ -78,14 +83,14 @@
</target> </target>
<target name="extract-built-jar"> <target name="extract-built-jar">
<side prop="output" src="mcp.obfoutput" side="${side}"/> <side prop="output" src="mcp.obfoutput" side="${side}" />
<property name="jarname" value="${modname}-${side}-${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="${output}" includes="**/*.class" />
<fileset dir="${resource.dir}" erroronmissingdir="false"> <fileset dir="${resource.dir}" erroronmissingdir="false">
<selector if="is.client"> <selector if="is.client">
<filename name="**/*.png"/> <filename name="**/*.png" />
</selector> </selector>
</fileset> </fileset>
</jar> </jar>
@ -93,13 +98,13 @@
<target name="build" depends="merge-client,merge-server,build-client,build-server" /> <target name="build" depends="merge-client,merge-server,build-client,build-server" />
<target name="buildandclean" depends="build"> <target name="buildandclean" depends="build">
<antcall target="clean"/> <antcall target="clean" />
</target> </target>
<!-- 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="delete-targ" src="mcp.srcdir" side="${side}" />
<side prop="side-from" src="src.dir" side="${side}"/> <side prop="side-from" src="src.dir" side="${side}" />
<delete verbose="true"> <delete verbose="true">
<fileset dir="${delete-targ}"> <fileset dir="${delete-targ}">
<present present="both" targetdir="${side-from}" /> <present present="both" targetdir="${side-from}" />
@ -111,8 +116,8 @@
</target> </target>
<target name="merge-source"> <target name="merge-source">
<side prop="merge-to" src="mcp.srcdir" side="${side}"/> <side prop="merge-to" src="mcp.srcdir" side="${side}" />
<side prop="side-from" src="src.dir" side="${side}"/> <side prop="side-from" src="src.dir" side="${side}" />
<copy todir="${merge-to}" overwrite="true" verbose="true"> <copy todir="${merge-to}" overwrite="true" verbose="true">
<fileset dir="${side-from}" includes="**/*.java" /> <fileset dir="${side-from}" includes="**/*.java" />