From 4bb5278d4d4add03ad7c6e784adc1b7530d8d637 Mon Sep 17 00:00:00 2001
From: pahimar <pahimar@gmail.com>
Date: Thu, 18 Apr 2013 16:14:58 -0400
Subject: [PATCH] Moving back, and correcting some things in the build file

---
 build.xml                                     | 74 ++++++++++---------
 .../com/pahimar/ee3/EquivalentExchange3.java  |  2 +-
 ee3_common/com/pahimar/ee3/lib/Reference.java |  1 +
 3 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/build.xml b/build.xml
index dff5473b..35508f3e 100644
--- a/build.xml
+++ b/build.xml
@@ -1,25 +1,28 @@
 <?xml version="1.0" ?> 
-<project name="Equivalent Exchange 3">
+<project name="Equivalent Exchange 3" default="build">
 	
 	<property file="build.properties" prefix="build"/>
 	<property file="build_number.properties" prefix="build_number"/>
 	
-	<target name="increment">
+	<target name="clean">
+		<delete file="${build.dir.development}\mcp\src\minecraft\mcmod.info" />
+		<delete dir="${build.dir.development}\mcp\src\minecraft\com\pahimar" />
+		<delete dir="${build.dir.development}\mcp\reobf\minecraft" />
+	</target>
+	
+	<target name="increment_build_number">
 		<propertyfile file="build_number.properties">
 			<entry key="build_number" type="int" operation="+" default="1"/>
 		</propertyfile>
 	</target>
 	
-	<target name="clean">
-		<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">
+	<target name="prep">
 		<copy todir="${build.dir.development}\mcp\src\minecraft">
 			<fileset dir="${build.dir.development}\source\Equivalent-Exchange-3\ee3_common\" />
 		</copy>
+	</target>
+	
+	<target name="replace_tokens">
 		<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}" />
@@ -43,31 +46,15 @@
 		</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="${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 -->
-		<antcall target="clean" />
+	<target name="sign_jar">
+		<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}" />
 	</target>
 	
-	<target name="release">
-		<!-- Prep for the release -->
-		<antcall target="increment" />
+	<target name="build">
+		<!-- Prep for the build -->
 		<antcall target="clean" />
-		<antcall target="build" />
+		<antcall target="increment_build_number" />
+		<antcall target="prep" />
 		<antcall target="recompile" />		
 		<antcall target="reobfuscate" />
 		
@@ -79,8 +66,29 @@
 			<fileset dir="${build.dir.development}\source\Equivalent-Exchange-3\resources" />
 		</jar>
 		
-		<!-- Sign the jar -->
-		<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" />
+	</target>
+	
+	<target name="release">
+		<!-- Prep for the build -->
+		<antcall target="clean" />
+		<antcall target="increment_build_number" />
+		<antcall target="prep" />
+		<antcall target="replace_tokens" />
+		<antcall target="recompile" />		
+		<antcall target="reobfuscate" />
+		
+		<!-- Build the jar -->
+		<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 finished jar -->
+		<antcall target="sign_jar" />
 		
 		<!-- Clean up the MCP source now that we are done -->
 		<antcall target="clean" />
diff --git a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java
index a31974d1..cc88f0c2 100644
--- a/ee3_common/com/pahimar/ee3/EquivalentExchange3.java
+++ b/ee3_common/com/pahimar/ee3/EquivalentExchange3.java
@@ -65,7 +65,7 @@ import cpw.mods.fml.relauncher.Side;
         name = Reference.MOD_NAME,
         version = Reference.VERSION_NUMBER,
         dependencies = Reference.DEPENDENCIES,
-        certificateFingerprint = "@FINGERPRINT@")
+        certificateFingerprint = Reference.FINGERPRINT)
 @NetworkMod(
         channels = { Reference.CHANNEL_NAME },
         clientSideRequired = true,
diff --git a/ee3_common/com/pahimar/ee3/lib/Reference.java b/ee3_common/com/pahimar/ee3/lib/Reference.java
index 2ef883e6..16d91c58 100644
--- a/ee3_common/com/pahimar/ee3/lib/Reference.java
+++ b/ee3_common/com/pahimar/ee3/lib/Reference.java
@@ -20,6 +20,7 @@ public class Reference {
     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@"; 
     public static final int SECOND_IN_TICKS = 20;
     public static final int SHIFTED_ID_RANGE_CORRECTION = 256;
     public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy";