Jogamp
- JAR Manifest: Trusted-Library: true
authorSven Gothel <sgothel@jausoft.com>
Wed, 28 Apr 2010 12:27:47 +0000 (14:27 +0200)
committerSven Gothel <sgothel@jausoft.com>
Wed, 28 Apr 2010 12:27:47 +0000 (14:27 +0200)
- Added JAR Manifest to native libs as well,
  otherwise our chain would become mixed code.

- JNLP: Set JogAmp community as vendor ..

- JOGL Windows hack: WindowsWGLContext.java
    - temporary removed the ARB CreateContext path
      for Windows, due to a bug in this implementation.

16 files changed:
make/build-jogl.xml
make/build-nativewindow.xml
make/build-newt.xml
make/joglRIversion
make/joglRIversion-cdc
make/joglversion
make/joglversion-cdc
make/nativewindowRIversion
make/nativewindowRIversion-cdc
make/nativewindowversion
make/nativewindowversion-cdc
make/newtRIversion
make/newtRIversion-cdc
make/newtversion
make/newtversion-cdc
src/jogl/classes/com/jogamp/opengl/impl/windows/wgl/WindowsWGLContext.java

index 7602003..a101f5e 100644 (file)
       </antcall>
 
       <antcall target="c.manifest" inheritRefs="true" />
-      <!-- Create the Java Web Start jar file for the built native code -->
-      <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj.jogl}">
-          <include name="*.${native.library.suffix}" />
-        </fileset>
-      </jar>
-      <jar destfile="${build.jogl}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj.jogl}">
-          <include name="*_es1.${native.library.suffix-cdc}" />
-          <include name="*_es2.${native.library.suffix-cdc}" />
-          <include name="*_gl2es12.${native.library.suffix-cdc}" />
-        </fileset>
-      </jar>
     </target>
 
     <!-- ================================================================== -->
     <!--
        - Build the jogl.jar files.
       -->
-    <target name="jar" depends="java.compile,build-jars-javase,build-jars-cdc"/>
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
 
     <target name="setup-manifestfile">
         <condition property="manifestfile" value="joglRIversion">
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
         </jar>
+        <jar manifest="${build.jogl}/tempversion-cdc" destfile="${build.jogl}/jogl-natives-${os.and.arch}-cdc.jar" filesonly="true">
+            <fileset dir="${obj.jogl}">
+              <include name="*_es1.${native.library.suffix-cdc}" />
+              <include name="*_es2.${native.library.suffix-cdc}" />
+              <include name="*_gl2es12.${native.library.suffix-cdc}" />
+            </fileset>
+        </jar>
     </target>
 
     <target name="build-jars-desktop-javase" depends="setup-manifestfile,build-jars-os-desktop-javase" unless="setup.nodesktop">
             <fileset dir="${src.java}"
                      includes="${java.part.util.fixedfuncemu.shadercode}"/>
         </jar>
+        <jar manifest="${build.jogl}/tempversion" destfile="${build.jogl}/jogl-natives-${os.and.arch}.jar" filesonly="true">
+            <fileset dir="${obj.jogl}">
+              <include name="*.${native.library.suffix}" />
+            </fileset>
+        </jar>
     </target>
 
     <!-- ================================================================== -->
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,jar,c.build.jogl,generate.version.txt" />
+    <target name="all" description="Build JOGL JAR file(s) and native libraries." depends="init,java.compile,c.build.jogl,build-jars,generate.version.txt" />
 
     <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
index 8d16395..0fd0af7 100644 (file)
 
       <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 -->
-      <jar destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj.nativewindow}">
-          <include name="*.${native.library.suffix}" />
-        </fileset>
-      </jar>
-      <jar destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj.nativewindow}">
-          <include name="*_jvm.${native.library.suffix-cdc}" />
-          <include name="*_x11.${native.library.suffix-cdc}" />
-        </fileset>
-      </jar>
     </target>
 
     <!-- ================================================================== -->
     <!--
        - Build the nativewindow.jar files.
       -->
-    <target name="jar" depends="java.compile,build-jars-javase,build-jars-cdc"/>
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
 
     <target name="setup-manifestfile">
         <condition property="manifestfile" value="nativewindowRIversion">
                      includes="${java.part.core}"
                      excludes="${java.part.awt} ${java.part.x11}"/>
         </jar>
+        <jar manifest="tempversion" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}.jar" filesonly="true">
+            <fileset dir="${obj.nativewindow}">
+              <include name="*.${native.library.suffix}" />
+            </fileset>
+        </jar>
         <delete file="tempversion"/>
     </target>
 
                      includes="${java.part.core}"
                      excludes="${java.part.awt} ${java.part.x11}"/>
         </jar>
+        <jar manifest="tempversion-cdc" destfile="${build.nativewindow}/nativewindow-natives-${os.and.arch}-cdc.jar" filesonly="true">
+            <fileset dir="${obj.nativewindow}">
+              <include name="*_jvm.${native.library.suffix-cdc}" />
+              <include name="*_x11.${native.library.suffix-cdc}" />
+            </fileset>
+        </jar>
 
         <delete file="tempversion-cdc"/>
     </target>
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="init,jar,c.build.nativewindow,generate.version.txt" />
+    <target name="all" description="Build NativeWindow JAR file(s) and native libraries." depends="init,java.compile,c.build.nativewindow,build-jars,generate.version.txt" />
 
     <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
index c6d67b8..8bbfde2 100644 (file)
       </antcall>
 
       <antcall target="c.manifest" inheritRefs="true" />
-      <!-- Create the Java Web Start jar file for the built native code -->
-      <jar destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
-        <fileset dir="${obj.newt}">
-          <include name="*.${native.library.suffix}" />
-        </fileset>
-      </jar>
-      <jar destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
-        <fileset dir="${obj.newt}">
-          <include name="*.${native.library.suffix-cdc}" />
-        </fileset>
-      </jar>
     </target>
 
     <!-- ================================================================== -->
     <!--
        - Build the newt.jar files.
       -->
-    <target name="jar" depends="java.compile,build-jars-javase,build-jars-cdc"/>
+    <target name="build-jars" depends="gluegen.cpptasks.detect.os,build-jars-javase,build-jars-cdc" />
 
     <target name="setup-manifestfile">
         <condition property="manifestfile" value="newtRIversion">
             <fileset dir="${classes}"
                      includes="${java.part.core}"/>
         </jar>
+        <jar manifest="tempversion" destfile="${build.newt}/newt-natives-${os.and.arch}.jar" filesonly="true">
+            <fileset dir="${obj.newt}">
+              <include name="*.${native.library.suffix}" />
+            </fileset>
+        </jar>
         <delete file="tempversion"/>
     </target>
 
             <fileset dir="${classes-cdc}"
                      includes="${java.part.core}"/>
         </jar>
+        <jar manifest="tempversion-cdc" destfile="${build.newt}/newt-natives-${os.and.arch}-cdc.jar" filesonly="true">
+            <fileset dir="${obj.newt}">
+              <include name="*.${native.library.suffix-cdc}" />
+            </fileset>
+        </jar>
+        <delete file="tempversion-cdc"/>
     </target>
 
     <!-- ================================================================== -->
     <!--
        - Build everything.
       -->
-    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,jar,c.build.newt,generate.version.txt" />
+    <target name="all" description="Build NEWT JAR file(s) and native libraries." depends="init,java.compile,c.build.newt,build-jars,generate.version.txt" />
 
     <target name="generate.version.txt" depends="init">
         <!-- Create a version.txt file indicating which version we just built -->
index af9e41d..46b64ac 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: Java Bindings for OpenGL API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index 9bbb525..13a782c 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: Java Bindings for OpenGL API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment CDC
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index b65b6e3..1852362 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: Java Bindings for OpenGL API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment
 Implementation-Version: @VERSION@
 Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
 Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index 5056fba..17a5b91 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: Java Bindings for OpenGL API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Java Bindings for OpenGL Runtime Environment CDC
 Implementation-Version: @VERSION@
 Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.opengl
 Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index 6a29e8a..b039954 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: Native Window Interface API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Native Window Interface Runtime Environment
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index 35ac513..4e9760c 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: Native Window Interface API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Native Window Interface Runtime Environment CDC
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index 0180d33..7872a76 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: Native Window Interface API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Native Window Interface Runtime Environment
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index 7213cf6..0354559 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: Native Window Interface API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: Native Window Interface Runtime Environment CDC
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
+Implementation-Vendor: JogAmp community
 Extension-Name: javax.media.nativewindow
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index 82cc0c0..73d9bc8 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: NEWT API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: NEWT Runtime Environment
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
-Extension-Name: com.sun.newt
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.newt
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index 5dcfeca..a5bdfae 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: NEWT API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: NEWT Runtime Environment CDC
 Implementation-Version: @BASEVERSION@
-Implementation-Vendor: Sun Microsystems, Inc.
-Extension-Name: com.sun.newt
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.newt
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index d1734f7..b298562 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: NEWT API Specification
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: NEWT Runtime Environment
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
-Extension-Name: com.sun.newt
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.newt
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index 8227a4d..89ca1db 100644 (file)
@@ -1,8 +1,9 @@
 Specification-Title: NEWT API Specification CDC
 Specification-Version: @BASEVERSION@
-Specification-Vendor: Sun Microsystems, Inc.
+Specification-Vendor: JogAmp community
 Implementation-Title: NEWT Runtime Environment CDC
 Implementation-Version: @VERSION@
-Implementation-Vendor: java.net JOGL community
-Extension-Name: com.sun.newt
-Implementation-Vendor-Id: com.sun
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.newt
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
index e0a255a..266868d 100644 (file)
@@ -219,7 +219,7 @@ public class WindowsWGLContext extends GLContextImpl {
     boolean createContextARBTried = false;
 
     // utilize the shared context's GLXExt in case it was using the ARB method and it already exists
-    if(null!=factory.getSharedContext() && factory.getSharedContext().isCreatedWithARBMethod()) {
+    if(false && null!=factory.getSharedContext() && factory.getSharedContext().isCreatedWithARBMethod()) { // FIXME JAU
         if(DEBUG) {
           System.err.println("WindowsWGLContext.createContext using shared Context: "+factory.getSharedContext());
         }
@@ -253,8 +253,8 @@ public class WindowsWGLContext extends GLContextImpl {
             hglrc = temp_hglrc;
             return;
         } 
-        hglrc = createContextARB(share, true, major, minor, ctp);
-        createContextARBTried=true;
+        // FIXME JAU hglrc = createContextARB(share, true, major, minor, ctp);
+        // FIXME JAU createContextARBTried=true;
     }
     
     if(0!=hglrc) {
http://JogAmp.org git info: FAQ, tutorial and man pages.