summaryrefslogtreecommitdiffstats
path: root/make/build.xml
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2009-06-18 06:50:13 +0000
committerSven Gothel <[email protected]>2009-06-18 06:50:13 +0000
commit3c6a7838b1a647b42cc8b37d1a433ed9a1431860 (patch)
tree2ed11714feef306f04e1c34beb71591f34563e21 /make/build.xml
parent5607c14460e9e8abd2833517016f1dd3ec9c685c (diff)
- Fix: X11 locking
The current thread default display or the given display is being used, hence it is no more required to use a ToolkitLock for X11 without AWT. Removed X11 ToolkitLock in case of X11 without AWT, which is being detected with the absence of the classes java.awt.Component _AND_ javax.media.nativewindow.awt.AWTGraphicsDevice or with the system property java.awt.headless=true Only in the Java2D/Swing case, one 'leaking' Display is created within canCreateGLPbuffer(). - Workaround for Hotsport bugs #4395095, #6852404 4395095 JNI access to java.nio DirectBuffer constructor/accessor 6852404 Race condition in JNI Direct Buffer access and creation routines - Added build.xml -Dbuild.noarchives=true property to skip the time consuming creation of zip archives. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@1988 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make/build.xml')
-rw-r--r--make/build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml
index 28d998575..30ca60cfe 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -95,7 +95,7 @@
<property name="tmp.version" value="${jogl_base_version}-pre-${timestamp}" />
</target>
- <target name="developer-zip-archive" depends="gluegen.cpptasks.detect.os,setup-version-RI,setup-version-non-RI">
+ <target name="developer-zip-archive" depends="gluegen.cpptasks.detect.os,setup-version-RI,setup-version-non-RI" unless="build.noarchives">
<property name="archive.name" value="jogl-${tmp.version}-${os.and.arch}" />
<property name="archive.dir" value="${build}/${archive.name}" />
<delete includeEmptyDirs="true" quiet="true" dir="${archive.dir}" failonerror="false" />
@@ -137,7 +137,7 @@
- This must be called after all of the build targets complete.
-->
- <target name="source-archive" depends="setup-version-RI,setup-version-non-RI">
+ <target name="source-archive" depends="setup-version-RI,setup-version-non-RI" unless="build.noarchives">
<!-- NOTE that if you are using multiple rootrel.build directories within the same
repository, the exclude lists here won't work well enough and you will wind up
archiving binary bits from other rootrel.build settings in the source archive.