[jitsi-dev] [jitsi-commits] master: Rename the Java key to Javax in Jitsi.app's Info.plist (63effac)


#1

Hey Ingo,

I will remove the old launcher, as its no more needed when the plist
is changed and it cannot be used with it.

Regards
damencho

···

On Sat, Dec 6, 2014 at 3:29 PM, <ingo@jitsi.org> wrote:

Repository : ssh://lists.jitsi.org/jitsi

On branch : master
Link : https://github.com/jitsi/jitsi/compare/70c6d3d675a1988ebd420010d1f18496342fb8f0...63effac233bb3dc223bd2a5516ca20d0a86420bd

---------------------------------------------------------------

commit 63effac233bb3dc223bd2a5516ca20d0a86420bd
Author: Ingo Bauersachs <ingo@jitsi.org>
Date: Sat Dec 6 14:18:38 2014 +0100

    Rename the Java key to Javax in Jitsi.app's Info.plist

    As soon as a dictionary with the name Java is present in Info.plist, OS
    X tries to open/install Apple's old Java 6 JVM, regardless of what the
    actual native launcher wants to do.

---------------------------------------------------------------

63effac233bb3dc223bd2a5516ca20d0a86420bd
resources/install/build.xml | 7 +++++++
resources/install/macosx/JavaApplicationStub | Bin 19400 -> 19440 bytes
src/native/macosx/launcher/launcher.m | 3 ++-
3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 2992466..7542182 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -1291,6 +1291,13 @@
       </array>
       <key>CFBundleName</key>]]></replacevalue>
       </replace>
+
+ <!-- Rename Java dict to Javax to prevent OSX asking for the old Apple JVM -->
+ <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
+ <replacetoken><![CDATA[<key>Java</key>]]></replacetoken>
+ <replacevalue><![CDATA[<key>Javax</key>]]></replacevalue>
+ </replace>
+
       <!-- Add property for high resolution displays -->
       <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
         <replacetoken><![CDATA[<key>CFBundleName</key>]]></replacetoken>
diff --git a/resources/install/macosx/JavaApplicationStub b/resources/install/macosx/JavaApplicationStub
index afa07c3..08b08b1 100755
Binary files a/resources/install/macosx/JavaApplicationStub and b/resources/install/macosx/JavaApplicationStub differ
diff --git a/src/native/macosx/launcher/launcher.m b/src/native/macosx/launcher/launcher.m
index f090f44..6cc7dbc 100644
--- a/src/native/macosx/launcher/launcher.m
+++ b/src/native/macosx/launcher/launcher.m
@@ -9,7 +9,8 @@
#import <Cocoa/Cocoa.h>
#include <dlfcn.h>

-#define JVM_JAVA_KEY "Java"
+#define JVM_JAVA_KEY "Javax" // Cannot be Java
+ // or OSX requests the old Apple JVM
#define JVM_WORKING_DIR_KEY "WorkingDirectory"
#define JVM_MAIN_CLASS_NAME_KEY "MainClass"
#define JVM_CLASSPATH_KEY "ClassPath"

_______________________________________________
commits mailing list
commits@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/commits


#2

Okay. I thought so, but didn't know where this binary came from.

Btw, the jar-bundler: this could relatively easy completely be replaced by some ant mkdir/copy/replace operations. It doesn't do anything magical.

Freundliche Grüsse,
Ingo Bauersachs

-- sent from my mobile

···

Le 07.12.2014 à 20:25, Damian Minkov <damencho@jitsi.org> a écrit :

Hey Ingo,

I will remove the old launcher, as its no more needed when the plist
is changed and it cannot be used with it.

Regards
damencho

On Sat, Dec 6, 2014 at 3:29 PM, <ingo@jitsi.org> wrote:
Repository : ssh://lists.jitsi.org/jitsi

On branch : master
Link : https://github.com/jitsi/jitsi/compare/70c6d3d675a1988ebd420010d1f18496342fb8f0...63effac233bb3dc223bd2a5516ca20d0a86420bd

---------------------------------------------------------------

commit 63effac233bb3dc223bd2a5516ca20d0a86420bd
Author: Ingo Bauersachs <ingo@jitsi.org>
Date: Sat Dec 6 14:18:38 2014 +0100

   Rename the Java key to Javax in Jitsi.app's Info.plist

   As soon as a dictionary with the name Java is present in Info.plist, OS
   X tries to open/install Apple's old Java 6 JVM, regardless of what the
   actual native launcher wants to do.

---------------------------------------------------------------

63effac233bb3dc223bd2a5516ca20d0a86420bd
resources/install/build.xml | 7 +++++++
resources/install/macosx/JavaApplicationStub | Bin 19400 -> 19440 bytes
src/native/macosx/launcher/launcher.m | 3 ++-
3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 2992466..7542182 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -1291,6 +1291,13 @@
      </array>
      <key>CFBundleName</key>]]></replacevalue>
      </replace>
+
+ <!-- Rename Java dict to Javax to prevent OSX asking for the old Apple JVM -->
+ <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
+ <replacetoken><![CDATA[<key>Java</key>]]></replacetoken>
+ <replacevalue><![CDATA[<key>Javax</key>]]></replacevalue>
+ </replace>
+
      <!-- Add property for high resolution displays -->
      <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
        <replacetoken><![CDATA[<key>CFBundleName</key>]]></replacetoken>
diff --git a/resources/install/macosx/JavaApplicationStub b/resources/install/macosx/JavaApplicationStub
index afa07c3..08b08b1 100755
Binary files a/resources/install/macosx/JavaApplicationStub and b/resources/install/macosx/JavaApplicationStub differ
diff --git a/src/native/macosx/launcher/launcher.m b/src/native/macosx/launcher/launcher.m
index f090f44..6cc7dbc 100644
--- a/src/native/macosx/launcher/launcher.m
+++ b/src/native/macosx/launcher/launcher.m
@@ -9,7 +9,8 @@
#import <Cocoa/Cocoa.h>
#include <dlfcn.h>

-#define JVM_JAVA_KEY "Java"
+#define JVM_JAVA_KEY "Javax" // Cannot be Java
+ // or OSX requests the old Apple JVM
#define JVM_WORKING_DIR_KEY "WorkingDirectory"
#define JVM_MAIN_CLASS_NAME_KEY "MainClass"
#define JVM_CLASSPATH_KEY "ClassPath"

_______________________________________________
commits mailing list
commits@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/commits

_______________________________________________
dev mailing list
dev@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/dev