From b8a54d4b1e8317fc2e66fa4d17c642c75c40f2f7 Mon Sep 17 00:00:00 2001
From: progwml6 <progwml6@gmail.com>
Date: Thu, 3 Jul 2014 23:42:16 -0400
Subject: [PATCH] move to same versioning format for jenkins builds as tcon

---
 build.gradle     | 38 ++++++++++++--------------------------
 build.properties |  1 +
 2 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/build.gradle b/build.gradle
index 86eb6c9..0ddf055 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,33 +37,18 @@ repositories {
 apply plugin: 'forge'
 group = 'mantle'
 
-// define the properties file
+// Define properties file
 ext.configFile = file "build.properties"
 
 configFile.withReader {
-    // read config.  it shall from now on be referenced as simply config or as project.config
+    // Load config.  It shall from now be referenced as simply config or project.config
     def prop = new Properties()
     prop.load(it)
     project.ext.config = new ConfigSlurper().parse prop
 }
-ext.artifact_version_override = 'NotUsed'
-//gitignored config file -- if this has the entry for override it will override the version for local builds
-//create a file called version.properties with the line artifact_version_override=NotUsed
-//replace NotUsed w/ version #'s for manual local overrides
-ext.configFile2 = file "version.properties"
-if (configFile2.exists()){
-	configFile2.withReader {
-    	def prop2 = new Properties()
-    	prop2.load(it)
-    	ext.GIVersionFL = new ConfigSlurper().parse prop2
-		if (GIVersionFL != null){
-			project.artifact_version_override = GIVersionFL.artifact_version_override
-		}
-	}
-}
-
 
 // sets version to the slimeKnights default version format
+// Finds and sets version data
 task buildInfo {
     def cmd = "git rev-parse --short HEAD"
     def proc = cmd.execute()
@@ -75,21 +60,19 @@ task buildInfo {
     }
 
     if (System.getenv().BUILD_NUMBER != null) {
-        ext.buildNum = System.getenv().BUILD_NUMBER
+        ext.buildNum = "jenkins${System.getenv().BUILD_NUMBER}"
     } else {
-        ext.buildNum = "DEV"
+        ext.buildNum = "DEV.${project.buildInfo.revision}"
     }
 }
 ext.artifact_version = 'NFG'
-if (System.getenv().ARTIFACT_VERSION == null && artifact_version_override == 'NotUsed') {
-    artifact_version = "${project.buildInfo.buildNum}.${project.buildInfo.revision}"
+if (System.getenv().ARTIFACT_VERSION == null) {
+    artifact_version = "${config.mod_version}.${project.buildInfo.buildNum}"
 }
-if (System.getenv().ARTIFACT_VERSION != null && artifact_version_override == 'NotUsed') {
+if (System.getenv().ARTIFACT_VERSION != null) {
     artifact_version = "${system.getenv().ARTIFACT_VERSION}"
 }
-if (artifact_version_override != 'NotUsed') {
-    artifact_version = "${artifact_version_override}"
-}
+
 version = "${config.minecraft_version}-${artifact_version}"
 
 minecraft {
@@ -111,6 +94,9 @@ sourceSets {
 }
 processResources
 {
+    inputs.property "version", artifact_version
+    inputs.property "MCversion", config.minecraft_version
+
         // replace stuff in text files, not binary ones.
     from(sourceSets.main.resources.srcDirs) {
         include '**/*.info'
diff --git a/build.properties b/build.properties
index eb77a64..1c1deb5 100644
--- a/build.properties
+++ b/build.properties
@@ -1,2 +1,3 @@
+mod_version=0.3.1
 minecraft_version=1.7.10
 forge_version=10.13.0.1150