From d9b6a48d33ed0dd3fb853d51e5dbd615de6e322f Mon Sep 17 00:00:00 2001
From: Ben Spiers <ben.spiers22@gmail.com>
Date: Fri, 27 Jun 2014 19:33:31 +0100
Subject: [PATCH] Build script changes to make it compile in 1.7.10 (still
 won't run due to no FMP version but it's the best I could do).

Make mcmod.infos and dependancies.info fill in version numbers at build time.
---
 build.gradle               | 33 ++++++++++++++++++++++++---------
 build.properties           |  2 +-
 etc/core/dependancies.info | 11 ++++-------
 etc/core/mcmod.info        |  4 ++--
 etc/generators/mcmod.info  |  4 ++--
 etc/tools/mcmod.info       |  4 ++--
 6 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index f4e25d5d0..24d62fe85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,8 +42,8 @@ configFile.withReader {
 
 dependencies {
     compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev"
-    compile "codechicken:ForgeMultipart:${config.minecraft_version}-${config.FMP_version}:dev"
-    compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev"
+    compile "codechicken:ForgeMultipart:1.7.2-${config.FMP_version}:dev"
+    compile "codechicken:NotEnoughItems:1.7.2-${config.NEI_version}:dev"
 }
 
 version = "${config.mod_version}.${System.env.BUILD_NUMBER}"
@@ -73,7 +73,6 @@ processResources
 }
 
 task coreJar(type: Jar) {
-    dependsOn 'reobf'
     baseName = 'Mekanism'
 
     manifest {
@@ -81,30 +80,46 @@ task coreJar(type: Jar) {
         attributes 'FMLCorePluginContainsFMLMod': 'true'
     }
 
-    from 'etc/core'
+    from('etc/core') {
+        include '*.info'
+        expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version
+    }
+
     from zipTree(reobf.outputs.getFiles().getSingleFile()).matching {
         exclude 'mekanism/tools/**', 'mekanism/generators/**'
     }
 }
 
 task toolsJar(type: Jar) {
-    dependsOn 'reobf'
     baseName = 'MekanismTools'
-    from 'etc/tools'
+
+    from('etc/tools') {
+        include '*.info'
+        expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version
+    }
+
     from zipTree(reobf.outputs.getFiles().getSingleFile()).matching {
         include 'mekanism/tools/**'
     }
 }
 
 task generatorsJar(type: Jar) {
-    dependsOn 'reobf'
     baseName = 'MekanismGenerators'
-    from 'etc/generators'
+
+    from('etc/generators') {
+        include '*.info'
+        expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version
+    }
+
     from zipTree(reobf.outputs.getFiles().getSingleFile()).matching {
         include 'mekanism/generators/**'
     }
 }
 
+coreJar.dependsOn('reobf')
+toolsJar.dependsOn('reobf')
+generatorsJar.dependsOn('reobf')
+
 task MDKZip(type: Zip) {
     baseName = 'MDK'
     from sourceSets.main.java.srcDirs
@@ -122,6 +137,6 @@ task releaseJars(type: Copy) {
 }
 
 task fullBuild(type: Delete) {
-    dependsOn 'releaseJars'
     delete reobf
 }
+fullBuild.dependsOn('releaseJars')
diff --git a/build.properties b/build.properties
index 7d4563088..a709473a3 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
 minecraft_version=1.7.2
 forge_version=10.12.2.1147
 FMP_version=1.1.0.288
-CCLIB_version=1.1.1.87
+CCLIB_version=1.1.1.88
 NEI_version=1.0.1
 mod_version=7.0.0
diff --git a/etc/core/dependancies.info b/etc/core/dependancies.info
index 7a1b06264..a0009f1b9 100755
--- a/etc/core/dependancies.info
+++ b/etc/core/dependancies.info
@@ -1,9 +1,6 @@
 {
-	"repo": "http://files.minecraftforge.net/ForgeMultipart/",
-	"file": "ForgeMultipart-universal-@MCVERSION@-@VERSION@.jar",
-	"dev": "ForgeMultipart-dev-@MCVERSION@-@VERSION@.jar",
-	"class": "codechicken.lib.asm.ASMHelper",
-	"version": "1.0.0.219",
-	"mcversion": "1.6.4",
-	"coreLib": false
+	"repo": "http://files.minecraftforge.net/maven/codechicken/ForgeMultipart/${mc_version}-${fmp_version}/",
+	"file": "ForgeMultipart-${mc_version}-${fmp_version}-universal.jar",
+	"dev": "ForgeMultipart-${mc_version}-${fmp_version}-dev.jar",
+	"class": "codechicken.multipart.MultipartMod"
 }
\ No newline at end of file
diff --git a/etc/core/mcmod.info b/etc/core/mcmod.info
index c2e542bfb..22f95e2bb 100755
--- a/etc/core/mcmod.info
+++ b/etc/core/mcmod.info
@@ -3,8 +3,8 @@
   "modid": "Mekanism",
   "name": "Mekanism",
   "description": "Energy, Armor, Tools, Weapons, Machines, Magic.",
-  "version": "7.0.0",
-  "mcversion": "1.7.2",
+  "version": "${version}",
+  "mcversion": "${mc_version}",
   "updateUrl": "",
   "authors": [
     "aidancbrady"
diff --git a/etc/generators/mcmod.info b/etc/generators/mcmod.info
index 3242ac92c..583cf4435 100755
--- a/etc/generators/mcmod.info
+++ b/etc/generators/mcmod.info
@@ -3,8 +3,8 @@
   "modid": "MekanismGenerators",
   "name": "MekanismGenerators",
   "description": "Generators module of Mekanism.",
-  "version": "7.0.0",
-  "mcversion": "1.7.2",
+  "version": "${version}",
+  "mcversion": "${mc_version}",
   "updateUrl": "",
   "authors": [
     "aidancbrady"
diff --git a/etc/tools/mcmod.info b/etc/tools/mcmod.info
index b707d523f..6a0f4163e 100755
--- a/etc/tools/mcmod.info
+++ b/etc/tools/mcmod.info
@@ -3,8 +3,8 @@
   "modid": "MekanismTools",
   "name": "MekanismTools",
   "description": "Tools module for Mekanism.",
-  "version": "7.0.0",
-  "mcversion": "1.7.2",
+  "version": "${version}",
+  "mcversion": "${mc_version}",
   "updateUrl": "",
   "authors": [
     "aidancbrady"