build: fix build errors
This commit is contained in:
parent
0aaa28e66b
commit
3b9e412f80
@ -65,7 +65,7 @@ task libDist(dependsOn: subprojects.build) << {
|
|||||||
}
|
}
|
||||||
|
|
||||||
task createZipDistribution(type:Zip,dependsOn:["dist","libDist"], description:"Package the nightly zip distribution"){
|
task createZipDistribution(type:Zip,dependsOn:["dist","libDist"], description:"Package the nightly zip distribution"){
|
||||||
archiveName "jME" + releaseInfo.fullVersion + ".zip"
|
archiveName "jME" + jmeFullVersion + ".zip"
|
||||||
into("/") {
|
into("/") {
|
||||||
from {"./dist"}
|
from {"./dist"}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,7 +33,7 @@ dependencies {
|
|||||||
jar {
|
jar {
|
||||||
manifest {
|
manifest {
|
||||||
attributes 'Implementation-Title': 'jMonkeyEngine',
|
attributes 'Implementation-Title': 'jMonkeyEngine',
|
||||||
'Implementation-Version': releaseInfo.fullVersion
|
'Implementation-Version': jmeFullVersion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,35 +1,35 @@
|
|||||||
/*
|
/*
|
||||||
Version Info Examples
|
Version Info Examples
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
Nightly Build Snapshot
|
Nightly Build Snapshot
|
||||||
* git tag:
|
* git tag:
|
||||||
* Full Version: 3.1-5124
|
* Full Version: 3.1-5124
|
||||||
* POM Version: 3.1.0-SNAPSHOT
|
* POM Version: 3.1.0-SNAPSHOT
|
||||||
* NBM Revision: 5124
|
* NBM Revision: 5124
|
||||||
* NBM UC Suffix: nightly/3.1/plugins
|
* NBM UC Suffix: nightly/3.1/plugins
|
||||||
|
|
||||||
Nightly Build Snapshot (PBRIsComing branch)
|
Nightly Build Snapshot (PBRIsComing branch)
|
||||||
* git tag:
|
* git tag:
|
||||||
* Full Version: 3.1-PBRIsComing-5124
|
* Full Version: 3.1-PBRIsComing-5124
|
||||||
* POM Version: 3.1.0-PBRIsComing-SNAPSHOT
|
* POM Version: 3.1.0-PBRIsComing-SNAPSHOT
|
||||||
* NBM Revision: 5124
|
* NBM Revision: 5124
|
||||||
* NBM UC Suffix: PBRIsComing-nightly/3.1/plugins
|
* NBM UC Suffix: PBRIsComing-nightly/3.1/plugins
|
||||||
|
|
||||||
Alpha1 Release
|
Alpha1 Release
|
||||||
* git tag: v3.1.0-alpha1
|
* git tag: v3.1.0-alpha1
|
||||||
* Full Version: 3.1-alpha1
|
* Full Version: 3.1-alpha1
|
||||||
* POM Version: 3.1.0-alpha1
|
* POM Version: 3.1.0-alpha1
|
||||||
* NBM Revision: 0
|
* NBM Revision: 0
|
||||||
* NBM UC Suffix: stable/3.1/plugins
|
* NBM UC Suffix: stable/3.1/plugins
|
||||||
|
|
||||||
Final Release
|
Final Release
|
||||||
* git tag: v3.1.0
|
* git tag: v3.1.0
|
||||||
* Full Version: 3.1
|
* Full Version: 3.1
|
||||||
* POM Version: 3.1.0
|
* POM Version: 3.1.0
|
||||||
* NBM Revision: 0
|
* NBM Revision: 0
|
||||||
* NBM UC Suffix: stable/3.1/plugins
|
* NBM UC Suffix: stable/3.1/plugins
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import org.ajoberstar.grgit.*
|
import org.ajoberstar.grgit.*
|
||||||
@ -39,12 +39,21 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'org.ajoberstar:gradle-git:1.4.1'
|
classpath 'org.ajoberstar:gradle-git:1.2.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
releaseInfo = null;
|
jmeRevision = 0
|
||||||
|
jmeNbmRevision = 0
|
||||||
|
jmeGitHash = ""
|
||||||
|
jmeGitTag = ""
|
||||||
|
jmeShortGitHash = ""
|
||||||
|
jmeBuildDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date())
|
||||||
|
jmeBranchName = "unknown"
|
||||||
|
jmeFullVersion = "${jmeVersion}-UNKNOWN"
|
||||||
|
jmePomVersion = "unknown"
|
||||||
|
jmeNbmUcSuffix = "unknown"
|
||||||
}
|
}
|
||||||
|
|
||||||
def getReleaseInfo(String tag) {
|
def getReleaseInfo(String tag) {
|
||||||
@ -113,7 +122,7 @@ task configureVersionInfo {
|
|||||||
jmeShortGitHash = head.abbreviatedId
|
jmeShortGitHash = head.abbreviatedId
|
||||||
jmeBranchName = grgit.branch.current.name
|
jmeBranchName = grgit.branch.current.name
|
||||||
jmeGitTag = grgit.tag.list().find { it.commit == head }
|
jmeGitTag = grgit.tag.list().find { it.commit == head }
|
||||||
|
|
||||||
if (jmeGitTag != null) {
|
if (jmeGitTag != null) {
|
||||||
jmeGitTag = jmeGitTag.name
|
jmeGitTag = jmeGitTag.name
|
||||||
} else {
|
} else {
|
||||||
@ -133,7 +142,7 @@ task configureVersionInfo {
|
|||||||
if (System.env.TRAVIS_BRANCH != null) {
|
if (System.env.TRAVIS_BRANCH != null) {
|
||||||
jmeBranchName = System.env.TRAVIS_BRANCH
|
jmeBranchName = System.env.TRAVIS_BRANCH
|
||||||
}
|
}
|
||||||
if (System.env.TRAVIS_PULL_REQUEST != null &&
|
if (System.env.TRAVIS_PULL_REQUEST != null &&
|
||||||
System.env.TRAVIS_PULL_REQUEST != "false") {
|
System.env.TRAVIS_PULL_REQUEST != "false") {
|
||||||
jmeBranchName += "-pr-" + System.env.TRAVIS_PULL_REQUEST
|
jmeBranchName += "-pr-" + System.env.TRAVIS_PULL_REQUEST
|
||||||
}
|
}
|
||||||
@ -149,7 +158,7 @@ task configureVersionInfo {
|
|||||||
jmePomVersion += "-SNAPSHOT"
|
jmePomVersion += "-SNAPSHOT"
|
||||||
jmeNbmRevision = jmeRevision
|
jmeNbmRevision = jmeRevision
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.warn("Full Version: ${jmeFullVersion}")
|
logger.warn("Full Version: ${jmeFullVersion}")
|
||||||
logger.warn("POM Version: ${jmePomVersion}")
|
logger.warn("POM Version: ${jmePomVersion}")
|
||||||
logger.warn("NBM Revision: ${jmeNbmRevision}")
|
logger.warn("NBM Revision: ${jmeNbmRevision}")
|
||||||
@ -158,7 +167,5 @@ task configureVersionInfo {
|
|||||||
// Failed to get repo info
|
// Failed to get repo info
|
||||||
logger.warn("Failed to get repository info: " + ex.message + ". " + \
|
logger.warn("Failed to get repository info: " + ex.message + ". " + \
|
||||||
"Only partial build info will be generated.")
|
"Only partial build info will be generated.")
|
||||||
|
|
||||||
releaseInfo = new ReleaseInfo(jmeVersion);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user