sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix build errors

Browse Source
This commit is contained in:
Kirill Vainer 2016-03-02 16:35:45 -05:00
parent 0aaa28e66b
commit 3b9e412f80
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -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"}
} }

2
common.gradle
View File

@ -33,7 +33,7 @@ dependencies {
jar { jar {
manifest { manifest {
attributes 'Implementation-Title': 'jMonkeyEngine', attributes 'Implementation-Title': 'jMonkeyEngine',
'Implementation-Version': releaseInfo.fullVersion 'Implementation-Version': jmeFullVersion
} }
} }

27
version.gradle
View File

@ -1,29 +1,29 @@
/* /*
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
@ -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) {
@ -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);
} }
} }