diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-junit.xml | 8 | ||||
| -rwxr-xr-x | make/build.xml | 6 | ||||
| -rw-r--r-- | make/lib/ant-contrib-1.0b3.jar | bin | 0 -> 224277 bytes | |||
| -rw-r--r-- | make/lib/archive/CppTasksGCCNamespaceHack.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b (renamed from make/lib/CppTasksGCCNamespaceHack.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b) | bin | 7810 -> 7810 bytes | |||
| -rw-r--r-- | make/lib/archive/cpptasks-1.0b5-darwin-patch.diff (renamed from make/lib/cpptasks-1.0b5-darwin-patch.diff) | 0 | ||||
| -rw-r--r-- | make/lib/archive/cpptasks-patch-orig-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz (renamed from make/lib/cpptasks-patch-orig-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz) | bin | 7743 -> 7743 bytes | |||
| -rw-r--r-- | make/lib/archive/cpptasks.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b (renamed from make/lib/cpptasks.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b) | bin | 363963 -> 363963 bytes | |||
| -rwxr-xr-x | make/lib/archive/cpptasks.jar-orig-c91f003551542c2aab62dd8ef89a7894c7e50689 (renamed from make/lib/cpptasks.jar-orig-c91f003551542c2aab62dd8ef89a7894c7e50689) | bin | 345356 -> 345356 bytes |
8 files changed, 11 insertions, 3 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml index 2da5997..e401128 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -103,6 +103,7 @@ <javac destdir="${build_t.java}" source="1.5" debug="true" fork="yes" + includeAntRuntime="false" debuglevel="lines,vars,source"> <classpath refid="junit.compile.classpath"/> <src path="${test.base.dir}"/> @@ -176,13 +177,16 @@ <target name="junit.compile" depends="init, java.generate, java.build, native.build"/> <target name="junit.run" depends="init,gluegen.cpptasks.detect.os"> + <mkdir dir="${results}"/> + <delete quiet="true"> + <fileset dir="${results}" includes="**"/> + </delete> + <!-- Use absolute path --> <property name="gluegen.lib.abs" location="${gluegen.lib}" /> <property name="build_t.lib.abs" location="${build_t.lib}" /> - <!-- Perform the junit tests--> - <mkdir dir="${results}"/> <junit forkmode="once" showoutput="true" fork="true"> <env key="${system.env.library.path}" path="${gluegen.lib.abs}${path.separator}${build_t.lib.abs}"/> <jvmarg value="-Djava.library.path=${gluegen.lib.abs}${path.separator}${build_t.lib.abs}"/> diff --git a/make/build.xml b/make/build.xml index 9076c5f..f90cd81 100755 --- a/make/build.xml +++ b/make/build.xml @@ -410,6 +410,7 @@ source="1.4" debug="true" debuglevel="source,lines,vars" + includeAntRuntime="false" excludes="${gluegen.excludes}" > <src path="${src.java}" /> @@ -515,6 +516,7 @@ source="1.4" debug="true" debuglevel="source,lines,vars" + includeAntRuntime="false" includes="${gluegen-rt.classes},${jogamp.common.classes}" excludes="${gluegen.excludes}"> <src path="${src.java}" /> @@ -527,6 +529,7 @@ source="1.5" debug="true" debuglevel="source,lines,vars" + includeAntRuntime="true" excludes="${gluegen.excludes},${gluegen-rt.classes}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> @@ -605,7 +608,8 @@ <property name="tools.jar" value="${java.home}/../lib/tools.jar"/> - <javac destdir="${build}/test/build/classes" failonerror="false" source="1.5" srcdir="${gluegen.root}/test/junit" debug="true" debuglevel="lines,vars,source"> + <javac destdir="${build}/test/build/classes" failonerror="false" source="1.5" srcdir="${gluegen.root}/test/junit" debug="true" debuglevel="lines,vars,source" + includeAntRuntime="false"> <classpath path="${gluegen.root}/make/lib/junit-4.5.jar:${build}/classes:${build}/test/gensrc/java:${tools.jar}:${ant.core.lib}"/> </javac> diff --git a/make/lib/ant-contrib-1.0b3.jar b/make/lib/ant-contrib-1.0b3.jar Binary files differnew file mode 100644 index 0000000..0625376 --- /dev/null +++ b/make/lib/ant-contrib-1.0b3.jar diff --git a/make/lib/CppTasksGCCNamespaceHack.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b b/make/lib/archive/CppTasksGCCNamespaceHack.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b Binary files differindex c31779e..c31779e 100644 --- a/make/lib/CppTasksGCCNamespaceHack.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b +++ b/make/lib/archive/CppTasksGCCNamespaceHack.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b diff --git a/make/lib/cpptasks-1.0b5-darwin-patch.diff b/make/lib/archive/cpptasks-1.0b5-darwin-patch.diff index 1544fcc..1544fcc 100644 --- a/make/lib/cpptasks-1.0b5-darwin-patch.diff +++ b/make/lib/archive/cpptasks-1.0b5-darwin-patch.diff diff --git a/make/lib/cpptasks-patch-orig-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz b/make/lib/archive/cpptasks-patch-orig-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz Binary files differindex 22f1cde..22f1cde 100644 --- a/make/lib/cpptasks-patch-orig-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz +++ b/make/lib/archive/cpptasks-patch-orig-c91f003551542c2aab62dd8ef89a7894c7e50689.tar.gz diff --git a/make/lib/cpptasks.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b b/make/lib/archive/cpptasks.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b Binary files differindex dec6c13..dec6c13 100644 --- a/make/lib/cpptasks.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b +++ b/make/lib/archive/cpptasks.jar-mbien-129e783741d91e9ee5cd7da5d5c962c32ec96b0b diff --git a/make/lib/cpptasks.jar-orig-c91f003551542c2aab62dd8ef89a7894c7e50689 b/make/lib/archive/cpptasks.jar-orig-c91f003551542c2aab62dd8ef89a7894c7e50689 Binary files differindex 005691c..005691c 100755 --- a/make/lib/cpptasks.jar-orig-c91f003551542c2aab62dd8ef89a7894c7e50689 +++ b/make/lib/archive/cpptasks.jar-orig-c91f003551542c2aab62dd8ef89a7894c7e50689 |