From 971190d8718bb1e2b7eafdd49cfa2523dd8a8152 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 22 Jan 2014 10:24:38 +0100
Subject: Adapt to Oracle's removal of the Java Applet Sandbox, i.e. >= 7u51 ;
 Remove reference to JNLPAppletLauncher - use NApplet fallback

Sadly, due to Oracle's Java Applet Plugin update 7u51,
unsigned applets are no more allowed and hence the
Applet sandbox is being taken away.
---
 make/build.xml                       | 24 ++++++++++++++++++------
 make/scripts/make.jogl.all.x86_64.sh |  3 +++
 2 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'make')

diff --git a/make/build.xml b/make/build.xml
index f1c2039..68bfd87 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -115,6 +115,18 @@
 
         <property name="jogl.redbook.excludes" value="redbook/**" />
 
+        <copy file="${project.root}/manifest.mf"
+            tofile="${build}/manifest.mf"
+            overwrite="true">
+            <filterset>
+                <filter token="VERSION" value="${jogamp.version}"/>
+                <filter token="BUILD_VERSION" value="${jogl-demos.version}"/>
+                <filter token="SCM_BRANCH" value="${jogl-demos.build.branch}"/>
+                <filter token="SCM_COMMIT" value="${jogl-demos.build.commit}"/>
+                <filter token="BASEVERSION" value="${jogamp.version.base}"/>
+                <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/>
+            </filterset>
+        </copy>
     </target>
 
     <target name="nurbs" if="jogl.nurbs">
@@ -180,7 +192,7 @@
         </javac>
         <antcall target="redbook-javac" inheritrefs="true" />
         <antcall target="nurbs" inheritrefs="true" />
-        <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos.jar}">
+        <jar manifest="${build}/manifest.mf" destfile="${jogl-demos.jar}">
             <fileset dir="${classes}">
                 <exclude name="gleem/**" />
                 <exclude name="demos/util/**" />
@@ -206,13 +218,13 @@
                 <include name="demos/particles/engine/images/*.jpg" />
             </fileset>
         </jar>
-        <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos-util.jar}">
+        <jar manifest="${build}/manifest.mf" destfile="${jogl-demos-util.jar}">
             <fileset dir="${classes}">
                 <include name="gleem/**" />
                 <include name="demos/util/**" />
             </fileset>
         </jar>
-        <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos-data.jar}">
+        <jar manifest="${build}/manifest.mf" destfile="${jogl-demos-data.jar}">
             <fileset dir="${src}">
                 <include name="demos/data/**" />
                 <exclude name="demos/data/models/dragon.obj" />
@@ -223,7 +235,7 @@
             </fileset>
         </jar>
         <!-- due to size or usability .. create self packaged jars (code + data) -->
-        <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos-dualDepthPeeling.jar}">
+        <jar manifest="${build}/manifest.mf" destfile="${jogl-demos-dualDepthPeeling.jar}">
             <fileset dir="${classes}">
                 <include name="demos/dualDepthPeeling/**" />
             </fileset>
@@ -237,7 +249,7 @@
                 <include name="demos/data/**" />
             </fileset>
         </jar>
-        <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos-tennis.jar}">
+        <jar manifest="${build}/manifest.mf" destfile="${jogl-demos-tennis.jar}">
             <fileset dir="${classes}">
                 <include name="demos/tennis/**" />
             </fileset>
@@ -273,7 +285,7 @@
             <src path="${src}" />
             <classpath refid="jogl-demos.classpath" />
         </javac>
-        <jar manifest="${project.root}/manifest.mf" destfile="${jogl-demos.jar}">
+        <jar manifest="${build}/manifest.mf" destfile="${jogl-demos.jar}">
             <fileset dir="${classes}">
                 <include name="**" />
             </fileset>
diff --git a/make/scripts/make.jogl.all.x86_64.sh b/make/scripts/make.jogl.all.x86_64.sh
index 0f7b959..b25ffb5 100755
--- a/make/scripts/make.jogl.all.x86_64.sh
+++ b/make/scripts/make.jogl.all.x86_64.sh
@@ -12,6 +12,9 @@ fi
 #    -Djogl.cg=1 \
 #    -Djogl.redbook=true \
 
+#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
 # BUILD_ARCHIVE=true \
 ant \
     -Dtarget.sourcelevel=1.6 \
-- 
cgit v1.2.3