diff options
| author | Sven Gothel <[email protected]> | 2011-12-19 01:48:44 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-12-19 01:48:44 +0100 |
| commit | f171a694436b7ef15802f7c3bf805bcdd76d2cf1 (patch) | |
| tree | 531e500dc2e05fb621628615b4e1b051e7e5a7ff /make/build-common.xml | |
| parent | 7ce7febbbc81ebadb502f3a0f572a1623e7ae3a7 (diff) | |
Fix SWT test on OSX 32/64 bit ; Fix TestSWTAWT01GL for OSX
Fix SWT test on OSX 32/64 bit:
- Pick 32bit SWT for 32bit tests
Fix TestSWTAWT01GL for OSX:
- Using proper thread for AWT and SWT actions, platform agnostic
but required for OSX.
- Enable SWT*AWT* tests on OSX
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index cdc4bba1f..79d55b5f2 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -145,7 +145,8 @@ <condition property="swt.jar" value="${project.root}/make/lib/swt/gtk-linux-x86/swt-debug.jar"> <istrue value="${isAndroid}" /> <!-- FIXME JAU .. hack --> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar"> + <property name="swt-cocoa-macosx-x86_64.jar" value="${project.root}/make/lib/swt/cocoa-macosx-x86_64/swt-debug.jar"/> + <condition property="swt.jar" value="${swt-cocoa-macosx-x86_64.jar}"> <and> <istrue value="${isOSX}" /> <or> @@ -154,7 +155,8 @@ </or> </and> </condition> - <condition property="swt.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar"> + <property name="swt-cocoa-macosx-x86_32.jar" value="${project.root}/make/lib/swt/cocoa-macosx/swt-debug.jar"/> + <condition property="swt.jar" value="${swt-cocoa-macosx-x86_32.jar}"> <and> <istrue value="${isOSX}" /> <or> @@ -494,6 +496,8 @@ <property name="junit_jogl_android.run.jars" value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl.all-android.jar}${path.separator}${jogl.test.jar}"/> + <!-- Dummy extra CLASSPATH value, maybe overwritten --> + <property name="junit_extra_classpath" value=""/> <!-- The location and name of the configuration ANT file that will - validate to ensure that all user-define variables are set. --> |