diff options
| author | Sven Gothel <[email protected]> | 2012-03-10 06:57:19 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-03-10 06:57:19 +0100 |
| commit | 8d5786376337bcd40095c5a4d13e40696021e311 (patch) | |
| tree | 77bc2eafcb9f4e06d61b888385dc77a956628961 | |
| parent | e617834dcabdb83f383a2d2a82fcd2d9d987c154 (diff) | |
Fix rel GLUEGEN_CPPTASKS_FILE commit e617834dcabdb83f383a2d2a82fcd2d9d987c154
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml index be0f8c3..4dc8542 100755 --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -22,27 +22,29 @@ <!--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"/> + <!-- 0 fetch environment variable GLUEGEN_CPPTASKS_FILE -> gluegen-cpptasks.file --> <property environment="env" /> - <condition property="gluegen-cpptasks.file.1" value="${env.GLUEGEN_CPPTASKS_FILE}"> + <condition property="gluegen-cpptasks.file" value="${env.GLUEGEN_CPPTASKS_FILE}"> <not> <equals arg1="${env.GLUEGEN_CPPTASKS_FILE}" arg2="$${env.GLUEGEN_CPPTASKS_FILE}" casesensitive="true" /> </not> </condition> <!-- 1st check for relative location to gluegen.root --> - <condition property="gluegen-cpptasks.file.2" + <condition property="gluegen-cpptasks.file.rel" value="${gluegen.root}/${gluegen-cpptasks.file}"> <available file="${gluegen.root}/${gluegen-cpptasks.file}"/> </condition> <!-- 2nd check for absolute location --> - <condition property="gluegen-cpptasks.file.2" + <condition property="gluegen-cpptasks.file.rel" value="${gluegen-cpptasks.file}"> <available file="${gluegen-cpptasks.file}"/> </condition> <!-- 3rd use default value if the above is not successful --> - <property name="gluegen-cpptasks.file.2" value="${gluegen.root}/make/gluegen-cpptasks-base.xml" /> + <property name="gluegen-cpptasks.file.rel" value="${gluegen.root}/make/gluegen-cpptasks-base.xml" /> - <property name="gluegen-cpptasks.file.abs-path" location="${gluegen-cpptasks.file.2}" /> + <property name="gluegen-cpptasks.file.abs-path" location="${gluegen-cpptasks.file.rel}" /> + <echo message="gluegen-cpptasks.file.abs-path: ${gluegen-cpptasks.file.abs-path}" /> <import file="${gluegen-cpptasks.file.abs-path}" optional="false" /> </project> |