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

sdk build: use "nbm revision" to allow upgrades between tagged releases

Browse Source
This commit is contained in:
Kirill Vainer 2015-08-13 22:38:44 -04:00
parent 3cf85668d1
commit a97048a4f3
5 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -4,6 +4,8 @@ jmeVersion = 3.1.0
jmeMainVersion = 3.1
# Version addition pre-alpha-svn, Stable, Beta
jmeVersionTag = SNAPSHOT
# Increment this each time jmeVersionTag changes but jmeVersion stays the same
jmeVersionTagID = 0
# specify if JavaDoc should be built
buildJavaDoc = true

4
sdk/build.gradle
View File

@ -389,13 +389,13 @@ copyTestSources.outputs.dir "JME3TestsTemplateAndroid/src/"
ant.properties['plugins.version'] = jmeVersion
ant.properties['app.version']= jmeFullVersion
ant.properties['git.revision']= jmeRevision
ant.properties['nbm.revision']= jmeNbmRevision
task buildSdk(dependsOn: [copyBaseLibs, copyProjectLibs, createProjectXml, createBaseXml, copyTestSources]) <<{
ant.propertyfile(file: "nbproject/project.properties") {
entry( key: "plugins.version", value: "${jmeVersion}")
entry( key: "app.version", value: "${jmeFullVersion}")
entry( key: "git.revision", value: "${jmeRevision}")
entry( key: "nbm.revision", value: "${jmeNbmRevision}")
}
ant.ant(dir: ".", antfile: "build.xml", target: "build")
}

10
sdk/build.xml
View File

@ -192,12 +192,12 @@
<if>
<equals arg1="${set_impl_version}" arg2="true"/>
<then>
<echo>Setting implementation version for ${module_dir} to revision: ${git.revision}</echo>
<replace file="${module_dir}/manifest.mf" token="OpenIDE-Module-Implementation-Version: 0" value="OpenIDE-Module-Implementation-Version: ${git.revision}"/>
<echo>Setting implementation version for ${module_dir} to revision: ${nbm.revision}</echo>
<replace file="${module_dir}/manifest.mf" token="OpenIDE-Module-Implementation-Version: 0" value="OpenIDE-Module-Implementation-Version: ${nbm.revision}"/>
</then>
<else>
<echo>Removing implementation version for ${module_dir} from revision: ${git.revision}</echo>
<replace file="${module_dir}/manifest.mf" token="OpenIDE-Module-Implementation-Version: ${git.revision}" value="OpenIDE-Module-Implementation-Version: 0"/>
<echo>Removing implementation version for ${module_dir} from revision: ${nbm.revision}</echo>
<replace file="${module_dir}/manifest.mf" token="OpenIDE-Module-Implementation-Version: ${nbm.revision}" value="OpenIDE-Module-Implementation-Version: 0"/>
</else>
</if>
</target>
@ -208,7 +208,7 @@
<property name="suite.location" value="${basedir}"/>
<property name="suite.nbi.product.uid" value="${app.name}"/>
<!--TODO: this is .0.2 because of the pre-release static 3.0.0, else the RCs could not be installed next to a beta-->
<property name="suite.nbi.product.version" value="${plugins.version}.0.4"/>
<property name="suite.nbi.product.version" value="${plugins.version}.0.${nbm.revision}"/>
<property name="nbi.stub.location" value="${basedir}/nbi/stub"/>
<property name="nbi.stub.common.location" value="${basedir}/nbi/.common"/>
<property name="nbi.ant.tasks.jar" value="${basedir}/nbi/antlib/nbi-ant-tasks.jar"/>

1
sdk/nbproject/project.properties
View File

@ -10,6 +10,7 @@ app.icon.icns=jmonkeyplatform.icns
app.version=3.1-snapshot-github
#version number used for plugins, only 3 numbers (e.g. 3.1.3)
plugins.version=3.1.0
nbm.revision=0
#command line args
run.args.extra=-J-Xmx512m -J-XX\:PermSize\=128m -J-XX\:MaxDirectMemorySize\=2048m -J-Dsun.zip.disableMemoryMapping\=true -J-Dapple.awt.graphics.UseQuartz\=true -J-Dsun.java2d.noddraw\=true
auxiliary.org-netbeans-modules-apisupport-installer.license-file=license-jme.txt

21
version.gradle
View File

@ -5,25 +5,25 @@
Nightly Build Snapshot
* Full Version: 3.1.0-5124
* POM Version: 3.1.0-SNAPSHOT
* NBM Version: 3.1.0.5124
* NBM Revision: 5124
* NBM UC Suffix: nightly/3.1/plugins
Nightly Build Snapshot (PBRIsComing branch)
* Full Version: 3.1.0-PBRIsComing-5124
* POM Version: 3.1.0-PBRIsComing-SNAPSHOT
* NBM Version: 3.1.0.5124
* NBM Revision: 5124
* NBM UC Suffix: PBRIsComing-nightly/3.1/plugins
Alpha1 Release
* Full Version: 3.1.0-alpha1
* POM Version: 3.1.0-alpha1
* NBM Version: 3.1.0.0
* NBM UC Suffix: alpha1/3.1/plugins
* NBM Revision: 1
* NBM UC Suffix: stable/3.1/plugins
Final Release
* Full Version: 3.1.0
* POM Version: 3.1.0
* NBM Version: 3.1.0.0
* NBM Revision: 5
* NBM UC Suffix: stable/3.1/plugins
*/
@ -41,6 +41,7 @@ buildscript {
ext {
jmeRevision = 0
jmeNbmRevision = 0
jmeGitHash = ""
jmeGitTag = ""
jmeShortGitHash = ""
@ -48,7 +49,6 @@ ext {
jmeBranchName = "unknown"
jmeFullVersion = "${jmeVersion}-UNKNOWN"
jmePomVersion = "unknown"
jmeNbmVersion = "0.0.0.0"
jmeNbmUcSuffix = "unknown"
}
@ -64,7 +64,6 @@ task configureVersionInfo {
jmeFullVersion = "${jmeVersion}"
jmePomVersion = jmeVersion
jmeNbmVersion = jmeVersion
if (jmeBranchName != "master") {
jmeFullVersion += "-${jmeBranchName}"
@ -86,18 +85,18 @@ task configureVersionInfo {
if (jmeVersionTag == "SNAPSHOT") {
jmeFullVersion += "-${jmeRevision}"
jmePomVersion += "-SNAPSHOT"
jmeNbmVersion += ".${jmeRevision}"
jmeNbmRevision = jmeRevision
} else if (jmeVersionTag == "") {
jmeNbmVersion += ".0"
jmeNbmRevision = jmeVersionTagID
} else {
jmeFullVersion += "-${jmeVersionTag}"
jmePomVersion += "-${jmeVersionTag}"
jmeNbmVersion += ".0"
jmeNbmRevision = jmeVersionTagID
}
logger.warn("Full Version: ${jmeFullVersion}")
logger.warn("POM Version: ${jmePomVersion}")
logger.warn("NBM Version: ${jmeNbmVersion}")
logger.warn("NBM Revision: ${jmeNbmRevision}")
logger.warn("NBM UC Suffix: ${jmeNbmUcSuffix}")
} catch (ex) {
// Failed to get repo info