From 4dbb8731219212e27c9afb769a1c62b32bd230a6 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 5 Aug 2011 05:32:15 +0200
Subject: deployment resturcturing: combine nativewindow/jogl/newt ; newt:
 'driver' separation ; android cleanup

remaining all-in-one jnlp's / jars:
  jogl-all-awt.jnlp    -> jogl.all.jar
  jogl-all-noawt.jnlp  -> jogl.all-noawt.jar
  jogl-all-mobile.jnlp -> jogl.all-mobile.jar
  native for all above:   jogl-all-natives-linux-amd64.jar

  jogl.all-android.apk    jogl.all-android.jar

  more may follow for each supported platfrom

++++

- newt: proper 'driver' separation
  - all drivers reside now in jogamp.newt.driver.*

- remove intptr.cfg / use gluegen's
---
 make/build-test.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'make/build-test.xml')

diff --git a/make/build-test.xml b/make/build-test.xml
index 9dfc526c9..ed7584feb 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -71,10 +71,10 @@
       <uptodate property="test.compile.skip">
         <srcfiles dir= "."                 includes="*.xml"/>
         <srcfiles dir= "${src.test}"       includes="**"/>
-        <srcfiles                          file="${nativewindow.all.jar}" />
-        <srcfiles                          file="${jogl.all.jar}" />
-        <srcfiles                          file="${newt.all.jar}" />
         <srcfiles                          file="${gluegen.jar}" />
+        <srcfiles                          dir="${src}/nativewindow" />
+        <srcfiles                          dir="${src}/jogl" />
+        <srcfiles                          dir="${src}/newt" />
         <mapper type="merge" to="${jogl.test.jar.path}"/>
       </uptodate>
     </target>
@@ -87,7 +87,7 @@
                memoryMaximumSize="${javac.memorymax}"
                includeAntRuntime="false"
                debug="${javacdebug}" debuglevel="${javacdebuglevel}">
-            <classpath refid="junit_jogl_newt.compile.classpath"/>
+            <classpath refid="junit_jogl_newt_android.compile.classpath"/>
             <src path="${src.test}" />
         </javac>
         <jar destfile="${jogl.test.jar}" filesonly="true">
@@ -135,7 +135,7 @@
                  failonerror="false"
                  output="${test.class.result.file}">
                 <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-                <env key="CLASSPATH" value="${junit_jogl_newt_awt.run.jars}"/>
+                <env key="CLASSPATH" value="${junit_jogl_awt.run.jars}"/>
                 <arg value="-Djava.library.path=${obj.all.paths}"/>
                 <!--
                 <arg line="-Dnewt.debug.EDT"/>
@@ -218,7 +218,7 @@
                  relative="true"
                  failonerror="false">
                 <env key="${system.env.library.path}" path="${obj.all.paths}"/>
-                <env key="CLASSPATH" value="${junit_jogl_newt.run.jars}"/>
+                <env key="CLASSPATH" value="${junit_jogl_noawt.run.jars}"/>
                 <arg value="-Djava.library.path=${obj.all.paths}"/>
                 <arg line="${jvmarg.headless}"/>
                 <!--
@@ -271,7 +271,7 @@
 
             <formatter usefile="false" type="plain"/>
             <formatter usefile="true" type="xml"/>
-            <classpath refid="junit_jogl_newt.run.classpath"/>
+            <classpath refid="junit_jogl_noawt.run.classpath"/>
 
             <batchtest todir="${results.test}">
               <fileset dir="${classes}">
@@ -337,7 +337,7 @@
 
             <formatter usefile="false" type="plain"/>
             <formatter usefile="true" type="xml"/>
-            <classpath refid="junit_jogl_newt_awt.run.classpath"/>
+            <classpath refid="junit_jogl_awt.run.classpath"/>
 
             <test name="${testclass}"/>
         </junit>
@@ -462,7 +462,7 @@
 
             <formatter usefile="false" type="plain"/>
             <formatter usefile="true" type="xml"/>
-            <classpath refid="junit_jogl_newt_awt.run.classpath"/>
+            <classpath refid="junit_jogl_awt.run.classpath"/>
 
             <batchtest todir="${results.test}">
               <fileset dir="${classes}">
-- 
cgit v1.2.3