Fix build.gradle problems:

Installer missing url.png
UploadArchives erroring on local systems due to missing changelog
Adding branch name improperly.
This commit is contained in:
LexManos 2016-11-15 23:38:23 -08:00
parent f8cba13b5b
commit 843d3022f8
2 changed files with 8 additions and 6 deletions

View file

@ -84,8 +84,6 @@ task changelog(type: JenkinsChangelog) {
// skip if there is no forge jenkins pass // skip if there is no forge jenkins pass
onlyIf { onlyIf {
project.hasProperty('forgeJenkinsPass') project.hasProperty('forgeJenkinsPass')
// Not sure what abrar was trying to do here...
//project.file("build/distributions/${project.name}-${project.version}-changelog.txt").text = ""
} }
outputs.upToDateWhen { false } // never up to date outputs.upToDateWhen { false } // never up to date
@ -108,13 +106,14 @@ task crowdin(type: CrowdinDownload) {
} }
def extraTxts = [ def extraTxts = [
changelog, // yeah we can do thi, because gradle and groovy are awesome
"CREDITS-fml.txt", "CREDITS-fml.txt",
"LICENSE-new.txt", "LICENSE-new.txt",
"MinecraftForge-Credits.txt", "MinecraftForge-Credits.txt",
"Paulscode SoundSystem CodecIBXM License.txt", "Paulscode SoundSystem CodecIBXM License.txt",
"Paulscode IBXM Library License.txt" "Paulscode IBXM Library License.txt"
] ]
if (project.hasProperty('forgeJenkinsPass'))
extraTxts += changelog
outputJar { outputJar {
classifier = 'universal' classifier = 'universal'
@ -135,6 +134,7 @@ installer {
classifier = 'installer' classifier = 'installer'
from extraTxts from extraTxts
from "src/main/resources/forge_logo.png" from "src/main/resources/forge_logo.png"
from "src/main/resources/url.png"
rename "forge_logo\\.png", "big_logo.png" rename "forge_logo\\.png", "big_logo.png"
} }
@ -177,6 +177,7 @@ task makeMdk(type: Zip) {
into ('eclipse') { into ('eclipse') {
from 'mdk/eclipse' from 'mdk/eclipse'
} }
if (project.hasProperty('forgeJenkinsPass'))
from changelog.output from changelog.output
from ('mdk') { from ('mdk') {
filter(ReplaceTokens, tokens: [ filter(ReplaceTokens, tokens: [
@ -211,6 +212,7 @@ tasks.build.dependsOn 'launch4j'
// MAVEN // MAVEN
artifacts { artifacts {
if (project.hasProperty('forgeJenkinsPass'))
archives changelog.output archives changelog.output
archives file("build/distributions/${project.name}-${project.version}-installer-win.exe") archives file("build/distributions/${project.name}-${project.version}-installer-win.exe")
archives makeMdk archives makeMdk
@ -365,7 +367,7 @@ String getVersionFromJava(File file)
if (branch && branch != 'master' && branch != 'HEAD' && branch != minecraft.version && branch != minecraft.version + '.0') if (branch && branch != 'master' && branch != 'HEAD' && branch != minecraft.version && branch != minecraft.version + '.0')
{ {
if (!(branch.endsWith('.x') && minecraft.version.startsWith(branch.substring(0, branch.length() -1)))) if (!(branch.endsWith('.x') && minecraft.version.startsWith(branch.substring(0, branch.length() -2))))
out += "-$branch" out += "-$branch"
} }

BIN
src/main/resources/url.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B