From 22e98bcb38d51c5f9170d4d3d5afea89647413d4 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 2 Oct 2009 13:40:48 -0700
Subject: Add custom config locations via properties
 'gluegen.user.properties.file' and 'gluegen.user.compiler.file'

---
 make/gluegen-properties.xml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'make/gluegen-properties.xml')

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>
-- 
cgit v1.2.3