diff options
| author | Wade Walker <[email protected]> | 2011-02-02 04:37:46 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-02-02 04:37:46 +0100 |
| commit | 4e29ab96c2e5f934b7441f0df5bc976accac7c59 (patch) | |
| tree | 251bea577b53cdc7241bdb88f709f28838f5026d /make/build-common.xml | |
| parent | a247475fa8834a289de0d86b6928b2c191ebf50d (diff) | |
Added two simple SWT unit tests.
Added a test that draws one triangle, using both the SWT
canvas and the AWT canvas with the SWT_AWT bridge. Also
added the SWT JARs for each platform to make/lib (since
that's where antlr.jar and junit.jar were stored). Modified
the make files to build and run the new tests.
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index e6a066197..a13ccefe5 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -90,6 +90,40 @@ <echo message="antlr.jar=${antlr.jar}" /> <echo message="junit.jar=${junit.jar}" /> + <!-- Set swt.jar to the correct file for this platform. We point to the debug JARs to allow + stepping into SWT calls using the accompanying source code zip archives. --> + <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86_64/swt-debug.jar"> + <istrue value="${isWindowsAMD64}" /> + </condition> + <condition property="swt.jar" value="${project.root}/make/lib/swt/win32-win32-x86/swt-debug.jar"> + <istrue value="${isWindowsX86}" /> + </condition> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86_64/swt-debug.jar"> + <istrue value="${isLinuxAMD64}" /> + </condition> + <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> + <istrue value="${isLinuxX86}" /> + </condition> + <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar"> + <and> + <istrue value="${isOSX}" /> + <or> + <os arch="AMD64" /> + <os arch="x86_64" /> + </or> + </and> + </condition> + <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar"> + <and> + <istrue value="${isOSX}" /> + <or> + <os arch="i386" /> + <os arch="x86" /> + </or> + </and> + </condition> + <echo message="swt.jar=${swt.jar}" /> + <property name="target.sourcelevel" value="1.4" /> <property name="host.sourcelevel" value="1.5" /> @@ -199,6 +233,7 @@ <pathelement location="${nativewindow.all.jar}" /> <pathelement location="${jogl.all.jar}" /> <pathelement location="${newt.all.jar}" /> + <pathelement location="${swt.jar}" /> </path> <path id="junit_jogl_awt.run.classpath"> @@ -212,6 +247,19 @@ <pathelement location="${jogl.test.jar}" /> </path> + <!-- classpath used when running SWT tests --> + <path id="junit_jogl_swt.run.classpath"> + <pathelement location="${junit.jar}" /> + <pathelement location="${ant.jar}" /> + <pathelement location="${ant-junit.jar}" /> + <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${nativewindow.all.jar}" /> + <pathelement location="${jogl.all.jar}" /> + <pathelement location="${newt.event.jar}" /> + <pathelement location="${jogl.test.jar}" /> + <pathelement location="${swt.jar}" /> + </path> + <path id="junit_jogl_newt.run.classpath"> <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> |