From 512a7fb820fc82e6960e0a493c6127f0ec800649 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 28 Apr 2010 14:24:24 +0200
Subject: - JAR Manifest: Trusted-Library: true

- Added JAR Manifest to native libs as well,
  otherwise our chain would become mixed code.

- JNLP: Added update check = background
---
 jnlp-files/gluegen-rt.jnlp |  1 +
 make/Manifest-rt           |  4 ++++
 make/Manifest-rt-cdc       |  4 ++++
 make/build.xml             | 35 +++++++++++++++--------------------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/jnlp-files/gluegen-rt.jnlp b/jnlp-files/gluegen-rt.jnlp
index 6c8c27e..8f4453e 100644
--- a/jnlp-files/gluegen-rt.jnlp
+++ b/jnlp-files/gluegen-rt.jnlp
@@ -9,6 +9,7 @@
     <description kind="short">Run-time support classes and native code for applications and libraries built using the GlueGen tool.</description>
     <offline-allowed/>
   </information>
+  <update check="background" policy="always"/>
   <security>
       <all-permissions/>
   </security>
diff --git a/make/Manifest-rt b/make/Manifest-rt
index da817d3..7570c4a 100755
--- a/make/Manifest-rt
+++ b/make/Manifest-rt
@@ -1,3 +1,7 @@
 Manifest-Version: 1.0
 Implementation-Title: GlueGen Run-Time
 Implementation-Version: @BASEVERSION@
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.common
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/Manifest-rt-cdc b/make/Manifest-rt-cdc
index 72095c0..50c2021 100755
--- a/make/Manifest-rt-cdc
+++ b/make/Manifest-rt-cdc
@@ -1,3 +1,7 @@
 Manifest-Version: 1.0
 Implementation-Title: GlueGen Run-Time CDC
 Implementation-Version: @BASEVERSION@
+Implementation-Vendor: JogAmp community
+Extension-Name: com.jogamp.common
+Implementation-Vendor-Id: com.jogamp
+Trusted-Library: true
diff --git a/make/build.xml b/make/build.xml
index 4581d74..270a636 100755
--- a/make/build.xml
+++ b/make/build.xml
@@ -387,23 +387,8 @@
       </antcall>
 
       <antcall target="c.manifest" inheritRefs="true" />
-      <!-- Create Java Web Start jar file from built file -->
-      <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}.jar">
-        <fileset dir="${build}/obj">
-          <include name="*gluegen-rt.${native.library.suffix}" />
-        </fileset>
-      </jar>
-      <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}-cdc.jar">
-        <fileset dir="${build}/obj">
-          <include name="*gluegen-rt.${native.library.suffix-cdc}" />
-        </fileset>
-      </jar>
     </target>  
 
-  <target name="build.nativelibrary" depends="init" unless="build.javaonly" >
-    <antcall target="c.build" inheritRefs="true" />
-  </target>
-
   <target name="gluegen.build.gluegen-rt-cdc" >
     <!-- Build just the gluegen-rt-cdc.jar classes using the Java CDC
          boot classes -->
@@ -500,7 +485,7 @@
       </uptodate>
   </target>
 
-  <target name="gluegen.build" depends="gluegen.build.check" unless="gluegen.build.skip">
+  <target name="gluegen.build" depends="gluegen.cpptasks.detect.os,gluegen.build.check" unless="gluegen.build.skip">
     <antcall target="pre-build"  inheritRefs="true"/>
 
     <!-- Because ANTLR looks for importVocab files in the current
@@ -604,6 +589,10 @@
         </filterset>
     </copy>
 
+    <!-- Build the (native code) NativeLibrary support for
+         gluegen-rt[-cdc].jar using the just-built GlueGen. -->
+    <antcall target="c.build" inheritRefs="true" />
+
     <!-- Build gluegen-rt.jar. -->
     <jar destfile="${build}/gluegen-rt.jar" manifest="${build}/Manifest-rt.temp">
       <fileset dir="${classes}">
@@ -612,10 +601,11 @@
         <include name="com/jogamp/common/**" />
       </fileset>
     </jar>
-
-    <!-- Build the (native code) NativeLibrary support for
-         gluegen-rt[-cdc].jar using the just-built GlueGen. -->
-    <antcall target="build.nativelibrary" inheritRefs="true" />
+    <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}.jar" manifest="${build}/Manifest-rt.temp">
+      <fileset dir="${build}/obj">
+        <include name="*gluegen-rt.${native.library.suffix}" />
+      </fileset>
+    </jar>
 
     <!-- Build just the gluegen-rt-cdc.jar classes using the Java CDC
          boot classes. -->
@@ -634,6 +624,11 @@
         <include name="com/jogamp/common/*.class" />
       </fileset>
     </jar>
+    <jar destfile="${build}/gluegen-rt-natives-${os.and.arch}-cdc.jar" manifest="${build}/Manifest-rt-cdc.temp">
+      <fileset dir="${build}/obj">
+        <include name="*gluegen-rt.${native.library.suffix-cdc}" />
+      </fileset>
+    </jar>
 
     <!-- Copy antlr.jar into build directory for convenience so
          gluegen.jar can be run via "java -jar". antlr.jar is
-- 
cgit v1.2.3