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

Update build to not bother building client jar. Universal is everything

Browse source 
now.
This commit is contained in:
Christian 2012-08-22 11:12:26 -04:00
parent f9332bab3a
commit 09fe35d43c
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fml/build.xml
View file

@ -89,7 +89,7 @@
</exec> </exec>
</target> </target>
<target name="buildandreobfmcp" depends="buildenvsetup,recompile"> <target name="reobfuscate" depends="buildenvsetup,recompile">
<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>
@ -137,11 +137,7 @@
<target name="merge-source" depends="buildenvsetup,merge-client,merge-common" /> <target name="merge-source" depends="buildenvsetup,merge-client,merge-common" />
<target name="build-client" depends="buildenvsetup,merge-client,merge-common,buildandreobfmcp,makeversion"> <target name="build-client" depends="buildenvsetup,merge-client,merge-common,reobfuscate,makeversion"/>
<antcall target="extract-built-jar">
<param name="side" value="client" />
</antcall>
</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}" />
@ -171,7 +167,7 @@
</zip> </zip>
</target> </target>
<target name="build-universal"> <target name="build-universal" depends="build-client">
<property name="universal.jarname" value="${modname}-universal-${version}" /> <property name="universal.jarname" value="${modname}-universal-${version}" />
<mkdir dir="${basedir}/target" /> <mkdir dir="${basedir}/target" />
<jar destfile="${basedir}/target/${universal.jarname}.zip" duplicate="preserve"> <jar destfile="${basedir}/target/${universal.jarname}.zip" duplicate="preserve">
@ -352,7 +348,7 @@
</exec> </exec>
</target> </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}"> <copy todir="${tmp.mcp.srcdir}">
<fileset dir="${mcp.srcdir}"/> <fileset dir="${mcp.srcdir}"/>
</copy> </copy>