mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-16 10:34:49 +00:00
Clean up build.xml script- support outputting a branched jar file
This commit is contained in:
1 parent
037dcaefea
commit
39a146f8e6
2 files changed
+21
-55
No files matched your search
@@ -9,20 +9,6 @@
|
|||||||
====================================================================== -->
|
====================================================================== -->
|
||||||
<project name="FML" default="jenkinsbuild">
|
<project name="FML" default="jenkinsbuild">
|
||||||
<description>The Forge Mod Loader</description>
|
<description>The Forge Mod Loader</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" />
|
||||||
@@ -78,6 +64,8 @@
|
|||||||
<property name="version.major" value="${fmlbuild.major.number}" />
|
<property name="version.major" value="${fmlbuild.major.number}" />
|
||||||
<property name="version.minor" value="${fmlbuild.minor.number}" />
|
<property name="version.minor" value="${fmlbuild.minor.number}" />
|
||||||
<property name="version.rev" value="${fmlbuild.revision.number}" />
|
<property name="version.rev" value="${fmlbuild.revision.number}" />
|
||||||
|
<property name="version.minecraft" value="${fmlbuild.mcversion}" />
|
||||||
|
<property name="version.branch" value="${fmlbuild.branch}" />
|
||||||
<property name="version" value="${version.major}.${version.minor}.${version.rev}.${version.build}" />
|
<property name="version" value="${version.major}.${version.minor}.${version.rev}.${version.build}" />
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
@@ -88,11 +76,7 @@
|
|||||||
</exec>
|
</exec>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="clean" depends="buildenvsetup">
|
<target name="clean" depends="buildenvsetup,makeclean" if="mcp.exists">
|
||||||
<exec executable="${python.exe}" dir="${mcp.home}">
|
|
||||||
<arg value="${mcp.home}/runtime/cleanup.py" />
|
|
||||||
<arg value="-f" />
|
|
||||||
</exec>
|
|
||||||
<exec executable="${python.exe}" dir="${mcp.home}">
|
<exec executable="${python.exe}" dir="${mcp.home}">
|
||||||
<arg value="${mcp.home}/runtime/decompile.py" />
|
<arg value="${mcp.home}/runtime/decompile.py" />
|
||||||
<arg value="-d" />
|
<arg value="-d" />
|
||||||
@@ -148,38 +132,11 @@
|
|||||||
|
|
||||||
<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,reobfuscate,makeversion"/>
|
<target name="build-universal" depends="buildenvsetup,merge-client,merge-common,reobfuscate,makeversion">
|
||||||
|
<condition property="universal.jarname" value="${modname}-universal-${version.minecraft}-${version}" else="${modname}-universal-${version.minecraft}-${version}-${version.branch}">
|
||||||
|
<equals arg1="${version.branch}" arg2="master" />
|
||||||
|
</condition>
|
||||||
|
|
||||||
<target name="extract-built-jar">
|
|
||||||
<side prop="output" src="mcp.obfoutput" side="${side}" />
|
|
||||||
<property name="jarname" value="${modname}-${side}-${version}" />
|
|
||||||
<mkdir dir="${basedir}/target" />
|
|
||||||
<zip destfile="${basedir}/target/${jarname}.zip">
|
|
||||||
<fileset dir="${output}" includes="**/*.class" />
|
|
||||||
<zipfileset dir="${basedir}" includes="fmlversion.properties"/>
|
|
||||||
<zipfileset dir="${basedir}" includes="LICENSE-fml.txt" />
|
|
||||||
<zipfileset dir="${basedir}" includes="install/CREDITS-fml.txt" fullpath="CREDITS-fml.txt"/>
|
|
||||||
<zipfileset dir="${common.src.dir}" includes="*.cfg" />
|
|
||||||
<mappedresources>
|
|
||||||
<concat>
|
|
||||||
<fileset dir="${basedir}/install" includes="README.txt" />
|
|
||||||
<filterchain>
|
|
||||||
<replacetokens>
|
|
||||||
<token key="MAJOR" value="${version.major}" />
|
|
||||||
<token key="MINOR" value="${version.minor}" />
|
|
||||||
<token key="REV" value="${version.rev}" />
|
|
||||||
<token key="BUILD" value="${version.build}" />
|
|
||||||
<token key="MCVERSION" value="${version.minecraft}" />
|
|
||||||
</replacetokens>
|
|
||||||
</filterchain>
|
|
||||||
</concat>
|
|
||||||
<mergemapper to="README-fml.txt" />
|
|
||||||
</mappedresources>
|
|
||||||
</zip>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="build-universal" depends="build-client">
|
|
||||||
<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">
|
||||||
<manifest>
|
<manifest>
|
||||||
@@ -212,7 +169,7 @@
|
|||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="build-source-pack" depends="makeversion">
|
<target name="build-source-pack" depends="makeversion">
|
||||||
<property name="srcpack.jarname" value="${modname}-src-${version}" />
|
<property name="srcpack.jarname" value="${modname}-src-${version.minecraft}-${version.branch}-${version}" />
|
||||||
<zip destfile="${basedir}/target/${srcpack.jarname}.zip">
|
<zip destfile="${basedir}/target/${srcpack.jarname}.zip">
|
||||||
<zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.cfg,mc_versions.cfg" prefix="fml" />
|
<zipfileset dir="${basedir}" includes="LICENSE-fml.txt,difflist.txt,commands.patch,mcp_merge.cfg,mc_versions.cfg" prefix="fml" />
|
||||||
<zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/common" />
|
<zipfileset dir="${common.src.dir}" includes="**/*.java" prefix="fml/common" />
|
||||||
@@ -243,7 +200,7 @@
|
|||||||
</zip>
|
</zip>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="build" depends="buildenvsetup,merge-client,merge-common,build-client,build-universal,build-source-pack" />
|
<target name="build" depends="buildenvsetup,merge-client,merge-common,build-universal,build-source-pack" />
|
||||||
|
|
||||||
<target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build"/>
|
<target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build"/>
|
||||||
|
|
||||||
@@ -282,9 +239,9 @@
|
|||||||
<fileset dir="${mcp.srcdir}"/>
|
<fileset dir="${mcp.srcdir}"/>
|
||||||
</copy>
|
</copy>
|
||||||
<antcall target="writeversion"/>
|
<antcall target="writeversion"/>
|
||||||
<echo>Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML-Server and FML-Client projects</echo>
|
<echo>Setup complete! You should now be able to open ${basedir}/eclipse as a workspace in eclipse and import/refresh the FML project</echo>
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<target name="fmldecompile" depends="buildenvsetup,makeclean">
|
<target name="fmldecompile" depends="buildenvsetup,makeclean">
|
||||||
<exec executable="${python.exe}" dir="${basedir}">
|
<exec executable="${python.exe}" dir="${basedir}">
|
||||||
<arg value="${basedir}/decompile.py" />
|
<arg value="${basedir}/decompile.py" />
|
||||||
|
|||||||
+10
-1
@@ -47,6 +47,14 @@ def main():
|
|||||||
|
|
||||||
(mcpversion,mcclientversion,mcserverversion) = re.match("[.\w]+ \(data: ([.\w]+), client: ([.\w.]+), server: ([.\w.]+)\)",Commands.fullversion()).groups()
|
(mcpversion,mcclientversion,mcserverversion) = re.match("[.\w]+ \(data: ([.\w]+), client: ([.\w.]+), server: ([.\w.]+)\)",Commands.fullversion()).groups()
|
||||||
|
|
||||||
|
cmd = "git rev-parse --abbrev-ref HEAD"
|
||||||
|
try:
|
||||||
|
process = subprocess.Popen(cmdsplit(cmd), stdout=subprocess.PIPE, stderr=subprocess.STDOUT, bufsize=-1)
|
||||||
|
branch, _ = process.communicate()
|
||||||
|
except OSError:
|
||||||
|
print("Git not found")
|
||||||
|
branch="none"
|
||||||
|
|
||||||
with open("fmlversion.properties","w") as f:
|
with open("fmlversion.properties","w") as f:
|
||||||
f.write("%s=%s\n" %("fmlbuild.major.number",major))
|
f.write("%s=%s\n" %("fmlbuild.major.number",major))
|
||||||
f.write("%s=%s\n" %("fmlbuild.minor.number",minor))
|
f.write("%s=%s\n" %("fmlbuild.minor.number",minor))
|
||||||
@@ -54,8 +62,9 @@ def main():
|
|||||||
f.write("%s=%s\n" %("fmlbuild.githash",githash))
|
f.write("%s=%s\n" %("fmlbuild.githash",githash))
|
||||||
f.write("%s=%s\n" %("fmlbuild.mcpversion",mcpversion))
|
f.write("%s=%s\n" %("fmlbuild.mcpversion",mcpversion))
|
||||||
f.write("%s=%s\n" %("fmlbuild.mcversion",mcclientversion))
|
f.write("%s=%s\n" %("fmlbuild.mcversion",mcclientversion))
|
||||||
|
f.write("%s=%s\n" %("fmlbuild.branch",branch))
|
||||||
|
|
||||||
print("Version information: FML %s.%s.%s using MCP %s for minecraft %s" % (major, minor, rev, mcpversion, mcclientversion))
|
print("Version information: FML %s.%s.%s (%s) using MCP %s for minecraft %s" % (major, minor, rev, branch, mcpversion, mcclientversion))
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
Reference in new issue
Block a user