diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-junit.xml | 1 | ||||
| -rwxr-xr-x | make/build.xml | 7 | ||||
| -rwxr-xr-x | make/dynlink-macosx.cfg | 2 | ||||
| -rwxr-xr-x | make/dynlink-unix.cfg | 2 | ||||
| -rwxr-xr-x | make/dynlink-windows.cfg | 2 |
5 files changed, 8 insertions, 6 deletions
diff --git a/make/build-junit.xml b/make/build-junit.xml index 17ca17e..102a7ba 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -103,7 +103,6 @@ <javac destdir="${build_t.java}" source="1.5" debug="true" fork="yes" - verbose="true" debuglevel="lines,vars,source"> <classpath refid="junit.compile.classpath"/> <src path="${test.base.dir}"/> diff --git a/make/build.xml b/make/build.xml index f918f62..a79a38e 100755 --- a/make/build.xml +++ b/make/build.xml @@ -481,13 +481,14 @@ - original source. --> <property name="gluegen-rt.classes" value="com/jogamp/gluegen/runtime/**"/> + <property name="jogamp.common.classes" value="com/jogamp/common/**"/> <!--compile gluegen-rt with source=1.4 first--> <javac destdir="${classes}" source="1.4" debug="true" debuglevel="source,lines,vars" - includes="${gluegen-rt.classes}" + includes="${gluegen-rt.classes},${jogamp.common.classes}" excludes="${gluegen.excludes}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> @@ -533,6 +534,7 @@ <fileset dir="${classes}"> <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/gluegen/runtime/opengl/*.class" /> + <include name="com/jogamp/common/**" /> </fileset> </jar> @@ -549,6 +551,7 @@ <fileset dir="${classes-cdc}"> <include name="com/jogamp/gluegen/runtime/*.class" /> <include name="com/jogamp/gluegen/runtime/opengl/*.class" /> + <include name="com/jogamp/common/*.class" /> </fileset> </jar> @@ -586,7 +589,7 @@ <fileset dir="${build}/test/build/classes"> <include name="com/sun/gluegen/**Test*"/> </fileset> - <formatter usefile="false" type="brief"/> + <formatter usefile="false" type="plain"/> <formatter usefile="true" type="xml"/> </batchtest> <classpath> diff --git a/make/dynlink-macosx.cfg b/make/dynlink-macosx.cfg index cdeb556..6079eb8 100755 --- a/make/dynlink-macosx.cfg +++ b/make/dynlink-macosx.cfg @@ -1,6 +1,6 @@ Style AllStatic JavaClass MacOSXDynamicLinkerImpl -Package com.jogamp.gluegen.runtime +Package com.jogamp.common.os Implements MacOSXDynamicLinkerImpl DynamicLinker JavaOutputDir ../src/java NativeOutputDir ../src/native/macosx diff --git a/make/dynlink-unix.cfg b/make/dynlink-unix.cfg index c93e701..a8be5b7 100755 --- a/make/dynlink-unix.cfg +++ b/make/dynlink-unix.cfg @@ -1,6 +1,6 @@ Style AllStatic JavaClass UnixDynamicLinkerImpl -Package com.jogamp.gluegen.runtime +Package com.jogamp.common.os Implements UnixDynamicLinkerImpl DynamicLinker JavaOutputDir ../src/java NativeOutputDir ../src/native/unix diff --git a/make/dynlink-windows.cfg b/make/dynlink-windows.cfg index 8626039..db6f766 100755 --- a/make/dynlink-windows.cfg +++ b/make/dynlink-windows.cfg @@ -1,6 +1,6 @@ Style AllStatic JavaClass WindowsDynamicLinkerImpl -Package com.jogamp.gluegen.runtime +Package com.jogamp.common.os Implements WindowsDynamicLinkerImpl DynamicLinker JavaOutputDir ../src/java NativeOutputDir ../src/native/windows |