Playing audio again

- test: use jar file joal-test.jar
- test: use proper getResourceAsStream() on class instance
- test: plays sound

TODO:
    - check on windows and osx
    - add jnlp file template
    - joal-demos

2 files changed, 11 insertions, 4 deletions

diff --git a/make/build-test.xml b/make/build-test.xml
index e543a1c..beead31 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -60,7 +60,7 @@
         <property name="java.dir.manual"      value="${java.dir.test}/manual"/>
 
         <property name="obj.all.paths"        value="${gluegen.root}/build/obj${path.separator}${obj}"/>
-        <property name="classpath.all"        value="${gluegen.root}/build/gluegen-rt.jar${path.separator}${build}/joal.jar${path.separator}${classes}${path.separator}${junit.path}"/>
+        <property name="classpath.all"        value="${gluegen.root}/build/gluegen-rt.jar${path.separator}${build}/joal.jar${path.separator}${build}/joal-test.jar${path.separator}${junit.path}"/>
 
         <property name="batchtest.timeout"    value="1800000"/> <!-- 30 min -->
     </target>
@@ -71,6 +71,11 @@
         <copy todir="${classes}">
             <fileset dir="${src.test}" includes="**/*.wav"/>
         </copy>
+        <jar destfile="${build}/joal-test.jar">
+            <fileset dir="${classes}">
+              <include name="**" />
+            </fileset>
+        </jar>
     </target>
     
     <target name="clean">
@@ -84,9 +89,10 @@
         <junit forkmode="once" showoutput="true" fork="true" includeAntRuntime="true">
             <env key="${system.env.library.path}" path="${obj.all.paths}"/>
             <jvmarg value="-Djava.library.path=${obj.all.paths}"/>
+            <!--
             <jvmarg value="-Djogamp.debug.NativeLibrary=true"/>
             <jvmarg value="-Djogamp.debug.NativeLibrary.Lookup=true"/>
-            <jvmarg value="-Djogamp.debug.ProcAddressHelper=true"/>
+            <jvmarg value="-Djogamp.debug.ProcAddressHelper=true"/> -->
             <batchtest todir="${results.test}">
                 <fileset dir="${classes}">
                     <include name="${java.dir.junit}/**/*Test*"/>
@@ -129,9 +135,10 @@
                 <env key="${system.env.library.path}" path="${obj.all.paths}"/>
                 <env key="CLASSPATH" value="${classpath.all}"/>
                 <arg value="-Djava.library.path=${obj.all.paths}"/>
+                <!--
                 <arg line="-Djogamp.debug.NativeLibrary=true"/>
                 <arg line="-Djogamp.debug.NativeLibrary.Lookup=true"/>
-                <arg line="-Djogamp.debug.ProcAddressHelper=true"/>
+                <arg line="-Djogamp.debug.ProcAddressHelper=true"/> -->
                 <srcfile/>
                 <mappedresources>
                     <fileset dir="${classes}" includes="${test.class.path}"/>
diff --git a/make/build.xml b/make/build.xml
index fe020f2..79e8b33 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -501,7 +501,7 @@
       <antcall target="c.rename.joal.lib.mingw" inheritRefs="true" />
       <antcall target="c.rename.joal.lib.macosx" inheritRefs="true" />
       <!-- Create Java Web Start jar file from built file -->
-      <jar destfile="../${rootrel.build}/joal-natives-${os.and.arch}.jar">
+      <jar destfile="${build}/joal-natives-${os.and.arch}.jar">
         <fileset dir="../${rootrel.build}/obj">
           <include name="*joal.${native.library.suffix}" />
         </fileset>