diff options
| author | Sven Gothel <[email protected]> | 2011-02-22 08:51:09 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-02-22 08:51:09 +0100 |
| commit | 4a43734dc09b56e418ca5036f54c856555ac2920 (patch) | |
| tree | 0d705db697bd34e1f13e8d8d420075769e52d687 /make | |
| parent | 8178e39d4a65f7cae779c7fde2fd846585aed201 (diff) | |
NativeWindow/SWT: Rename SWTMisc -> SWTAccessor; Add to nativewindow.core.jar
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-nativewindow.xml | 7 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 14769d805..1e38a43f0 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -72,11 +72,14 @@ <!-- partitioning --> + <property name="java.part.swt" + value="jogamp/nativewindow/swt/**"/> + <property name="java.part.core" - value="javax/media/nativewindow/*, javax/media/nativewindow/util/*, javax/media/nativewindow/egl/*, javax/media/nativewindow/macosx/*, javax/media/nativewindow/windows/*, com/jogamp/nativewindow/*, jogamp/nativewindow/*, jogamp/nativewindow/jvm/*"/> + value="javax/media/nativewindow/* javax/media/nativewindow/util/* javax/media/nativewindow/egl/* javax/media/nativewindow/macosx/* javax/media/nativewindow/windows/* com/jogamp/nativewindow/* jogamp/nativewindow/* jogamp/nativewindow/jvm/* ${java.part.swt}"/> <property name="java.part.awt" - value="javax/media/nativewindow/awt/*, jogamp/nativewindow/jawt/**, jogamp/nativewindow/**/awt/**"/> + value="javax/media/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/> <property name="java.part.x11" value="jogamp/nativewindow/x11/** javax/media/nativewindow/x11/*" /> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 816c691a4..f264b7755 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -32,6 +32,7 @@ echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a java-run.log echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a java-run.log echo SWT_CLASSPATH: $SWT_CLASSPATH 2>&1 | tee -a java-run.log echo $javaexe $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log +echo CLASSPATH $CLASSPATH 2>&1 | tee -a java-run.log function jrun() { awtarg=$1 @@ -104,7 +105,7 @@ function testawt() { #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting02NEWT #testawt com.jogamp.opengl.test.junit.newt.TestScreenMode00NEWT #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode01NEWT -testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode02NEWT +#testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode02NEWT #testawt com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT -time 1000000 #testawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT #testawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated @@ -125,7 +126,7 @@ testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode02NEWT #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.TestGearsGLJPanelAWT $* #testawt com.jogamp.opengl.test.junit.jogl.texture.TestTexture01AWT #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT -#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $* +testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $* #testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT #testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417 |