summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2013-03-29 08:45:40 +0100
committerSven Gothel <sgothel@jausoft.com>2013-03-29 08:45:40 +0100
commit65b097a9edce2a8e49235a0eb9307f65db82e722 (patch)
tree030a757c2939b4678f64a3e37fcc0222284d216b
parent22da1512d84c621f6412c93d47a5be8d561b40fc (diff)
Adapt to new version scheme, see GlueGen a3f2ef50ad33c58a240a17fcf03e415d772207c3, etcv2.1.0v2.0.2-rc12v2.0.2v2.0-rc12
-rw-r--r--build.xml6
-rw-r--r--nbproject/project.properties3
2 files changed, 1 insertions, 8 deletions
diff --git a/build.xml b/build.xml
index 1b4d916..496fdf7 100644
--- a/build.xml
+++ b/build.xml
@@ -26,16 +26,12 @@
</target>
<target name="-pre-jar" depends="jogamp.env.init">
- <tstamp>
- <format property="version.timestamp" pattern="yyyyMMdd"/>
- </tstamp>
-
<property name="jocl-demos.build.number" value="manual" />
<property name="jocl-demos.build.id" value="${version.timestamp}" />
<property name="jocl-demos.build.branch" value="master" />
<property name="jocl-demos.build.commit" value="manual" />
- <property name="jocl-demos.version" value="${jocl_demos_base_version}-b${jocl-demos.build.number}-${version.timestamp}" />
+ <property name="jocl-demos.version" value="${jogamp.version.base}-b${jocl-demos.build.number}-${version.timestamp}" />
</target>
<target name="-post-jar" depends="tag.build,create-all-jnlps,gluegen.cpptasks.detect.os,build-archive"/>
diff --git a/nbproject/project.properties b/nbproject/project.properties
index e57700b..3763b44 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -90,9 +90,6 @@ test.src.dir=test
#no classpath for jarfile
jar.classpath=
-#the jocl-demos version you are building
-jocl_demos_base_version=0.9
-
#jnlp codebases
#jocl.codepase=file:../../jocl/dist/
#jogl.codepase=http://jogamp.org/deployment/webstart-next