diff options
| author | Sven Gothel <[email protected]> | 2010-06-02 04:13:43 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-06-02 04:13:43 +0200 |
| commit | d94115b3d72ec556371e6d09c2967345662fc781 (patch) | |
| tree | d25dbcc892cb0a7e9316123e5e2e12885a2e29d5 /make | |
| parent | dd0400a41478c1f365414b8c760eee1c91105280 (diff) | |
NEWT: Simplified Locking
- Using Display.getEDTUtil() and Display.runCreateAndDestroyOnEDT()
to determine the NEWT EDT behavior, which may be specialized by the implementation.
- AWTWrapper and Newt/AWT Parenting deadlock fix.
- Misc fixes in test cases
Diffstat (limited to 'make')
| -rw-r--r-- | make/build.xml | 4 | ||||
| -rwxr-xr-x | make/scripts/java-run-all.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index 9a1cf81ce..4b6c2cabe 100644 --- a/make/build.xml +++ b/make/build.xml @@ -63,7 +63,7 @@ </copy> </target> - <target name="one.dir" depends="one-lib-dir,one-jar-dir"/> + <target name="one-dir" depends="one-lib-dir,one-jar-dir"/> <target name="repack-jars" depends="one-jar-dir"> <!-- Re-pack jars we have the intent to compress later, after signing --> @@ -155,7 +155,7 @@ - Main build target. --> - <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-lib-dir,one-jar-dir,developer-zip-archive,source-archive" /> + <target name="all" description="Build nativewindow, jogl and newt projects, incl. all junit tests " depends="init,build.nativewindow,build.jogl,build.newt,junit.compile,one-dir,developer-zip-archive,source-archive" /> <target name="junit.compile"> <ant antfile="build-junit.xml" target="junit.compile" inheritRefs="true" inheritAll="true"/> diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh index 0e5be242a..5f6cff28a 100755 --- a/make/scripts/java-run-all.sh +++ b/make/scripts/java-run-all.sh @@ -38,6 +38,7 @@ uname -a | grep -i Darwin && MOSX=1 # D_ARGS="-Dnewt.debug=all -Dnativewindow.debug=all" # D_ARGS="-Dnewt.debug=all" # D_ARGS="-Dnewt.debug.Window" +# D_ARGS="-Dnewt.debug.Display" # D_ARGS="-Djogl.debug=all" rm -f java-run.log |