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

More build fixes for jenkins

This commit is contained in:
Christian 2012-08-02 10:33:29 -02:30
parent e44515304a
commit b51c357d50
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fml/build.xml
View File

@ -90,7 +90,7 @@
</exec> </exec>
</target> </target>
<target name="buildandreobfmcp" depends="buildenvsetup,fmldecompile"> <target name="buildandreobfmcp" depends="buildenvsetup">
<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>
@ -136,13 +136,13 @@
</copy> </copy>
</target> </target>
<target name="build-client" depends="buildenvsetup,merge-client,buildandreobfmcp,makeversion"> <target name="build-client" depends="buildenvsetup,fmldecompile,merge-client,buildandreobfmcp,makeversion">
<antcall target="extract-built-jar"> <antcall target="extract-built-jar">
<param name="side" value="client" /> <param name="side" value="client" />
</antcall> </antcall>
</target> </target>
<target name="build-server" depends="buildenvsetup,merge-server,buildandreobfmcp,makeversion"> <target name="build-server" depends="buildenvsetup,fmldecompile,merge-server,buildandreobfmcp,makeversion">
<antcall target="extract-built-jar"> <antcall target="extract-built-jar">
<param name="side" value="server" /> <param name="side" value="server" />
</antcall> </antcall>
@ -207,7 +207,7 @@
<target name="build" depends="buildenvsetup,merge-server,merge-client,build-server,build-client,build-source-pack" /> <target name="build" depends="buildenvsetup,merge-server,merge-client,build-server,build-client,build-source-pack" />
<target name="jenkinsbuild" depends="buildenvsetup,patch,build"/> <target name="jenkinsbuild" depends="buildenvsetup,fmldecompile,patch,build"/>
<target name="patch" depends="buildenvsetup"> <target name="patch" depends="buildenvsetup">
<exec executable="${python.exe}" dir="${basedir}"> <exec executable="${python.exe}" dir="${basedir}">