diff options
| author | Sven Gothel <[email protected]> | 2010-04-10 01:20:56 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-04-10 01:20:56 +0200 |
| commit | 987fb51e6c2dc3a8553ff1e01162fd10c3bc8fab (patch) | |
| tree | 656cb443a579487eb70746d5791782787aba7e38 /make/build-common.xml | |
| parent | e8f4dc96c037b4465ad1db9062249f80508117fd (diff) | |
*** Now Using Apache-Ant-1.8.0 ***
Cleanup:
- Adding Javac includeAntRuntime argument (false whenever possible)
- Clear junit results folder before testing
- <ant ..> tasks, use inheritRefs="true" inheritAll="true" whenever possible
for better performance and consistency (no duplicate property names).
The JOGL build -> build-<component> tree is clean in this respect.
junit.run: Test*NEWT*
Emulation of junit task,
due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).
Fixed NEWT tests:
- No more println .. using Assertions ..
- Offscreen produces 2 files correctly (Linux/NVidia, OSX/NVidia, Win32/Emulation)
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index bee69a5a9..10f37c3e4 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -8,6 +8,8 @@ <property name="gluegen.root" value="../../gluegen" /> <import file="${gluegen.root}/make/gluegen-cpptasks.xml" /> + <property name="ant-contrib.jar" value="${gluegen.root}/make/lib/ant-contrib-1.0b3.jar" /> + <condition property="rootrel.build" value="build"> <not> <isset property="rootrel.build"/> @@ -191,6 +193,8 @@ <pathelement location="${newt.all.jar}" /> <pathelement location="${jogl.test.jar}" /> </path> + <property name="junit_jogl_newt.run.jars" + value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${nativewindow.all.jar}${path.separator}${jogl.all.jar}${path.separator}${newt.all.jar}${path.separator}${jogl.test.jar}"/> <!-- JavaSE combinations . NO.AWT --> <property name="nativewindow.all-noawt.jar" value="${build.nativewindow}/nativewindow.all-noawt.jar" /> |