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

build: separate full version from full name

Browse Source
This commit is contained in:
Kirill Vainer 2015-08-08 17:57:59 -04:00
parent d36749c85b
commit b7ab6d003e
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jme3-core/build.gradle
View File

@ -22,7 +22,8 @@ task updateVersionPropertiesFile << {
"git.hash=${jmeGitHash}\n" + "git.hash=${jmeGitHash}\n" +
"git.hash.short=${jmeShortGitHash}\n" + "git.hash.short=${jmeShortGitHash}\n" +
"git.tag=${jmeGitTag}\n" + "git.tag=${jmeGitTag}\n" +
"name.full=${jmeFullName}\n" + "name.full=jMonkeyEngine ${jmeFullVersion}\n" +
"version.full=${jmeFullVersion}\n" +
"version.number=${jmeVersion}\n" + "version.number=${jmeVersion}\n" +
"version.tag=${jmeVersionTag}" "version.tag=${jmeVersionTag}"
} }

1
jme3-core/src/main/java/com/jme3/system/JmeVersion.java
View File

@ -61,5 +61,6 @@ public class JmeVersion {
public static final String GIT_TAG = props.getProperty("git.tag", ""); public static final String GIT_TAG = props.getProperty("git.tag", "");
public static final String VERSION_NUMBER = props.getProperty("version.number", ""); public static final String VERSION_NUMBER = props.getProperty("version.number", "");
public static final String VERSION_TAG = props.getProperty("version.tag", ""); public static final String VERSION_TAG = props.getProperty("version.tag", "");
public static final String VERSION_FULL = props.getProperty("version.full", "");
public static final String FULL_NAME = props.getProperty("name.full", "jMonkeyEngine (unknown version)"); public static final String FULL_NAME = props.getProperty("name.full", "jMonkeyEngine (unknown version)");
} }

32
version.gradle
View File

@ -3,25 +3,25 @@
===================== =====================
Nightly Build Snapshot Nightly Build Snapshot
* Full Name: jMonkeyEngine 3.1.0-5124 * Full Version: 3.1.0-5124
* POM Version: 3.1.0-SNAPSHOT * POM Version: 3.1.0-SNAPSHOT
* NBM Version: 3.1.0.5124 * NBM Version: 3.1.0.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)
* Full Name: jMonkeyEngine 3.1.0-PBRIsComing-5124 * Full Version: 3.1.0-PBRIsComing-5124
* POM Version: 3.1.0-PBRIsComing-SNAPSHOT * POM Version: 3.1.0-PBRIsComing-SNAPSHOT
* NBM Version: 3.1.0.5124 * NBM Version: 3.1.0.5124
* NBM UC Suffix: PBRIsComing-nightly/3.1/plugins * NBM UC Suffix: PBRIsComing-nightly/3.1/plugins
Alpha1 Release Alpha1 Release
* Full Name: jMonkeyEngine 3.1.0-alpha1 * Full Version: 3.1.0-alpha1
* POM Version: 3.1.0-alpha1 * POM Version: 3.1.0-alpha1
* NBM Version: 3.1.0.0 * NBM Version: 3.1.0.0
* NBM UC Suffix: alpha1/3.1/plugins * NBM UC Suffix: alpha1/3.1/plugins
Final Release Final Release
* Full Name: jMonkeyEngine 3.1.0 * Full Version: 3.1.0
* POM Version: 3.1.0 * POM Version: 3.1.0
* NBM Version: 3.1.0.0 * NBM Version: 3.1.0.0
* NBM UC Suffix: stable/3.1/plugins * NBM UC Suffix: stable/3.1/plugins
@ -46,7 +46,7 @@ ext {
jmeShortGitHash = "" jmeShortGitHash = ""
jmeBuildDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date()) jmeBuildDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date())
jmeBranchName = "unknown" jmeBranchName = "unknown"
jmeFullName = "jMonkeyEngine ${jmeVersion}-UNKNOWN" jmeFullVersion = "${jmeVersion}-UNKNOWN"
jmePomVersion = "unknown" jmePomVersion = "unknown"
jmeNbmVersion = "0.0.0.0" jmeNbmVersion = "0.0.0.0"
jmeNbmUcSuffix = "unknown" jmeNbmUcSuffix = "unknown"
@ -62,12 +62,12 @@ task configureVersionInfo {
jmeGitTag = grgit.describe() jmeGitTag = grgit.describe()
if (jmeGitTag == null) jmeGitTag = "" if (jmeGitTag == null) jmeGitTag = ""
jmeFullName = "jMonkeyEngine ${jmeVersion}" jmeFullVersion = "${jmeVersion}"
jmePomVersion = jmeVersion jmePomVersion = jmeVersion
jmeNbmVersion = jmeVersion jmeNbmVersion = jmeVersion
if (jmeBranchName != "master") { if (jmeBranchName != "master") {
jmeFullName += "-${jmeBranchName}" jmeFullVersion += "-${jmeBranchName}"
jmePomVersion += "-${jmeBranchName}" jmePomVersion += "-${jmeBranchName}"
jmeNbmUcSuffix = "${jmeBranchName}-" jmeNbmUcSuffix = "${jmeBranchName}-"
@ -86,18 +86,18 @@ task configureVersionInfo {
jmeNbmUcSuffix += "/" + jmeMainVersion + "/plugins" jmeNbmUcSuffix += "/" + jmeMainVersion + "/plugins"
if (jmeVersionTag == "SNAPSHOT") { if (jmeVersionTag == "SNAPSHOT") {
jmeFullName += "-${jmeRevision}" jmeFullVersion += "-${jmeRevision}"
jmePomVersion += "-SNAPSHOT" jmePomVersion += "-SNAPSHOT"
jmeNbmVersion += ".${jmeRevision}" jmeNbmVersion += ".${jmeRevision}"
} else if (jmeVersionTag == "") { } else if (jmeVersionTag == "") {
jmeNbmVersion += ".0" jmeNbmVersion += ".0"
} else { } else {
jmeFullName += "-${jmeVersionTag}" jmeFullVersion += "-${jmeVersionTag}"
jmePomVersion += "-${jmeVersionTag}" jmePomVersion += "-${jmeVersionTag}"
jmeNbmVersion += ".0" jmeNbmVersion += ".0"
} }
logger.warn("Full Name: ${jmeFullName}") logger.warn("Full Version: ${jmeFullVersion}")
logger.warn("POM Version: ${jmePomVersion}") logger.warn("POM Version: ${jmePomVersion}")
logger.warn("NBM Version: ${jmeNbmVersion}") logger.warn("NBM Version: ${jmeNbmVersion}")
logger.warn("NBM UC Suffix: ${jmeNbmUcSuffix}") logger.warn("NBM UC Suffix: ${jmeNbmUcSuffix}")