Merge pull request #517 from kaendfinger/master
Reformated build.gradle
This commit is contained in:
commit
cc74d32ffb
3 changed files with 66 additions and 70 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -15,4 +15,5 @@
|
||||||
## intellij
|
## intellij
|
||||||
/out
|
/out
|
||||||
/.idea
|
/.idea
|
||||||
/*.iml
|
/*.iml
|
||||||
|
/atlassian-ide-plugin.xml
|
||||||
|
|
129
build.gradle
129
build.gradle
|
@ -20,7 +20,7 @@ configFile.withReader {
|
||||||
// read config. it shall from now on be referenced as simply config or as project.config
|
// read config. it shall from now on be referenced as simply config or as project.config
|
||||||
def prop = new Properties()
|
def prop = new Properties()
|
||||||
prop.load(it)
|
prop.load(it)
|
||||||
project.ext.config = new ConfigSlurper().parse prop
|
ext.config = new ConfigSlurper().parse prop
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "com.pahimar.ee3"
|
group = "com.pahimar.ee3"
|
||||||
|
@ -36,92 +36,87 @@ minecraft {
|
||||||
replace "@FINGERPRINT@", project.ee3_signature
|
replace "@FINGERPRINT@", project.ee3_signature
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources
|
processResources {
|
||||||
{
|
// replace stuff in the files we want.
|
||||||
// replace stuff in the files we want.
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
include 'mcmod.info'
|
||||||
include 'mcmod.info'
|
include 'version.properties'
|
||||||
include 'version.properties'
|
|
||||||
|
|
||||||
// replaces
|
// replaces
|
||||||
expand 'version': project.config.mod_version, 'buildnumber': project.config.build_number
|
expand 'version': project.config.mod_version, 'buildnumber': project.config.build_number
|
||||||
}
|
}
|
||||||
|
|
||||||
// copy everything else, thats we didnt do before
|
// copy everything else, thats we didnt do before
|
||||||
from(sourceSets.main.resources.srcDirs) {
|
from(sourceSets.main.resources.srcDirs) {
|
||||||
exclude 'mcmod.info'
|
exclude 'mcmod.info'
|
||||||
exclude 'version.properties'
|
exclude 'version.properties'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// BEYOND THIS POINT..
|
// BEYOND THIS POINT..
|
||||||
// IS STUFF THATS FOR RELEASING...
|
// IS STUFF THATS FOR RELEASING...
|
||||||
|
|
||||||
// verify the properties exist.. or initialize.
|
// verify the properties exist.. or initialize.
|
||||||
if (!project.hasProperty("keystore_location")) // keystore stuff
|
if (!project.hasProperty("keystore_location")) // keystore stuff
|
||||||
ext.keystore_location = ".";
|
ext.keystore_location = "."
|
||||||
|
|
||||||
if (!project.hasProperty("ee3_keystore_alias")) // keystore stuff
|
if (!project.hasProperty("ee3_keystore_alias")) // keystore stuff
|
||||||
ext.ee3_keystore_alias = "";
|
ext.ee3_keystore_alias = ""
|
||||||
|
|
||||||
if (!project.hasProperty("keystore_password")) // keystore stuff
|
if (!project.hasProperty("keystore_password")) // keystore stuff
|
||||||
ext.keystore_password = "";
|
ext.keystore_password = ""
|
||||||
|
|
||||||
if (!project.hasProperty("ee3_release_loc")) // release loc
|
if (!project.hasProperty("ee3_release_loc")) // release loc
|
||||||
ext.ee3_release_loc = ".";
|
ext.ee3_release_loc = "."
|
||||||
else
|
else
|
||||||
ee3_release_loc = ee3_release_loc.replace('{MC}', minecraft.version).replace('{MODVER}', config.mod_version).replace('{BUILD}', config.build_number)
|
ee3_release_loc = ee3_release_loc.replace('{MC}', minecraft.version).replace('{MODVER}', config.mod_version).replace('{BUILD}', config.build_number)
|
||||||
|
|
||||||
task("signJar", dependsOn: "reobf")
|
task signJar(dependsOn: "reobf") {
|
||||||
{
|
inputs.file jar.getArchivePath()
|
||||||
inputs.file jar.getArchivePath()
|
inputs.file keystore_location
|
||||||
inputs.file keystore_location
|
inputs.property "ee3_keystore_alias", ee3_keystore_alias
|
||||||
inputs.property "ee3_keystore_alias", ee3_keystore_alias
|
inputs.property "keystore_password", keystore_password
|
||||||
inputs.property "keystore_password", keystore_password
|
outputs.file jar.getArchivePath()
|
||||||
outputs.file jar.getArchivePath()
|
|
||||||
|
|
||||||
// only sign if the keystore exists
|
// only sign if the keystore exists
|
||||||
onlyIf {
|
onlyIf {
|
||||||
return keystore_location != "."
|
return keystore_location != "."
|
||||||
}
|
}
|
||||||
|
|
||||||
// the actual action.. sign the jar.
|
// the actual action.. sign the jar.
|
||||||
doLast {
|
doLast {
|
||||||
ant.signjar(
|
ant.signjar(
|
||||||
destDir: jar.destinationDir,
|
destDir: jar.destinationDir,
|
||||||
jar: jar.getArchivePath(),
|
jar: jar.getArchivePath(),
|
||||||
keystore: keystore_location,
|
keystore: keystore_location,
|
||||||
alias: ee3_keystore_alias,
|
alias: ee3_keystore_alias,
|
||||||
storepass: keystore_password
|
storepass: keystore_password
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
task incrementBuildNumber() {
|
||||||
|
doLast {
|
||||||
|
// increment
|
||||||
|
config.build_number = (config.build_number.toString().toInteger()) + 1
|
||||||
|
|
||||||
|
// write back to the file
|
||||||
|
configFile.withWriter {
|
||||||
|
config.toProperties().store(it, "")
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
task("incrementBuildNumber")
|
task release(type: Copy) {
|
||||||
{
|
dependsOn "incrementBuildNumber"
|
||||||
// increment build number
|
dependsOn "signJar"
|
||||||
doFirst {
|
|
||||||
// increment
|
|
||||||
config.build_number = (config.build_number.toString().toInteger()) + 1
|
|
||||||
|
|
||||||
// write back to the file
|
eachFile { file ->
|
||||||
configFile.withWriter {
|
logger.info "copying ${file}"
|
||||||
config.toProperties().store(it, "")
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
task("release", type: Copy)
|
// only if the release location isn't empty.
|
||||||
{
|
onlyIf {
|
||||||
dependsOn "incrementBuildNumber"
|
return project.ee3_release_loc != "."
|
||||||
dependsOn "signJar"
|
}
|
||||||
|
}
|
||||||
eachFile { file ->
|
|
||||||
logger.info "copying ${file}"
|
|
||||||
}
|
|
||||||
|
|
||||||
// only if the release location isnt empty.
|
|
||||||
onlyIf {
|
|
||||||
return project.ee3_release_loc != "."
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +1,6 @@
|
||||||
#
|
#
|
||||||
#Sat Dec 14 19:57:18 EST 2013
|
#Tue Dec 17 19:56:56 EST 2013
|
||||||
minecraft_version=1.6.4
|
minecraft_version=1.6.4
|
||||||
forge_version=9.11.1.964
|
forge_version=9.11.1.964
|
||||||
mod_version=0.0
|
mod_version=0.0
|
||||||
build_number=28
|
build_number=30
|
||||||
|
|
Loading…
Reference in a new issue