- update JmeVersion automatically in build script
- change handling of version "tag" (stable, svn etc.)
This commit is contained in:
parent
70412593ba
commit
539c2e65fc
@ -9,7 +9,7 @@ apply plugin: 'maven'
|
|||||||
//String jmeVersion = rootProject.version;
|
//String jmeVersion = rootProject.version;
|
||||||
|
|
||||||
String mavenGroupId = 'com.jme3'
|
String mavenGroupId = 'com.jme3'
|
||||||
String mavenVersion = jmeVersion + jmeVersionSuffix //'-SNAPSHOT'
|
String mavenVersion = jmeVersion + '-' + jmeVersionTag //'-SNAPSHOT'
|
||||||
|
|
||||||
sourceCompatibility = '1.5'
|
sourceCompatibility = '1.5'
|
||||||
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
|
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
jmeVersion = 3.0.10
|
jmeVersion = 3.0.10
|
||||||
# Version used for application and settings folder, no spaces!
|
# Version used for application and settings folder, no spaces!
|
||||||
jmeMainVersion = 3.1
|
jmeMainVersion = 3.1
|
||||||
# Version addition -pre-alpha-svn, -Stable, -Beta
|
# Version addition pre-alpha-svn, Stable, Beta
|
||||||
jmeVersionSuffix = -pre-alpha-svn
|
jmeVersionTag = pre-alpha-svn
|
||||||
|
|
||||||
# specify if SDK and Native libraries get built
|
# specify if SDK and Native libraries get built
|
||||||
buildSdkProject = true
|
buildSdkProject = true
|
||||||
|
@ -12,5 +12,15 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
task updateVersion << {
|
||||||
|
ant.replaceregexp(
|
||||||
|
file: 'src/main/java/com/jme3/system/JmeVersion.java',
|
||||||
|
match: 'private static final String FULL_NAME = (.*);',
|
||||||
|
replace: 'private static final String FULL_NAME = "jMonkeyEngine ' + jmeVersion + ' (' + jmeVersionTag + ')";',
|
||||||
|
byline: 'true')
|
||||||
|
}
|
||||||
|
|
||||||
|
compileJava.dependsOn(updateVersion)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
}
|
}
|
||||||
|
@ -389,12 +389,12 @@ copyTestSources.outputs.dir "JME3TestsTemplate/src/"
|
|||||||
copyTestSources.outputs.dir "JME3TestsTemplateAndroid/src/"
|
copyTestSources.outputs.dir "JME3TestsTemplateAndroid/src/"
|
||||||
|
|
||||||
ant.properties['plugins.version'] = jmeVersion
|
ant.properties['plugins.version'] = jmeVersion
|
||||||
ant.properties['app.version']= jmeMainVersion + jmeVersionSuffix
|
ant.properties['app.version']= jmeMainVersion + "-" + jmeVersionTag
|
||||||
|
|
||||||
task buildSdk(dependsOn: [copyBaseLibs, copyProjectLibs, createProjectXml, createBaseXml, copyTestSources]) <<{
|
task buildSdk(dependsOn: [copyBaseLibs, copyProjectLibs, createProjectXml, createBaseXml, copyTestSources]) <<{
|
||||||
ant.propertyfile(file: "nbproject/project.properties") {
|
ant.propertyfile(file: "nbproject/project.properties") {
|
||||||
entry( key: "plugins.version", value: "${jmeVersion}")
|
entry( key: "plugins.version", value: "${jmeVersion}")
|
||||||
entry( key: "app.version", value: "${jmeMainVersion + jmeVersionSuffix}")
|
entry( key: "app.version", value: "${jmeMainVersion + "-" + jmeVersionTag}")
|
||||||
}
|
}
|
||||||
ant.ant(dir: ".", antfile: "build.xml", target: "build")
|
ant.ant(dir: ".", antfile: "build.xml", target: "build")
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user