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

Update git version capture

Browse source
This commit is contained in:
Christian Weeks 2012-05-10 13:01:39 -04:00
parent be9557b8ef
commit 7b5ad64378
2 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
fml/build.xml
View file

@ -23,47 +23,22 @@
</condition>
</sequential>
</macrodef>
<target name="revision">
<target name="writeversion">
<exec executable="${python.exe}" dir="${basedir}" failonerror="true">
<arg value="${basedir}/getversion.py" />
</exec>
<propertyfile file="fmlversion.properties">
<entry key="fmlbuild.revision.number" type="int" operation="+" value="1" pattern="0" />
<entry key="fmlbuild.build.number" type="int" value="${version.build}"/>
</propertyfile>
</target>
<target name="minor">
<propertyfile file="fmlversion.properties">
<entry key="fmlbuild.minor.number" type="int" operation="+" value="1" pattern="0" />
<entry key="fmlbuild.revision.number" type="int" value="0" pattern="0" />
</propertyfile>
</target>
<target name="major">
<propertyfile file="fmlversion.properties">
<entry key="fmlbuild.major.number" type="int" operation="+" value="1" pattern="0" />
<entry key="fmlbuild.minor.number" type="int" value="0" pattern="0" />
<entry key="fmlbuild.revision.number" type="int" value="0" pattern="0" />
</propertyfile>
</target>
<target name="init">
<tstamp>
<format pattern="yyMMddHHmmss" property="timestamp" />
</tstamp>
<property environment="env" />
<property file="fmlbuild.properties" />
<property file="fmlversion.properties" />
<property name="build.number" value="${fmlbuild.major.number}.${fmlbuild.minor.number}.${fmlbuild.revision.number}" />
<condition property="version.build" value="${env.BUILD_NUMBER}" else="1">
<isset property="env.BUILD_NUMBER" />
</condition>
<antcall target="revision" />
<property name="modname" value="fml" />
<property name="version.minecraft" value="${fmlbuild.mcversion}" />
<property name="version.major" value="${fmlbuild.major.number}" />
<property name="version.minor" value="${fmlbuild.minor.number}" />
<property name="version.rev" value="${fmlbuild.revision.number}" />
<property name="version" value="${version.major}.${version.minor}.${version.rev}.${version.build}" />
<condition property="dev.home" value="${env.WORKSPACE}" else="${default.dev.home}">
<isset property="env.WORKSPACE" />
</condition>
@ -83,6 +58,17 @@
<property name="client.src.dir" location="${basedir}/client" />
<property name="server.src.dir" location="${basedir}/server" />
<property name="patch.src.dir" location="${basedir}/patches" />
<condition property="version.build" value="${env.BUILD_NUMBER}" else="1">
<isset property="env.BUILD_NUMBER" />
</condition>
<antcall target="writeversion" />
<property file="fmlversion.properties" />
<property name="build.number" value="${fmlbuild.major.number}.${fmlbuild.minor.number}.${fmlbuild.revision.number}" />
<property name="version.minecraft" value="${fmlbuild.mcversion}" />
<property name="version.major" value="${fmlbuild.major.number}" />
<property name="version.minor" value="${fmlbuild.minor.number}" />
<property name="version.rev" value="${fmlbuild.revision.number}" />
<property name="version" value="${version.major}.${version.minor}.${version.rev}.${version.build}" />
</target>
<target name="clean">

1
fml/getversion.py
View file

@ -40,6 +40,7 @@ def main():
f.write("%s=%s\n" %("fmlbuild.minor.number",minor))
f.write("%s=%s\n" %("fmlbuild.revision.number",rev))
f.write("%s=%s\n" %("fmlbuild.githash",githash))
f.write("%s=%s\n" %("fmlbuild.mcversion","1.2.5"))
if __name__ == '__main__':
main()