diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 11 | ||||
| -rw-r--r-- | make/validate-properties.xml | 24 |
2 files changed, 25 insertions, 10 deletions
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 "antlr.jar" was not set in the jogl.properties ** - ** file that should be in your home directory (${user.home}). ** - ** Please set "antlr.jar" 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 "java.home.dir" was not set in the jogl.properties ** - ** file that should be in your home directory (${user.home}). ** - ** Please set "java.home.dir" 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> |