Add custom config locations via properties 'gluegen.user.properties.file' and 'gluegen.user.compiler.file'

4 files changed, 46 insertions, 8 deletions

diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index d3f24b6..4afca7a 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -12,7 +12,11 @@
    - executed) to the top of the checked-out GlueGen workspace.
    - 
    - This Ant project file depends on properties being set
-   - via gluegen.properties, see: gluegen-properties.xml !
+   - via gluegen.properties, see: gluegen-properties.xml and gluegen.properties !
+   - 
+   - You may overwrite the following compiler configuration
+   - as define below in 'gluegen.cpptasks.configure.compiler'
+   - with your custom one, see gluegen.compiler.xml !
    - 
    - The gluegen.cpptasks.detect.os target sets the following
    - properties appropriately. They are only set to "true" if the OS/CPU
@@ -125,8 +129,14 @@
   <!-- import cpptasks -->
   <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar"/>
 
-  <available file="${user.home}/gluegen.compiler.xml" property="gluegen.compiler.present"/>
-  <import file="${user.home}/gluegen.compiler.xml" optional="true" />
+  <condition property="gluegen.user.compiler.file"
+             value="${user.home}/gluegen.compiler.xml">
+    <not>
+        <isset property="gluegen.user.compiler.file" />
+    </not>
+  </condition>
+  <available file="${gluegen.user.compiler.file}" property="gluegen.compiler.present"/>
+  <import file="${gluegen.user.compiler.file}" optional="true" />
 
   <!-- Detect OS and compiler configuration -->
   <target name="gluegen.cpptasks.detect.os.1" depends="gluegen.properties.load.user" unless="gluegen.cpptasks.detected.os">
diff --git a/make/gluegen-properties.xml b/make/gluegen-properties.xml
index 834aae7..19483bb 100755
--- a/make/gluegen-properties.xml
+++ b/make/gluegen-properties.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
+   - This Ant project file depends on properties being set
+   - via gluegen.properties, see: gluegen.properties !
+   - 
    - This Ant project file depends on the following properties being set
    - externally:
    - 
@@ -20,13 +23,19 @@
   -->
 <project name="GlueGen-properties" basedir=".">
 
-  <target name="gluegen.properties.load.user" unless="gluegen.user.properties.file">
+  <target name="gluegen.properties.load.user" unless="gluegen.user.properties.file.set">
     <!-- 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="gluegen.user.properties.file" value="${user.home}/gluegen.properties" />
-    <property file="${gluegen.user.properties.file}" />
-    <echo message="Loaded ${gluegen.user.properties.file}." />
+    <condition property="gluegen.user.properties.file"
+                 value="${user.home}/gluegen.properties">
+      <not>
+        <isset property="gluegen.user.properties.file" />
+      </not>
+    </condition>
+    <property name="gluegen.user.properties.file.set" value="${gluegen.user.properties.file}"/>
+    <property file="${gluegen.user.properties.file.set}" />
+    <echo message="Loaded ${gluegen.user.properties.file.set}." />
     <fail message="antlr.jar was not specified in gluegen.properties. Please see README.txt for instructions" unless="antlr.jar"/>
     <echo message="antlr.jar=${antlr.jar}" />
   </target>
diff --git a/make/gluegen.compiler.xml b/make/gluegen.compiler.xml
index ee7ebee..7d94567 100644
--- a/make/gluegen.compiler.xml
+++ b/make/gluegen.compiler.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    This is an example of how to add custom compiler/linker 
+    arguments for a crosscompiler.
+
+    You can use such files with setting the property 'gluegen.user.compiler.file', ie:
+
+        -Dgluegen.user.compiler.file=`pwd`/lib/gluegen.compiler.xml
+
+    or by having such file in your home directory, ie:
+
+        ~/gluegen.compiler.xml
+  -->
+
 <project name="GlueGen-cpptasks" basedir="." >
 
 <target name="gluegen.cpptasks.configure.compiler" depends="setup.java.home.dir">
diff --git a/make/gluegen.properties b/make/gluegen.properties
index 2e110e3..8d667b4 100755
--- a/make/gluegen.properties
+++ b/make/gluegen.properties
@@ -1,7 +1,12 @@
 ###############################################################################
 # The host specific properties.  The build will inform you of required
-# properties.  This file must be copied into your home directory (pointed
+# properties.  This file shall be copied into your home directory (pointed
 # to by the Java system property user.home) and the copy modified appropriately.
+#
+# You may also specify the location of this file 
+# while setting the property 'gluegen.user.properties.file', ie:
+#      -Dgluegen.user.properties.file=`pwd`/lib/gluegen.properties
+#
 ###############################################################################
 #
 # The required antlr.jar property that is the full path to the antlr.jar