1) Fixed an error in CLASSPATH setup for running example program in ant.

2) Copy resources to build in preparation for jarring

1 files changed, 33 insertions, 6 deletions

diff --git a/build.xml b/build.xml
index b6e6173..a78f370 100644
--- a/build.xml
+++ b/build.xml
@@ -74,6 +74,19 @@
     <!-- Create the dist directory -->
     <mkdir dir="${dist}"/>
 
+    <!-- Copy resources to build in preparation for jarring -->
+    <copy todir="${build}/classes/org/jdesktop/j3d/examples/resources">
+        <fileset dir="${src}/resources"/>
+    </copy>
+    <!-- Cg shader -->   
+    <copy todir="${build}/classes/org/jdesktop/j3d/examples/resources/cg_shader">
+        <fileset dir="${src}/classes/org/jdesktop/j3d/examples/cg_shader" includes ="*.cg"/>
+    </copy>
+    <!-- GLSL shader -->
+    <copy todir="${build}/classes/org/jdesktop/j3d/examples/resources/glsl_shader">
+        <fileset dir="${src}/classes/org/jdesktop/j3d/examples/glsl_shader" includes ="*.vert, *.frag"/>
+    </copy>   
+    
     <!-- Create the jar file -->
     <jar jarfile="${output.jar}"
          manifest="manifest.mf"
@@ -107,23 +120,37 @@
    -->
 
   <target name="run.HelloUniverse" depends="init-run">
-    <java classpath="${run.classpath}"
-          fork="true"
+    <java fork="true"
           classname="org.jdesktop.j3d.examples.hello_universe.HelloUniverse">
+      <classpath refid="run.classpath"/>
     </java>
   </target>
 
+  <target name="run.BackgroudGeometry" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.background.BackgroundGeometry">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+  
   <target name="run.QueryProperties" depends="init-run">
-    <java classpath="${run.classpath}"
-          fork="true"
+    <java fork="true"
           classname="org.jdesktop.j3d.examples.package_info.QueryProperties">
+      <classpath refid="run.classpath"/>
     </java>
   </target>
 
   <target name="run.SphereMotion" depends="init-run">
-    <java classpath="${run.classpath}"
-          fork="true"
+    <java fork="true"
           classname="org.jdesktop.j3d.examples.sphere_motion.SphereMotion">
+      <classpath refid="run.classpath"/>
+    </java>
+  </target>
+  
+  <target name="run.ObjLoad" depends="init-run">
+    <java fork="true"
+          classname="org.jdesktop.j3d.examples.objload.ObjLoad">
+      <classpath refid="run.classpath"/>
     </java>
   </target>