summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <sgothel@jausoft.com>2013-03-28 23:38:16 +0100
committerSven Gothel <sgothel@jausoft.com>2013-03-28 23:38:16 +0100
commit189149361f83ce7757824488eb3f51550cf428d3 (patch)
treef8adb1fb244c5fd326b5081cf6a4015355d1ea78
parentcb2662255e1db6741922d8654bf2ecd7cc75cd07 (diff)
Adapt to new version scheme, see GlueGen a3f2ef50ad33c58a240a17fcf03e415d772207c3, etc
-rw-r--r--make/build.xml7
-rwxr-xr-xmake/scripts/make.jogl.all.x86_64.sh1
2 files changed, 3 insertions, 5 deletions
diff --git a/make/build.xml b/make/build.xml
index f2a517f..b059e70 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -13,11 +13,6 @@
<project name="JOGL.demos" default="all">
<!-- This is the version of jogl-demos you are building -->
- <property name="jogl-demos_base_version" value="2.0"/>
- <tstamp>
- <format property="version.timestamp" pattern="yyyyMMdd"/>
- </tstamp>
- <property name="jogl-demos.version" value="${jogl-demos_base_version}-${version.timestamp}" />
<property name="project.root" value=".." />
@@ -94,6 +89,8 @@
</target>
<target name="init" depends="jogamp.env.init,gluegen.cpptasks.detect.os,java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt">
+ <property name="jogl-demos.version" value="${jogamp.version.base}-${version.timestamp}" />
+
<property name="gluegen-rt.jar" value="${gluegen.build}/gluegen-rt.jar" />
<property name="jogl-all.jar" value="${jogl.build}/jar/jogl-all.jar" />
<property name="jogl-cg.jar" value="${jogl.build}/jar/atomic/jogl-cg.jar" />
diff --git a/make/scripts/make.jogl.all.x86_64.sh b/make/scripts/make.jogl.all.x86_64.sh
index 7d192b8..0f7b959 100755
--- a/make/scripts/make.jogl.all.x86_64.sh
+++ b/make/scripts/make.jogl.all.x86_64.sh
@@ -12,6 +12,7 @@ fi
# -Djogl.cg=1 \
# -Djogl.redbook=true \
+# BUILD_ARCHIVE=true \
ant \
-Dtarget.sourcelevel=1.6 \
-Dtarget.targetlevel=1.6 \