From 7b5ad64378c6db5d5330ee4697ab5d88f6d211be Mon Sep 17 00:00:00 2001
From: Christian Weeks <cpw@weeksfamily.ca>
Date: Thu, 10 May 2012 13:01:39 -0400
Subject: [PATCH] Update git version capture

---
 fml/build.xml     | 44 +++++++++++++++-----------------------------
 fml/getversion.py |  1 +
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/fml/build.xml b/fml/build.xml
index f1746eba0..b89975c60 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -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">
diff --git a/fml/getversion.py b/fml/getversion.py
index 8c61a4b64..c86354afe 100644
--- a/fml/getversion.py
+++ b/fml/getversion.py
@@ -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()