Update GearsJOALApplet: Depending on joal build; incl joal snippet, remove joal/joal-demos jar files.

1 files changed, 35 insertions, 30 deletions

diff --git a/make/build.xml b/make/build.xml
index f2bca4c..f9cf521 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -20,8 +20,6 @@
     <property name="jogl-demos.version" value="${jogl-demos_base_version}-${version.timestamp}" />
 
     <property name="project.root"  value=".." />
-    <property name="jogl.root" value="${project.root}/../jogl" />
-    <property name="gluegen.root" value="${project.root}/../gluegen" />
 
     <condition property="rootrel.build" value="build">
       <not>
@@ -30,6 +28,15 @@
     </condition>
     <property name="build" location="${project.root}/${rootrel.build}" />
 
+    <property name="gluegen.root"  value="${project.root}/../gluegen" />
+    <property name="gluegen.build" value="${gluegen.root}/${rootrel.build}" />
+
+    <property name="jogl.root"     value="${project.root}/../jogl" />
+    <property name="jogl.build"    value="${jogl.root}/${rootrel.build}" />
+
+    <property name="joal.root"     value="${project.root}/../joal" />
+    <property name="joal.build"    value="${joal.root}/${rootrel.build}" />
+
     <property file="${build}/artifact.properties"/>
     <property name="jogl-demos.build.number" value="manual-build"/>
     <property name="jogl-demos.build.id"     value="${version.timestamp}"/>
@@ -84,35 +91,34 @@
     </target>
 
     <target name="init" depends="java.class.path.validate,setup.gles,setup.cg.excludes,skip.cg.excludes,init.swt">
-        <property name="jogl.core.jar"       value="${jogl.root}/${rootrel.build}/jogl/jogl.core.jar" />
-        <condition property="jogl.cg.jar"    value="${jogl.root}/${rootrel.build}/jogl/jogl.cg.jar">
+        <property name="jogl.core.jar"       value="${jogl.build}/jogl/jogl.core.jar" />
+        <condition property="jogl.cg.jar"    value="${jogl.build}/jogl/jogl.cg.jar">
           <isset property="jogl.cg"/>
         </condition>
-        <property name="gluegen-rt.jar"      value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" />
-        <property name="jogl.gles12.jar"     value="${jogl.root}/${rootrel.build}/jogl/jogl.gles12.jar" />
-        <property name="jogl.gles12.dbg.jar" value="${jogl.root}/${rootrel.build}/jogl/jogl.gles12.dbg.jar" />
-        <property name="jogl.gles1.jar"      value="${jogl.root}/${rootrel.build}/jogl/jogl.gles1.jar" />
-        <property name="jogl.gles1.dbg.jar"  value="${jogl.root}/${rootrel.build}/jogl/jogl.gles1.dbg.jar" />
-        <property name="jogl.gles2.jar"      value="${jogl.root}/${rootrel.build}/jogl/jogl.gles2.jar" />
-        <property name="jogl.gles2.dbg.jar"  value="${jogl.root}/${rootrel.build}/jogl/jogl.gles2.dbg.jar" />
-        <property name="jogl.egl.jar"        value="${jogl.root}/${rootrel.build}/jogl/jogl.egl.jar" />
-        <property name="jogl.gldesktop.jar"  value="${jogl.root}/${rootrel.build}/jogl/jogl.gldesktop.jar" />
-        <property name="jogl.gldesktop.dbg.jar" value="${jogl.root}/${rootrel.build}/jogl/jogl.gldesktop.dbg.jar" />
-        <property name="jogl.awt.jar"        value="${jogl.root}/${rootrel.build}/jogl/jogl.awt.jar" />
-        <property name="jogl.util.jar"       value="${jogl.root}/${rootrel.build}/jogl/jogl.util.jar" />
-        <property name="jogl.util.awt.jar"   value="${jogl.root}/${rootrel.build}/jogl/jogl.util.awt.jar" />
-        <property name="jogl.util.fixedfuncemu.jar" value="${jogl.root}/${rootrel.build}/jogl/jogl.util.fixedfuncemu.jar" />
-        <property name="jogl.util.gldesktop.jar" value="${jogl.root}/${rootrel.build}/jogl/jogl.util.gldesktop.jar" />
-        <property name="nativewindow.core.jar" value="${jogl.root}/${rootrel.build}/nativewindow/nativewindow.core.jar" />
-        <property name="nativewindow.x11.jar"  value="${jogl.root}/${rootrel.build}/nativewindow/nativewindow.x11.jar" />
-        <property name="nativewindow.awt.jar"  value="${jogl.root}/${rootrel.build}/nativewindow/nativewindow.awt.jar" />
-        <property name="newt.core.jar"       value="${jogl.root}/${rootrel.build}/newt/newt.core.jar" />
-        <property name="newt.ogl.jar"        value="${jogl.root}/${rootrel.build}/newt/newt.ogl.jar" />
-        <property name="newt.awt.jar"        value="${jogl.root}/${rootrel.build}/newt/newt.awt.jar" />
-        <property name="joal.jar"            value="${project.root}/lib/joal.jar" />
-        <property name="joal-demos.jar"      value="${project.root}/lib/joal-demos.jar" />
+        <property name="gluegen-rt.jar"      value="${gluegen.build}/gluegen-rt.jar" />
+        <property name="jogl.gles12.jar"     value="${jogl.build}/jogl/jogl.gles12.jar" />
+        <property name="jogl.gles12.dbg.jar" value="${jogl.build}/jogl/jogl.gles12.dbg.jar" />
+        <property name="jogl.gles1.jar"      value="${jogl.build}/jogl/jogl.gles1.jar" />
+        <property name="jogl.gles1.dbg.jar"  value="${jogl.build}/jogl/jogl.gles1.dbg.jar" />
+        <property name="jogl.gles2.jar"      value="${jogl.build}/jogl/jogl.gles2.jar" />
+        <property name="jogl.gles2.dbg.jar"  value="${jogl.build}/jogl/jogl.gles2.dbg.jar" />
+        <property name="jogl.egl.jar"        value="${jogl.build}/jogl/jogl.egl.jar" />
+        <property name="jogl.gldesktop.jar"  value="${jogl.build}/jogl/jogl.gldesktop.jar" />
+        <property name="jogl.gldesktop.dbg.jar" value="${jogl.build}/jogl/jogl.gldesktop.dbg.jar" />
+        <property name="jogl.awt.jar"        value="${jogl.build}/jogl/jogl.awt.jar" />
+        <property name="jogl.util.jar"       value="${jogl.build}/jogl/jogl.util.jar" />
+        <property name="jogl.util.awt.jar"   value="${jogl.build}/jogl/jogl.util.awt.jar" />
+        <property name="jogl.util.fixedfuncemu.jar" value="${jogl.build}/jogl/jogl.util.fixedfuncemu.jar" />
+        <property name="jogl.util.gldesktop.jar" value="${jogl.build}/jogl/jogl.util.gldesktop.jar" />
+        <property name="nativewindow.core.jar" value="${jogl.build}/nativewindow/nativewindow.core.jar" />
+        <property name="nativewindow.x11.jar"  value="${jogl.build}/nativewindow/nativewindow.x11.jar" />
+        <property name="nativewindow.awt.jar"  value="${jogl.build}/nativewindow/nativewindow.awt.jar" />
+        <property name="newt.core.jar"       value="${jogl.build}/newt/newt.core.jar" />
+        <property name="newt.ogl.jar"        value="${jogl.build}/newt/newt.ogl.jar" />
+        <property name="newt.awt.jar"        value="${jogl.build}/newt/newt.awt.jar" />
+        <property name="joal.jar"            value="${joal.build}/joal.jar" />
         <property name="simple-xml.jar"      value="${project.root}/lib/simple-xml-1.1.1.jar" />
-        <property name="classes"             value="${project.root}/${rootrel.build}/classes" />
+        <property name="classes"             value="${build}/classes" />
         <property name="src"                 value="${project.root}/src" />
         <property name="javadoc"             value="${project.root}/javadoc" />
         <property name="javadoc.link"        value="http://java.sun.com/j2se/1.4.2/docs/api/" />
@@ -178,7 +184,6 @@
             <pathelement location="${newt.ogl.jar}" />
             <pathelement location="${newt.awt.jar}" />
             <pathelement location="${joal.jar}" />
-            <pathelement location="${joal-demos.jar}" />
             <pathelement location="${gluegen-rt.jar}" />
             <pathelement location="${simple-xml.jar}" />
             <pathelement location="${swt.jar}" />
@@ -268,7 +273,7 @@
     <target name="all" depends="init, all-desktop, all-gles, tag.build, developer-zip-archive" />
 
     <target name="tag.build">
-        <copy file="${jogl.root}/${rootrel.build}/artifact.properties" todir="${build}" overwrite="true"/>
+        <copy file="${jogl.build}/artifact.properties" todir="${build}" overwrite="true"/>
         <echo message='jogl-demos.build.number=${jogl-demos.build.number}${line.separator}' file="${build}/artifact.properties" append="true"/>
         <echo message='jogl-demos.build.id=${jogl-demos.build.id}${line.separator}'         file="${build}/artifact.properties" append="true"/>
         <echo message='jogl-demos.build.branch=${jogl-demos.build.branch}${line.separator}' file="${build}/artifact.properties" append="true"/>