- 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

10 files changed, 30 insertions, 14 deletions

diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml
index 98a62b875..1326d8c8b 100644
--- a/make/build-nativewindow.xml
+++ b/make/build-nativewindow.xml
@@ -118,7 +118,7 @@
         <!-- partitioning -->
 
         <property name="java.part.core"
-                  value="javax/media/nativewindow/*, javax/media/nativewindow/egl/*, javax/media/nativewindow/x11/*, javax/media/nativewindow/macosx/*, javax/media/nativewindow/windows/*, com/sun/nativewindow/impl/*, com/sun/nativewindow/impl/x11/*"/>
+                  value="javax/media/nativewindow/*, javax/media/nativewindow/egl/*, javax/media/nativewindow/x11/*, javax/media/nativewindow/macosx/*, javax/media/nativewindow/windows/*, com/sun/nativewindow/impl/*, com/sun/nativewindow/impl/jvm/*, com/sun/nativewindow/impl/x11/*"/>
 
         <!-- property name="java.part.win"
                   value="com/sun/nativewindow/impl/win/**"/ NOTHING TO DO HERE -->
@@ -672,6 +672,10 @@
           </and>
         </condition> 
 
+        <patternset id="c.src.files.jvm">
+          <include name="${rootrel.src.c}/JVM*.c"/>
+        </patternset>
+
         <patternset id="c.src.files.awt">
           <include name="${rootrel.src.c}/JAWT*.c"/>
           <include name="${rootrel.generated.c}/X11/JAWT*.c" if="isX11"/>
@@ -757,6 +761,13 @@
       </apply>
     </target>
 
+    <target name="c.build.nativewindow.jvm">
+      <c.build c.compiler.src.files="c.src.files.jvm"
+               output.lib.name="nativewindow_jvm"
+               compiler.cfg.id="${compiler.cfg.id}"
+               linker.cfg.id="${linker.cfg.id.oswin}"/>
+    </target>
+
     <target name="c.build.nativewindow.awt">
       <c.build c.compiler.src.files="c.src.files.awt"
                c.compiler.use-jawt="true"
@@ -776,11 +787,11 @@
 
     <target name="c.manifest" if="isVC8Family">
       <!-- exec mt, the Microsoft Manifest Tool, to include DLL manifests in order to resolve the location of msvcr80.dll -->
-      <msvc.manifest objdir="${obj}" dllname="nativewindow" />
+      <msvc.manifest objdir="${obj}" dllname="nativewindow_jvm" />
       <msvc.manifest objdir="${obj}" dllname="nativewindow_awt" />
     </target>
 
-    <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.awt">
+    <target name="c.build.nativewindow" depends="c.configure,c.build.nativewindow.windowlib,c.build.nativewindow.jvm,c.build.nativewindow.awt">
       <antcall target="c.fixup.jawt.version.macosx" inheritrefs="true" />
       <antcall target="c.manifest" inheritRefs="true" />
       <!-- Create the Java Web Start jar file for the built native code -->
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.
diff --git a/make/make.jogl.all.linux-x86.sh b/make/make.jogl.all.linux-x86.sh
index 0c6cd96f5..91170c79e 100644
--- a/make/make.jogl.all.linux-x86.sh
+++ b/make/make.jogl.all.linux-x86.sh
@@ -4,8 +4,10 @@
 
 #    -Dc.compiler.debug=true 
 #    -DuseOpenMAX=true \
+#    -Dbuild.noarchives=true
 
 ant \
+    -Dbuild.noarchives=true \
     -Drootrel.build=build-x86 \
     -Dgluegen.cpptasks.detected.os=true \
     -DisUnix=true \
diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh
index 1a33f6708..4bc5d745d 100644
--- a/make/make.jogl.all.linux-x86_64.sh
+++ b/make/make.jogl.all.linux-x86_64.sh
@@ -3,8 +3,11 @@
 . ../../setenv-build-jogl-x86_64.sh
 
 #    -Dc.compiler.debug=true 
+#    -Dbuild.noarchives=true
 
 ant \
+    -Dc.compiler.debug=true \
+    -Dbuild.noarchives=true \
     -Drootrel.build=build-x86_64 \
     -Dgluegen.cpptasks.detected.os=true \
     -DisUnix=true \
diff --git a/make/make.jogl.all.macosx.sh b/make/make.jogl.all.macosx.sh
index e7a5ee37b..c94d2d18a 100644
--- a/make/make.jogl.all.macosx.sh
+++ b/make/make.jogl.all.macosx.sh
@@ -3,7 +3,9 @@
 . /devtools/etc/profile.ant
 
 #    -Dc.compiler.debug=true 
+#    -Dbuild.noarchives=true
 
-ant -v \
+ant \
+    -Dbuild.noarchives=true \
     -Drootrel.build=build-macosx \
     $* 2>&1 | tee make.jogl.all.macosx.log
diff --git a/make/make.jogl.cdcfp.linux-x86.sh b/make/make.jogl.cdcfp.linux-x86.sh
index 6d216f65a..786f1a0b2 100644
--- a/make/make.jogl.cdcfp.linux-x86.sh
+++ b/make/make.jogl.cdcfp.linux-x86.sh
@@ -8,8 +8,10 @@
 #    -Djavacdebuglevel="none" \
 #
 #    -Djava.generate.skip=true \
+#    -Dbuild.noarchives=true
 
 ant -v \
+    -Dbuild.noarchives=true \
     -Drootrel.build=build-cdcfp-x86 \
     -Djogl.cdcfp=true \
     -Dgluegen.cpptasks.detected.os=true \
diff --git a/make/make.jogl.doc.all.x86.sh b/make/make.jogl.doc.all.x86.sh
deleted file mode 100644
index ab86fefd0..000000000
--- a/make/make.jogl.doc.all.x86.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-. ../../setenv-build-jogl-x86.sh
-
-ant -v  \
-    -Drootrel.build=build-x86\
-    -DuseKD=true \
-    javadoc.spec javadoc javadoc.dev.all $* 2>&1 | tee make.jogl.doc.all.x86.log
diff --git a/make/make.jogl.doc.all.x86_64.sh b/make/make.jogl.doc.all.x86_64.sh
index bab6d4d64..1af2b90e5 100644
--- a/make/make.jogl.doc.all.x86_64.sh
+++ b/make/make.jogl.doc.all.x86_64.sh
@@ -3,5 +3,6 @@
 . ../../setenv-build-jogl-x86_64.sh
 
 ant -v  \
+    -Dbuild.noarchives=true \
     -Drootrel.build=build-x86_64 \
     javadoc.spec javadoc javadoc.dev $* 2>&1 | tee make.jogl.doc.all.x86_64.log
diff --git a/make/make.jogl.doc.x86_64.sh b/make/make.jogl.doc.x86_64.sh
index 2ed8e67ec..99001d27c 100644
--- a/make/make.jogl.doc.x86_64.sh
+++ b/make/make.jogl.doc.x86_64.sh
@@ -3,5 +3,6 @@
 . ../../setenv-build-jogl-x86_64.sh
 
 ant -v  \
+    -Dbuild.noarchives=true \
     -Drootrel.build=build-x86_64 \
     javadoc $* 2>&1 | tee make.jogl.doc.x86_64.log
diff --git a/make/stub_includes/x11/window-lib.c b/make/stub_includes/x11/window-lib.c
index 17ddcb1c7..bd03bdcbb 100644
--- a/make/stub_includes/x11/window-lib.c
+++ b/make/stub_includes/x11/window-lib.c
@@ -11,6 +11,8 @@ extern Display *XOpenDisplay(
     _Xconst char*	/* display_name */
 );
 
+extern int XCloseDisplay(Display *display);
+
 extern XVisualInfo *XGetVisualInfo(
     Display*		/* display */,
     long		/* vinfo_mask */,