From ced91d5bf255351a55b99b577f56f42129c9d6d0 Mon Sep 17 00:00:00 2001
From: pahimar <pahimar@gmail.com>
Date: Fri, 12 Apr 2013 13:01:37 -0400
Subject: [PATCH] Added in support for auto-incrementing build numbers into the
 build script (and code). A nicer way to track what version folks have :)

---
 build.xml                                     | 56 +++++++++++--------
 build_number.properties                       |  3 +
 .../com/pahimar/ee3/EquivalentExchange3.java  |  2 +-
 .../pahimar/ee3/command/CommandVersion.java   |  2 +-
 .../ee3/core/helper/VersionHelper.java        | 13 ++++-
 ee3_common/com/pahimar/ee3/lib/Reference.java |  3 +-
 6 files changed, 51 insertions(+), 28 deletions(-)
 create mode 100644 build_number.properties

diff --git a/build.xml b/build.xml
index 7a4efeb6..dff5473b 100644
--- a/build.xml
+++ b/build.xml
@@ -1,53 +1,62 @@
 <?xml version="1.0" ?> 
 <project name="Equivalent Exchange 3">
 	
-	<property file="build.properties" />
+	<property file="build.properties" prefix="build"/>
+	<property file="build_number.properties" prefix="build_number"/>
+	
+	<target name="increment">
+		<propertyfile file="build_number.properties">
+			<entry key="build_number" type="int" operation="+" default="1"/>
+		</propertyfile>
+	</target>
 	
 	<target name="clean">
-		<delete file="${dir.development}\mcp\src\minecraft\mcmod.info" />
-		<delete dir="${dir.development}\mcp\src\minecraft\com" />
-		<delete dir="${dir.development}\mcp\reobf\minecraft" />
+		<delete file="${build.dir.development}\mcp\src\minecraft\mcmod.info" />
+		<delete dir="${build.dir.development}\mcp\src\minecraft\com" />
+		<delete dir="${build.dir.development}\mcp\reobf\minecraft" />
 	</target>
 	
 	<target name="build">
-		<copy todir="${dir.development}\mcp\src\minecraft">
-			<fileset dir="${dir.development}\source\Equivalent-Exchange-3\ee3_common\" />
+		<copy todir="${build.dir.development}\mcp\src\minecraft">
+			<fileset dir="${build.dir.development}\source\Equivalent-Exchange-3\ee3_common\" />
 		</copy>
-		<replace dir="${dir.development}\mcp\src\minecraft" token="@VERSION@" value="${release.mod.version}" />
-		<replace dir="${dir.development}\mcp\src\minecraft" token="@FINGERPRINT@" value="${release.mod.fingerprint}" />
+		<replace dir="${build.dir.development}\mcp\src\minecraft" token="@VERSION@" value="${build.release.mod.version}" />
+		<replace dir="${build.dir.development}\mcp\src\minecraft" token="@FINGERPRINT@" value="${build.release.mod.fingerprint}" />
+		<replace dir="${build.dir.development}\mcp\src\minecraft" token="@BUILD_NUMBER@" value="${build_number.build_number}" />
 	</target>
 	
 	<target name="recompile">
-		<exec dir="${dir.development}\mcp" executable="cmd" osfamily="windows">
+		<exec dir="${build.dir.development}\mcp" executable="cmd" osfamily="windows">
 			<arg line="/c recompile.bat" />
 		</exec>
-		<exec dir="${dir.development}\mcp" executable="bash" osfamily="unix">
+		<exec dir="${build.dir.development}\mcp" executable="bash" osfamily="unix">
 			<arg line="recompile.sh" />
 		</exec>
 	</target>
 	
 	<target name="reobfuscate">
-		<exec dir="${dir.development}\mcp" executable="cmd" osfamily="windows">
+		<exec dir="${build.dir.development}\mcp" executable="cmd" osfamily="windows">
 			<arg line="/c reobfuscate_srg.bat" />
 		</exec>
-		<exec dir="${dir.development}\mcp" executable="bash" osfamily="unix">
+		<exec dir="${build.dir.development}\mcp" executable="bash" osfamily="unix">
 			<arg line="reobfuscate_srg.sh" />
 		</exec>
 	</target>
 	
 	<target name="release-shared">
 		<!-- Prep for the release -->
+		<antcall target="increment" />
 		<antcall target="clean" />
 		<antcall target="build" />
 		<antcall target="recompile" />		
 		<antcall target="reobfuscate" />
 		
 		<!-- Build the jar -->
-		<mkdir dir="${dir.share}\${release.minecraft.version}\${release.mod.version}" />
-		<jar destfile="${dir.share}\${release.minecraft.version}\${release.mod.version}\ee3-universal-${release.mod.version}.jar">
-			<fileset dir="${dir.development}\mcp\src\common\"	includes="mcmod.info" />
-			<fileset dir="${dir.development}\mcp\reobf\minecraft" />
-			<fileset dir="${dir.development}\source\Equivalent-Exchange-3\resources" />
+		<mkdir dir="${build.dir.share}\${build.release.minecraft.version}\${build.release.mod.version}" />
+		<jar destfile="${build.dir.share}\${build.release.minecraft.version}\${build.release.mod.version}\ee3-universal-${build.release.mod.version}.${build_number.build_number}.jar">
+			<fileset dir="${build.dir.development}\mcp\src\common\"	includes="mcmod.info" />
+			<fileset dir="${build.dir.development}\mcp\reobf\minecraft" />
+			<fileset dir="${build.dir.development}\source\Equivalent-Exchange-3\resources" />
 		</jar>
 		
 		<!-- Clean up the MCP source now that we are done -->
@@ -56,21 +65,22 @@
 	
 	<target name="release">
 		<!-- Prep for the release -->
+		<antcall target="increment" />
 		<antcall target="clean" />
 		<antcall target="build" />
 		<antcall target="recompile" />		
 		<antcall target="reobfuscate" />
 		
 		<!-- Build the jar -->
-		<mkdir dir="${dir.release}\${release.minecraft.version}\${release.mod.version}" />
-		<jar destfile="${dir.release}\${release.minecraft.version}\${release.mod.version}\ee3-universal-${release.mod.version}.jar">
-			<fileset dir="${dir.development}\mcp\src\minecraft\" includes="mcmod.info" />
-			<fileset dir="${dir.development}\mcp\reobf\minecraft" />
-			<fileset dir="${dir.development}\source\Equivalent-Exchange-3\resources" />
+		<mkdir dir="${build.dir.release}\${build.release.minecraft.version}\${build.release.mod.version}" />
+		<jar destfile="${build.dir.release}\${build.release.minecraft.version}\${build.release.mod.version}\ee3-universal-${build.release.mod.version}-${build_number.build_number}.jar">
+			<fileset dir="${build.dir.development}\mcp\src\minecraft\" includes="mcmod.info" />
+			<fileset dir="${build.dir.development}\mcp\reobf\minecraft" />
+			<fileset dir="${build.dir.development}\source\Equivalent-Exchange-3\resources" />
 		</jar>
 		
 		<!-- Sign the jar -->
-		<signjar jar="${dir.release}\${release.minecraft.version}\${release.mod.version}\ee3-universal-${release.mod.version}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${keystore.password}" />
+		<signjar jar="${build.dir.release}\${build.release.minecraft.version}\${build.release.mod.version}\ee3-universal-${build.release.mod.version}-${build_number.build_number}.jar" keystore="${build.keystore.location}" alias="${build.keystore.alias}" storepass="${build.keystore.password}" />
 		
 		<!-- Clean up the MCP source now that we are done -->
 		<antcall target="clean" />
diff --git a/build_number.properties b/build_number.properties
new file mode 100644
index 00000000..9d9ab956
--- /dev/null
+++ b/build_number.properties
@@ -0,0 +1,3 @@
+#Fri, 12 Apr 2013 12:55:58 -0400
+
+build_number=5
diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java
index 657f02e9..9d6dd310 100644
--- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java
+++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java
@@ -63,7 +63,7 @@ import cpw.mods.fml.relauncher.Side;
 @Mod(
         modid = Reference.MOD_ID,
         name = Reference.MOD_NAME,
-        version = Reference.VERSION,
+        version = Reference.VERSION_NUMBER,
         dependencies = Reference.DEPENDENCIES,
         certificateFingerprint = Reference.FINGERPRINT)
 @NetworkMod(
diff --git a/ee3_common/com/pahimar/ee3/command/CommandVersion.java b/ee3_common/com/pahimar/ee3/command/CommandVersion.java
index 96ac18a3..8c9b8169 100644
--- a/ee3_common/com/pahimar/ee3/command/CommandVersion.java
+++ b/ee3_common/com/pahimar/ee3/command/CommandVersion.java
@@ -39,7 +39,7 @@ public class CommandVersion {
 
     private static void processVersionCommand(ICommandSender commandSender) {
 
-        commandSender.sendChatToPlayer(VersionHelper.getResultMessageForClient());
+        commandSender.sendChatToPlayer(VersionHelper.getResultMessage());
     }
 
     private static void processChangelogCommand(ICommandSender commandSender) {
diff --git a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java
index 7980f009..9540d715 100644
--- a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java
+++ b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java
@@ -80,7 +80,7 @@ public class VersionHelper implements Runnable {
                         ConfigurationHandler.set(Configuration.CATEGORY_GENERAL, ConfigurationSettings.LAST_DISCOVERED_VERSION_CONFIGNAME, remoteVersion);
                     }
 
-                    if (remoteVersion.equals(Reference.VERSION)) {
+                    if (remoteVersion.equalsIgnoreCase(getVersionForCheck())) {
                         result = CURRENT;
                     }
                     else {
@@ -109,6 +109,17 @@ public class VersionHelper implements Runnable {
             }
         }
     }
+    
+    private static String getVersionForCheck() {
+        String[] versionTokens = Reference.VERSION_NUMBER.split(" ");
+        
+        if (versionTokens.length >= 1) {
+            return versionTokens[0];
+        }
+        else {
+            return Reference.VERSION_NUMBER;
+        }
+    }
 
     public static void logResult() {
 
diff --git a/ee3_common/com/pahimar/ee3/lib/Reference.java b/ee3_common/com/pahimar/ee3/lib/Reference.java
index f133c8db..c07e3f29 100644
--- a/ee3_common/com/pahimar/ee3/lib/Reference.java
+++ b/ee3_common/com/pahimar/ee3/lib/Reference.java
@@ -17,7 +17,7 @@ public class Reference {
     /* General Mod related constants */
     public static final String MOD_ID = "EE3";
     public static final String MOD_NAME = "Equivalent Exchange 3";
-    public static final String VERSION = "@VERSION@";
+    public static final String VERSION_NUMBER = "@VERSION@ (build @BUILD_NUMBER@)";
     public static final String CHANNEL_NAME = MOD_ID;
     public static final String DEPENDENCIES = "required-after:Forge@[7.7.1.650,)";
     public static final String FINGERPRINT = "@FINGERPRINT@";
@@ -26,6 +26,5 @@ public class Reference {
     public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy";
     public static final String CLIENT_PROXY_CLASS = "com.pahimar.ee3.core.proxy.ClientProxy";
     public static final int VERSION_CHECK_ATTEMPTS = 3;
-    public static final float MODEL_TEXTURE_OFFSET = 0.0002F;
 
 }