keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Cleaned up some tabs

Browse source
This commit is contained in:
LexManos 2012-11-19 15:00:11 -08:00
parent f842aa75bb
commit 72938c9133
1 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
fml/build.xml
View file

@ -93,16 +93,16 @@
<exec executable="${python.exe}" dir="${mcp.home}" failonerror="true"> <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
<arg value="${mcp.home}/runtime/reobfuscate.py" /> <arg value="${mcp.home}/runtime/reobfuscate.py" />
</exec> </exec>
<fail message="Reobfuscation failed"> <fail message="Reobfuscation failed">
<condition> <condition>
<not> <not>
<and> <and>
<available file="${mcp.home}/temp/client.md5"/> <available file="${mcp.home}/temp/client.md5"/>
<available file="${mcp.home}/temp/client_reobf.md5"/> <available file="${mcp.home}/temp/client_reobf.md5"/>
</and> </and>
</not> </not>
</condition> </condition>
</fail> </fail>
<exec executable="${python.exe}" dir="${mcp.home}"> <exec executable="${python.exe}" dir="${mcp.home}">
<arg value="${basedir}/generatechangedfilelist.py"/> <arg value="${basedir}/generatechangedfilelist.py"/>
<arg value="${mcp.home}"/> <arg value="${mcp.home}"/>
@ -114,13 +114,13 @@
<exec executable="${python.exe}" dir="${mcp.home}" failonerror="true"> <exec executable="${python.exe}" dir="${mcp.home}" failonerror="true">
<arg value="${mcp.home}/runtime/recompile.py" /> <arg value="${mcp.home}/runtime/recompile.py" />
</exec> </exec>
<fail message="Compilation failed"> <fail message="Compilation failed">
<condition> <condition>
<not> <not>
<available file="${mcp.home}/bin/minecraft/net/minecraft/client/Minecraft.class"/> <available file="${mcp.home}/bin/minecraft/net/minecraft/client/Minecraft.class"/>
</not> </not>
</condition> </condition>
</fail> </fail>
</target> </target>
<target name="merge-client" depends="buildenvsetup"> <target name="merge-client" depends="buildenvsetup">
@ -252,7 +252,7 @@
</condition> </condition>
<fail if="do.not.continue">You have decided not to continue. This script will stop now.</fail> <fail if="do.not.continue">You have decided not to continue. This script will stop now.</fail>
<echo>Preparing the MCP environment at ${mcp.home}</echo> <echo>Preparing the MCP environment at ${mcp.home}</echo>
<antcall target="fmldecompile"/> <antcall target="fmldecompile"/>
<echo>Moving old patched sources at ${patch.mcp.srcdir} out of the way</echo> <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"> <move todir="${mcp.home}/src-work${timestamp}" failonerror="false" verbose="true">
<fileset dir="${patch.mcp.srcdir}"/> <fileset dir="${patch.mcp.srcdir}"/>
@ -334,15 +334,15 @@
<target name="checkpatches" depends="buildenvsetup"> <target name="checkpatches" depends="buildenvsetup">
<uptodate property="checkUptodate.uptodate"> <uptodate property="checkUptodate.uptodate">
<srcfiles dir="${patch.mcp.srcdir}" includes="**/*.java"> <srcfiles dir="${patch.mcp.srcdir}" includes="**/*.java">
<present targetdir="${patch.src.dir}"> <present targetdir="${patch.src.dir}">
<globmapper from="*.java" to="*.java.patch"/> <globmapper from="*.java" to="*.java.patch"/>
</present> </present>
</srcfiles> </srcfiles>
<globmapper from="*.java" to="${patch.src.dir}/*.java.patch"/> <globmapper from="*.java" to="${patch.src.dir}/*.java.patch"/>
</uptodate> </uptodate>
<fail unless="checkUptodate.uptodate"> <fail unless="checkUptodate.uptodate">
A patch is out of date. Update your patches! A patch is out of date. Update your patches!
</fail> </fail>
</target> </target>
<target name="updatepatches" depends="buildenvsetup"> <target name="updatepatches" depends="buildenvsetup">