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 | |
| 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')
| -rw-r--r-- | make/build-junit.xml | 8 | ||||
| -rwxr-xr-x | make/gluegen-cpptasks.xml | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml index 2a6807d..dd87cdd 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -48,6 +48,8 @@ <property name="gluegen.jar" value="${gluegen.root}/${rootrel.build}/gluegen.jar" /> <property name="gluegen-rt.jar" value="${gluegen.root}/${rootrel.build}/gluegen-rt.jar" /> + <property name="gluegen.lib" value="${gluegen.root}/${rootrel.build}/obj" /> + <property name="junit.jar" value="${gluegen.root}/make/lib/junit-4.5.jar" /> <property name="gluegen-test.jar" value="${build_t}/gluegen-test.jar" /> @@ -106,7 +108,7 @@ <jar destfile="${gluegen-test.jar}"> <fileset dir="${build_t.java}"> - <include name="${test.junit.rel}/*.class"/> + <include name="${test.junit.rel}/**/*.class"/> </fileset> </jar> </target> @@ -189,7 +191,7 @@ <!-- Perform the junit tests--> <mkdir dir="${results}"/> <junit forkmode="once" showoutput="true" fork="true" haltonerror="true"> - <jvmarg value="-Djava.library.path=${build_t.lib}"/> + <jvmarg value="-Djava.library.path=${gluegen.lib}:${build_t.lib}"/> <jvmarg value="-Drootrel.build=${rootrel.build}"/> <formatter usefile="false" type="plain"/> <formatter usefile="true" type="xml"/> @@ -240,7 +242,7 @@ <target name="junit.test1.c.build" unless="build.javaonly" > <patternset id="junit.test1.c.src.files"> <include name="${test.junit.rootrel}/test1.c"/> - <include name="${build_t.gen.rootrel}/native/BindingTest1_JNI.c"/> + <include name="${build_t.gen.rootrel}/native/BindingTest1Impl_JNI.c"/> </patternset> <c.build c.compiler.src.files="junit.test1.c.src.files" 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> |