summaryrefslogtreecommitdiffstats
path: root/make/gluegen-cpptasks.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2012-02-24 04:35:53 +0100
committerSven Gothel <[email protected]>2012-02-24 04:35:53 +0100
commita17170a3ec4ed338d902eaaa3b17e9dbb69b6374 (patch)
tree02f256d42cabb7c1537801add878cf87c11170b9 /make/gluegen-cpptasks.xml
parent9520a52d504cc6219ca5027e4bde4b8280463879 (diff)
Exposing custom gluegen-cpptask.file for crosscompilation presets, adding gluegen-cpptasks-linux-armv7.xml
Env: GLUEGEN_CPPTASKS_FILE -> property: gluegen-cpptasks.file
Diffstat (limited to 'make/gluegen-cpptasks.xml')
-rwxr-xr-xmake/gluegen-cpptasks.xml12
1 files changed, 8 insertions, 4 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml
index f4278d4..70270c4 100755
--- a/make/gluegen-cpptasks.xml
+++ b/make/gluegen-cpptasks.xml
@@ -26,15 +26,19 @@
<!--typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar;${gluegen.root}/make/lib/CppTasksGCCNamespaceHack.jar"/-->
<typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar"/>
- <condition property="gluegen-cpptasks.file"
- value="${gluegen.root}/make/gluegen-cpptasks-base.xml">
+ <property environment="env" />
+ <condition property="gluegen-cpptasks.file" value="${env.GLUEGEN_CPPTASKS_FILE}">
<not>
- <isset property="gluegen-cpptask.file" />
+ <equals arg1="${env.GLUEGEN_CPPTASKS_FILE}" arg2="$${env.GLUEGEN_CPPTASKS_FILE}" casesensitive="true" />
</not>
</condition>
-
+ <property name="gluegen-cpptasks.file" value="${gluegen.root}/make/gluegen-cpptasks-base.xml" /> <!-- default value -->
<property name="gluegen-cpptasks.file.abs-path" location="${gluegen-cpptasks.file}" />
+ <echo message="GLUEGEN_CPPTASKS_FILE ${env.GLUEGEN_CPPTASKS_FILE}"/>
+ <echo message="gluegen-cpptasks.file ${gluegen-cpptasks.file}"/>
+ <echo message="gluegen-cpptasks.file.abs-path ${gluegen-cpptasks.file.abs-path}"/>
+
<!--
<echo message="gluegen-cpptasks.xml: gluegen.root ${gluegen.root}"/>
<echo message="gluegen-cpptasks.xml: gluegen-cpptasks.file ${gluegen-cpptasks.file} -> ${gluegen-cpptasks.file.abs-path}"/>