From 2babc3a52a8ac238db53cedc7547e31d4c6dd6b1 Mon Sep 17 00:00:00 2001
From: pahimar <pahimar@gmail.com>
Date: Mon, 23 Sep 2013 15:08:54 -0400
Subject: [PATCH] Added sample private properties file, and clean up some
 unnecessary crap from the build script

---
 build.properties          |  2 +-
 build.xml                 | 29 +++--------------------------
 private.properties_sample |  4 ++++
 3 files changed, 8 insertions(+), 27 deletions(-)
 create mode 100644 private.properties_sample

diff --git a/build.properties b/build.properties
index f6625e64..a395aff7 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
-#Tue, 17 Sep 2013 20:27:04 -0400
+#Mon, 23 Sep 2013 15:00:03 -0400
 minecraft_version=1.6.4
 forge_version=9.11.0.883
 mod_version=pre2a
diff --git a/build.xml b/build.xml
index 76f893a7..b524efd3 100644
--- a/build.xml
+++ b/build.xml
@@ -4,16 +4,6 @@
 	<!-- Public property files-->
 	<property file="build.properties" prefix="build" />
 	<property file="environment.properties" prefix="environment" />
-
-	<!-- Private property files 
-		private.properties only contains the following properties; 
- 			fingerprint_signature
- 			keystore_location
-			keystore_user_alias
-			keystore_user_password
-		These properties are used to properly sign the compiled jar in the 'release' target
-		For the majority of you this is not a concern and you will not need values for these - just use the 'build' target 
-	-->
 	<property file="private.properties" prefix="private" />
 
 	<!-- Minecraft Forge -->
@@ -29,7 +19,7 @@
 		<get src="${minecraftforge_src_archive_location}" dest="${environment.base_location}/temp/" verbose="true" usetimestamp="true" />
 	</target>
 
-	<target name="forge-uncompress" depends="forge-download, forge-clean">
+	<target name="forge-uncompress" depends="forge-download">
 		<unzip src="${environment.base_location}/temp/${minecraftforge_src_archive}" dest="${environment.base_location}" />
 		<delete dir="${environment.base_location}/temp" />
 	</target>
@@ -94,13 +84,7 @@
 		<signjar jar="${environment.release_location}/MC ${build.minecraft_version}/${build.mod_version}/ee3-universal-${build.mod_version}-${build.build_number}.jar" keystore="${private.keystore_location}" alias="${private.keystore_user_alias}" storepass="${private.keystore_user_password}" />
 	</target>
 
-	<target name="build">
-		<!-- Prep for the build -->
-		<antcall target="clean" />
-		<antcall target="increment_build_number" />
-		<antcall target="prep" />
-		<antcall target="recompile" />
-		<antcall target="reobfuscate" />
+	<target name="build" depends="clean, increment_build_number, prep, recompile, reobfuscate">
 
 		<!-- Build the jar -->
 		<mkdir dir="${environment.release_location}/MC ${build.minecraft_version}/${build.mod_version}" />
@@ -115,14 +99,7 @@
 		<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" />
+	<target name="release" depends="clean, increment_build_number, prep, replace_tokens, recompile, reobfuscate">
 
 		<!-- Build the jar -->
 		<mkdir dir="${environment.release_location}/MC ${build.minecraft_version}/${build.mod_version}" />
diff --git a/private.properties_sample b/private.properties_sample
new file mode 100644
index 00000000..1cbc1fe5
--- /dev/null
+++ b/private.properties_sample
@@ -0,0 +1,4 @@
+fingerprint_signature=FINGERPRINT
+keystore_location=PATH_TO_KEYSTORE_LOCATION
+keystore_user_alias=USERNAME
+keystore_user_password=PASSWORD
\ No newline at end of file