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.
This commit is contained in:
Ben Spiers 2014-06-27 19:33:31 +01:00
parent 55f8dbfbad
commit d9b6a48d33
6 changed files with 35 additions and 23 deletions

View file

@ -42,8 +42,8 @@ configFile.withReader {
dependencies { dependencies {
compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev" compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev"
compile "codechicken:ForgeMultipart:${config.minecraft_version}-${config.FMP_version}:dev" compile "codechicken:ForgeMultipart:1.7.2-${config.FMP_version}:dev"
compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev" compile "codechicken:NotEnoughItems:1.7.2-${config.NEI_version}:dev"
} }
version = "${config.mod_version}.${System.env.BUILD_NUMBER}" version = "${config.mod_version}.${System.env.BUILD_NUMBER}"
@ -73,7 +73,6 @@ processResources
} }
task coreJar(type: Jar) { task coreJar(type: Jar) {
dependsOn 'reobf'
baseName = 'Mekanism' baseName = 'Mekanism'
manifest { manifest {
@ -81,30 +80,46 @@ task coreJar(type: Jar) {
attributes 'FMLCorePluginContainsFMLMod': 'true' 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 { from zipTree(reobf.outputs.getFiles().getSingleFile()).matching {
exclude 'mekanism/tools/**', 'mekanism/generators/**' exclude 'mekanism/tools/**', 'mekanism/generators/**'
} }
} }
task toolsJar(type: Jar) { task toolsJar(type: Jar) {
dependsOn 'reobf'
baseName = 'MekanismTools' 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 { from zipTree(reobf.outputs.getFiles().getSingleFile()).matching {
include 'mekanism/tools/**' include 'mekanism/tools/**'
} }
} }
task generatorsJar(type: Jar) { task generatorsJar(type: Jar) {
dependsOn 'reobf'
baseName = 'MekanismGenerators' 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 { from zipTree(reobf.outputs.getFiles().getSingleFile()).matching {
include 'mekanism/generators/**' include 'mekanism/generators/**'
} }
} }
coreJar.dependsOn('reobf')
toolsJar.dependsOn('reobf')
generatorsJar.dependsOn('reobf')
task MDKZip(type: Zip) { task MDKZip(type: Zip) {
baseName = 'MDK' baseName = 'MDK'
from sourceSets.main.java.srcDirs from sourceSets.main.java.srcDirs
@ -122,6 +137,6 @@ task releaseJars(type: Copy) {
} }
task fullBuild(type: Delete) { task fullBuild(type: Delete) {
dependsOn 'releaseJars'
delete reobf delete reobf
} }
fullBuild.dependsOn('releaseJars')

View file

@ -1,6 +1,6 @@
minecraft_version=1.7.2 minecraft_version=1.7.2
forge_version=10.12.2.1147 forge_version=10.12.2.1147
FMP_version=1.1.0.288 FMP_version=1.1.0.288
CCLIB_version=1.1.1.87 CCLIB_version=1.1.1.88
NEI_version=1.0.1 NEI_version=1.0.1
mod_version=7.0.0 mod_version=7.0.0

View file

@ -1,9 +1,6 @@
{ {
"repo": "http://files.minecraftforge.net/ForgeMultipart/", "repo": "http://files.minecraftforge.net/maven/codechicken/ForgeMultipart/${mc_version}-${fmp_version}/",
"file": "ForgeMultipart-universal-@MCVERSION@-@VERSION@.jar", "file": "ForgeMultipart-${mc_version}-${fmp_version}-universal.jar",
"dev": "ForgeMultipart-dev-@MCVERSION@-@VERSION@.jar", "dev": "ForgeMultipart-${mc_version}-${fmp_version}-dev.jar",
"class": "codechicken.lib.asm.ASMHelper", "class": "codechicken.multipart.MultipartMod"
"version": "1.0.0.219",
"mcversion": "1.6.4",
"coreLib": false
} }

View file

@ -3,8 +3,8 @@
"modid": "Mekanism", "modid": "Mekanism",
"name": "Mekanism", "name": "Mekanism",
"description": "Energy, Armor, Tools, Weapons, Machines, Magic.", "description": "Energy, Armor, Tools, Weapons, Machines, Magic.",
"version": "7.0.0", "version": "${version}",
"mcversion": "1.7.2", "mcversion": "${mc_version}",
"updateUrl": "", "updateUrl": "",
"authors": [ "authors": [
"aidancbrady" "aidancbrady"

View file

@ -3,8 +3,8 @@
"modid": "MekanismGenerators", "modid": "MekanismGenerators",
"name": "MekanismGenerators", "name": "MekanismGenerators",
"description": "Generators module of Mekanism.", "description": "Generators module of Mekanism.",
"version": "7.0.0", "version": "${version}",
"mcversion": "1.7.2", "mcversion": "${mc_version}",
"updateUrl": "", "updateUrl": "",
"authors": [ "authors": [
"aidancbrady" "aidancbrady"

View file

@ -3,8 +3,8 @@
"modid": "MekanismTools", "modid": "MekanismTools",
"name": "MekanismTools", "name": "MekanismTools",
"description": "Tools module for Mekanism.", "description": "Tools module for Mekanism.",
"version": "7.0.0", "version": "${version}",
"mcversion": "1.7.2", "mcversion": "${mc_version}",
"updateUrl": "", "updateUrl": "",
"authors": [ "authors": [
"aidancbrady" "aidancbrady"