diff options
| author | Michael Bien <[email protected]> | 2010-03-27 02:46:25 +0100 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-03-27 02:46:25 +0100 |
| commit | 45ef1faaecdb809d8724fbe6762dd3c23976b526 (patch) | |
| tree | 427f441ed44008e654a1ecd2d2245f5327d656cc /make/gluegen-cpptasks.xml | |
| parent | bb9028843b1e382180fd2663e5c98b86fc37718b (diff) | |
| parent | 2b61964060ffb79a313030d795ad069fbbe97b88 (diff) | |
Merge branch 'master' of [email protected]:mbien/gluegen
Conflicts:
src/junit/com/jogamp/gluegen/test/junit/Test1.java
Diffstat (limited to 'make/gluegen-cpptasks.xml')
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/make/gluegen-cpptasks.xml b/make/gluegen-cpptasks.xml index dc88340..f569ea7 100755 --- a/make/gluegen-cpptasks.xml +++ b/make/gluegen-cpptasks.xml @@ -26,18 +26,20 @@ <typedef resource="net/sf/antcontrib/cpptasks/antlib.xml" classpath="${gluegen.root}/make/lib/cpptasks.jar;${gluegen.root}/make/lib/CppTasksGCCNamespaceHack.jar"/> <condition property="gluegen-cpptasks.file" - value="${basedir}/${gluegen.root}/make/gluegen-cpptasks-base.xml"> + value="${gluegen.root}/make/gluegen-cpptasks-base.xml"> <not> <isset property="gluegen-cpptask.file" /> </not> </condition> + <property name="gluegen-cpptasks.file.abs-path" location="${gluegen-cpptasks.file}" /> + <!-- <echo message="gluegen-cpptasks.xml: gluegen.root ${gluegen.root}"/> - <echo message="gluegen-cpptasks.xml: gluegen-cpptasks.file ${gluegen-cpptasks.file}"/> + <echo message="gluegen-cpptasks.xml: gluegen-cpptasks.file ${gluegen-cpptasks.file} -> ${gluegen-cpptasks.file.abs-path}"/> <echo message="gluegen-cpptasks.xml: basedir ${basedir}"/> --> - <import file="${gluegen-cpptasks.file}" optional="false" /> + <import file="${gluegen-cpptasks.file.abs-path}" optional="false" /> </project> |