diff options
| author | Sven Gothel <[email protected]> | 2013-03-28 21:37:48 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-03-28 21:37:48 +0100 |
| commit | 4cbde3c73227546ffc5ae6d9943eb6b910d7fd37 (patch) | |
| tree | 0b0b68c777da565523c052829bc37b4dc3d40d00 | |
| parent | c284d9298dfdb7f94e2d81951e079393dfc8f785 (diff) | |
Adapt to new version scheme, see GlueGen a3f2ef50ad33c58a240a17fcf03e415d772207c3, etcv2.0.2-rc12v2.0-rc12
| -rwxr-xr-x | make/build.xml | 8 | ||||
| -rwxr-xr-x | make/scripts/make.joal-demos.all.linux-x86_64.sh | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml index 3a895da..e14c5fd 100755 --- a/make/build.xml +++ b/make/build.xml @@ -10,12 +10,6 @@ - built into its build directory. --> <project name="JOAL.demos" default="all"> - <property name="joal-demos_base_version" value="2.0"/> - <tstamp> - <format property="version.timestamp" pattern="yyyyMMdd"/> - </tstamp> - <property name="joal-demos.version" value="${joal-demos_base_version}-${version.timestamp}" /> - <property name="project.root" value=".." /> <condition property="rootrel.build" value="build"> @@ -62,6 +56,8 @@ </target> <target name="init" depends="jogamp.env.init, gluegen.cpptasks.detect.os, java.class.path.validate, gluegen.cpptasks.detect.os"> + <property name="joal-demos.version" value="${jogamp.version.base}-${version.timestamp}" /> + <property name="gluegen-rt.jar" value="${gluegen.build}/gluegen-rt.jar" /> <property name="joal.jar" value="${joal.build}/joal.jar" /> diff --git a/make/scripts/make.joal-demos.all.linux-x86_64.sh b/make/scripts/make.joal-demos.all.linux-x86_64.sh index c157266..ffb88b4 100755 --- a/make/scripts/make.joal-demos.all.linux-x86_64.sh +++ b/make/scripts/make.joal-demos.all.linux-x86_64.sh @@ -18,6 +18,7 @@ fi # -Drootrel.build=build-x86_64 \ +# BUILD_ARCHIVE=true \ ant \ -Dtarget.sourcelevel=1.6 \ -Dtarget.targetlevel=1.6 \ |