Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'BuildCraft-5.0.x' into BuildCraft-5.1.x

Browse source 
Conflicts:
	build.gradle
This commit is contained in:
SpaceToad 2014-04-08 14:52:55 +02:00
commit debec7a84e
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build.gradle
View file

@ -21,15 +21,7 @@ buildscript {
apply plugin: 'forge' // adds the forge dependency apply plugin: 'forge' // adds the forge dependency
apply plugin: 'maven' // for uploading to a maven repo apply plugin: 'maven' // for uploading to a maven repo
// grab buildNumber version = "5.0.4"
ext.buildnumber = 0 // this will be referenced as simply project.buildnumber from now on.
if (System.getenv().BUILD_NUMBER)
project.buildnumber = System.getenv().BUILD_NUMBER
else
logger.lifecycle "SETTING BUILDNUMBER TO 0"
version = "5.1.0"
group= "com.mod-buildcraft" group= "com.mod-buildcraft"
archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension] archivesBaseName = "buildcraft" // the name that all artifacts will use as a base. artifacts names follow this pattern: [baseName]-[appendix]-[version]-[classifier].[extension]
@ -41,7 +33,6 @@ minecraft {
// replacing stuff in the source // replacing stuff in the source
replace '@VERSION@', project.version replace '@VERSION@', project.version
replace '@MC_VERSION@', version replace '@MC_VERSION@', version
replace '@BUILD_NUMBER@', project.buildnumber
} }
// configure the source folders // configure the source folders
@ -70,7 +61,7 @@ processResources
// replace version and mcversion // replace version and mcversion
// ${version} and ${mcversion} are the exact strings being replaced // ${version} and ${mcversion} are the exact strings being replaced
expand 'version':project.version, 'mcversion':project.minecraft.version, 'buildnumber':project.buildnumber expand 'version':project.version, 'mcversion':project.minecraft.version
} }
// copy everything else, that's not the mcmod.info // copy everything else, that's not the mcmod.info
@ -83,9 +74,6 @@ processResources
// extra jar section // extra jar section
// ------------------- // -------------------
// for the benefit of the jars, we will now now add the buildnumber to the jars
project.version += '.' + project.buildnumber
// add a source jar // add a source jar
task sourceJar(type: Jar) { task sourceJar(type: Jar) {
from sourceSets.main.allSource from sourceSets.main.allSource