diff options
| author | Sven Gothel <[email protected]> | 2009-10-02 13:40:48 -0700 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2009-10-02 13:40:48 -0700 |
| commit | 22e98bcb38d51c5f9170d4d3d5afea89647413d4 (patch) | |
| tree | 8abe9ad09a80686f4703e572d2b4604f53916f43 /make/gluegen-cpptasks.xml | |
| parent | 889b9574958b04988ab3acbabab109745fbc379a (diff) | |
Add custom config locations via properties 'gluegen.user.properties.file' and 'gluegen.user.compiler.file'
Diffstat (limited to 'make/gluegen-cpptasks.xml')
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 16 |
1 files changed, 13 insertions, 3 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"> |