Added Gerard Ziemski's changes to the build process on OS X to look

for jogl.properties in the Library/Java subdirectory of the user's
home directory. Updated the build documentation.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@64 232f8b59-042b-4e1e-8c03-345bb8c30851

3 files changed, 31 insertions, 12 deletions

diff --git a/doc/HowToBuild.html b/doc/HowToBuild.html
index 59a4aa360..1f9a0e323 100644
--- a/doc/HowToBuild.html
+++ b/doc/HowToBuild.html
@@ -17,8 +17,12 @@ OpenGL binding from a fresh copy of the source distribution:
 
   <LI> <B>Unset your CLASSPATH environment variable:</B> <br> The Ant build requires that the Jogl jars not be visible on the classpath. On Unix, type <code> unsetenv CLASSPATH </code> into a csh or tcsh shell, or <code> set CLASSPATH=; export CLASSPATH </code> into a Bourne shell. On Windows, type <code> set CLASSPATH= </code> into a command prompt.
 
-  <LI> <B>Copy and edit jogl.properties:</B> <br> Copy <b>make/jogl.properties</b> into your home directory (pointed to by the Java system property <b>user.home</b>). Edit the copy to change any settings that are necessary, in particular the location of the ANTLR jar file (typically <b>$HOME/antlr-2.7.2/antlr.jar</b>).
-
+  <LI> <B>Copy and edit jogl.properties:</B> <br>
+    <UL>
+      <LI> <B>On Windows and X11 platforms:</B> Copy <b>make/jogl.properties</b> into your home directory (pointed to by the Java system property <b>user.home</b>).
+      <LI> <B>On Mac OS X:</B> Copy <b>make/jogl.properties</b> into the <b>Library/Java</b> subdirectory of your home directory (pointed to by the Java system property <b>user.home</b>).
+    </UL>
+    Edit the copy to change any settings that are necessary, in particular the location of the ANTLR jar file (typically <b>$HOME/antlr-2.7.2/antlr.jar</b>).
   <LI> <B>Build the source tree:</B> <br> Open a command shell in the "make" directory of the source tree and type "ant [target]", where [target] is one of <code>linux</code>, <code>macosx</code>, <code>solaris</code>, <code>win32.vc6</code>, <code>win32.vc7</code>, or <code>win32.mingw</code>.
       <UL>
 	<LI>The win32 targets require one of Microsoft Visual C++ 6, 7 (Visual Studio .NET) or the free MinGW (<a href="http://www.mingw.org/">http://www.mingw.org/</a>) compilers to be installed. Choose the appropriate target for the compiler desired.
diff --git a/make/build.xml b/make/build.xml
index 9dad237d6..0ff11d276 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -75,6 +75,15 @@
         <echo message="Loaded ${user.properties.file}." />
         <echo message="antlr.jar=${antlr.jar}" />
     </target>
+    <target name="load.user.properties.macosx" depends="base.init">
+        <!-- Load the user specified properties file that defines various host
+           - specific paths.  The user will be notified if this is does not
+           - exist. -->
+        <property name="user.properties.file" value="${user.home}/Library/Java/jogl.properties" />
+        <property file="${user.properties.file}" />
+        <echo message="Loaded ${user.properties.file}." />
+        <echo message="antlr.jar=${antlr.jar}" />
+    </target>
 
     <!-- ================================================================== -->
     <!-- 
@@ -83,7 +92,7 @@
     <target name="setup.java.home.dir.nonmacosx" depends="load.user.properties" unless="java.home.dir">
         <property name="java.home.dir" value="${java.home}/.." />
     </target>
-    <target name="setup.java.home.dir.macosx" depends="load.user.properties" unless="java.home.dir">
+    <target name="setup.java.home.dir.macosx" depends="load.user.properties.macosx" unless="java.home.dir">
         <property name="java.home.dir" value="/System/Library/Frameworks/JavaVM.framework/Home" />
     </target>
 
diff --git a/make/validate-properties.xml b/make/validate-properties.xml
index 3a4ccd741..0b5a66bf6 100644
--- a/make/validate-properties.xml
+++ b/make/validate-properties.xml
@@ -13,9 +13,12 @@
         <fail>
         
     *****************************************************************
-    ** The property &quot;antlr.jar&quot; was not set in the jogl.properties **
-    ** file that should be in your home directory (${user.home}).    **
-    ** Please set &quot;antlr.jar&quot; to the full path of the ANTLR jar    **
+    ** The property "antlr.jar" was not set in the JOGL properties **
+    ** file                                                        **
+    ** "${user.properties.file}"               **
+    ** (or this file was not found).                               **
+    **                                                             **
+    ** Please set "antlr.jar" to to the full path of the ANTLR jar **
     ** including the jar itself.                                   **
     *****************************************************************
         </fail>
@@ -28,12 +31,15 @@
       -->
     <target name="java.home.dir.validate" unless="java.home.dir">
         <fail>
-        
-    *********************************************************************
-    ** The property &quot;java.home.dir&quot; was not set in the jogl.properties **
-    ** file that should be in your home directory (${user.home}).       **
-    ** Please set &quot;java.home.dir&quot; to your JAVA_HOME directory.         **
-    *********************************************************************
+
+    *************************************************************
+    ** The property "java.home.dir" was not set in the JOGL    **
+    ** properties file                                         **
+    ** "${user.properties.file}"               **
+    ** (or this file was not found).                           **
+    **                                                         **
+    ** Please set "java.home.dir" to your JAVA_HOME directory. **
+    *************************************************************
         </fail>
     </target>