From 3defef76b49fb2263956edb79a3b0815a6d8beba Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Fri, 28 Oct 2016 15:40:40 -0700
Subject: build: flatten directory names in j3d-util repo

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
 build.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 6f9b08e..124208f 100644
--- a/build.xml
+++ b/build.xml
@@ -11,8 +11,8 @@
   <property name="j3dtools.src.dir"  location="${j3dtools.dir}/src"/>
 
   <property name="vecmath.lib"       location="../vecmath/build/jars/vecmath.jar"/>
-  <property name="jogl.lib"          location="../jogl-v2.3.1/jogl-all.jar"/>
-  <property name="gluegen.lib"       location="../jogl-v2.3.1/gluegen-rt.jar"/>
+  <property name="jogl.lib"          location="../jogl-v2.3.2/jogl-all.jar"/>
+  <property name="gluegen.lib"       location="../jogl-v2.3.2/gluegen-rt.jar"/>
   
   <property name="version_base"             value="1.6.0"/>
   <property name="build.spec.title"         value="3D Graphics API for the Java Platform"/>
@@ -72,7 +72,7 @@
   </target>
 
   <target name="compile" depends="gen">
-    <javac srcdir="${src.dir}:${j3dtools.src.dir}/classes/share:${gen.dir}/src"
+    <javac srcdir="${src.dir}:${j3dtools.src.dir}:${gen.dir}/src"
            destdir="${class.dir}"
            source="1.5"
            target="1.5"
@@ -84,7 +84,7 @@
 
     <copy todir="${class.dir}">
       <fileset dir="${src.dir}"          includes="**/*.properties"/>
-      <fileset dir="${j3dtools.src.dir}/classes/share" includes="**/*.properties"/>
+      <fileset dir="${j3dtools.src.dir}" includes="**/*.properties"/>
     </copy>
   </target>
   
@@ -129,7 +129,7 @@
     </zip>
 
     <zip destfile="${build.dir}/jars/j3dutils-src.zip">
-      <fileset dir="${j3dtools.src.dir}/classes/share" includes="com/**/*.java"/>
+      <fileset dir="${j3dtools.src.dir}" includes="com/**/*.java"/>
       <fileset dir="${j3dtools.dir}" includes="COPYRIGHT.txt"/>
       <fileset dir="${j3dtools.dir}" includes="*LICENSE*.txt"/>
     </zip>
-- 
cgit v1.2.3