From bbb3a366246168cb85e6208223a6eae6343fb1e1 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Fri, 1 Nov 2013 18:06:16 +0200
Subject: [PATCH] Adds option to embed jre into dmg and enables it.

---
 ...lib => libAEGetURLEventHandlerAgent.dylib} | Bin
 resources/install/ant-build-config.properties |   6 +-
 resources/install/build.xml                   | 110 ++++----
 resources/install/installers.properties       |   2 +
 resources/install/macosx/JavaApplicationStub  | Bin 64532 -> 38652 bytes
 src/native/build.xml                          |  33 +++
 src/native/macosx/launcher/launcher.m         | 235 ++++++++++++++++++
 7 files changed, 338 insertions(+), 48 deletions(-)
 rename lib/native/mac/{libAEGetURLEventHandlerAgent.jnilib => libAEGetURLEventHandlerAgent.dylib} (100%)
 create mode 100644 src/native/macosx/launcher/launcher.m

diff --git a/lib/native/mac/libAEGetURLEventHandlerAgent.jnilib b/lib/native/mac/libAEGetURLEventHandlerAgent.dylib
similarity index 100%
rename from lib/native/mac/libAEGetURLEventHandlerAgent.jnilib
rename to lib/native/mac/libAEGetURLEventHandlerAgent.dylib
diff --git a/resources/install/ant-build-config.properties b/resources/install/ant-build-config.properties
index be346875d..7ffe89ec5 100644
--- a/resources/install/ant-build-config.properties
+++ b/resources/install/ant-build-config.properties
@@ -11,10 +11,8 @@ wix.upgrade.code=F9F09BE0-BA75-4C0D-8D64-E434D78548D4
 #sign.cert.file=
 #sign.cert.password=
 application.home.dirname=.jitsi
-link.download.windows=https\://download.jitsi.org/jitsi/windows/${package.name}-${sip-communicator.version}.exe
 link.download.windows32=https\://download.jitsi.org/jitsi/windows/${package.name}-${sip-communicator.version}-x86.exe
 link.download.windows64=https\://download.jitsi.org/jitsi/windows/${package.name}-${sip-communicator.version}-x64.exe
-link.download.debian=https\://download.jitsi.org/jitsi/debian/${package.name}_${sip-communicator.version}_i386.deb
 link.download.generic=https\://download.jitsi.org/jitsi/generic/${package.name}-${sip-communicator.version}.jar
 link.download.linux=https\://download.jitsi.org/jitsi/linux/${package.name}-${sip-communicator.version}-linux.bin
 link.updates.macosx=https\://download.jitsi.org/jitsi/macosx/sparkle/updates.xml
@@ -22,7 +20,7 @@ link.updates.macosx=https\://download.jitsi.org/jitsi/macosx/sparkle/updates.xml
 #link.sparkle.updates.index=http://download.jitsi.org/jitsi/macosx/sparkle/index.html
 link.update.changelog.prefix=http://bluejimp.com/jitsi/changelogs
 # The private_key file (sparkle_dsa_priv.pem)
-#sparkle.signiture.location=/Users/damencho/dev/sparkle-files/dsa_sign/sparkle_dsa_priv.pem
-#delta.history.location=/Users/damencho/dev/build-history
+#sparkle.signiture.location=/path/to/key.pem
+#delta.history.location=/path/to/folder
 #delta.history.size=10
 #sparkle.delta.download.location=http\://download.jitsi.org/jitsi/macosx/
diff --git a/resources/install/build.xml b/resources/install/build.xml
index 83b3c5c2c..fb37c9f5e 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -1014,7 +1014,7 @@
         <delete failonerror="false" file="${macosx.resrc.dir}/logging.properties"/>
         <delete failonerror="false" file="${macosx.resrc.dir}/felix.client.run.properties"/>
         <symlink action="delete" failonerror="false"
-                 link="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/libAEGetURLEventHandlerAgent.jnilib"/>
+                 link="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/libAEGetURLEventHandlerAgent.dylib"/>
 
         <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/GrowlFramework/Growl.framework/Headers"/>
@@ -1064,43 +1064,6 @@
                 trim="true"/>
       </condition>
 
-      <!-- Prepare the logging.properties file for macosx -->
-      <copy file="${inst.resrc}/logging.properties"
-              tofile="${macosx.resrc.dir}/logging.properties"
-              overwrite="true"/>
-      <replace file="${macosx.resrc.dir}/logging.properties"
-            token="java.util.logging.FileHandler.pattern = %h/.sip-communicator/log"
-            value="java.util.logging.FileHandler.pattern = log"/>
-
-      <!-- Prepare the felix.client.run.properties file for macosx -->
-      <copy file="${lib}/felix.client.run.properties"
-            tofile="${macosx.resrc.dir}/felix.client.run.properties"
-            overwrite="true"/>
-
-      <!-- Prepare the jitsi-defaults.properties file for macosx -->
-      <copy file="${lib}/jitsi-defaults.properties"
-            tofile="${macosx.resrc.dir}/jitsi-defaults.properties"
-            overwrite="true"
-            failonerror="false"/>
-
-      <replace file="${macosx.resrc.dir}/felix.client.run.properties"
-            token="swingnotification.jar">
-      <replacevalue><![CDATA[swingnotification.jar reference\:file\:sc-bundles/growlnotification.jar]]></replacevalue>
-       </replace>
-
-      <!-- Remove the reference to the update bundle -->
-      <replace file="${macosx.resrc.dir}/felix.client.run.properties"
-               token="reference:file:sc-bundles/update.jar"
-               value=""/>
-      <!-- colons can be escaped after some modifications -->
-      <replace file="${macosx.resrc.dir}/felix.client.run.properties"
-               token="reference\:file\:sc-bundles/update.jar"
-               value=""/>
-      <replaceregexp file="${macosx.resrc.dir}/felix.client.run.properties"
-                match="^org.osgi.framework.storage=\$\{user.home\}/.sip-communicator/sip-communicator.bin"
-                replace="org.osgi.framework.storage=$\{user.home\}/Library/Application Support/${application.name}/sip-communicator.bin"
-                flags="m"/>
-
       <!-- We copy macosx-specific bundles from
            sc-bundles/os-specific/macosx to sc-bundles -->
       <copy todir="${bundles.dest}">
@@ -1150,7 +1113,7 @@
                   signature="sipc"
                   mainclass="net.java.sip.communicator.launcher.SIPCommunicator"
                   icon="resources/images/logo/sc_logo_128x128.icns"
-                  jvmversion="1.5+"
+                  jvmversion="1.6+"
                   version="${sip-communicator.version}"
                   build="${sparkle.build}"
                   infostring="${application.name}"
@@ -1193,14 +1156,33 @@
             <exclude name="${bundles.dest}/update.jar" />
             <include name="resources/images/logo/sc_logo_128x128.icns" />
         </jarfileset>
-        <javafilelist dir="${macosx.resrc.dir}"
+        <javafilelist dir="${inst.resrc}"
                       files="logging.properties"/>
-        <javafilelist dir="${macosx.resrc.dir}"
+        <javafilelist dir="${lib}"
                       files="felix.client.run.properties"/>
-        <javafilelist dir="${macosx.resrc.dir}"
+        <javafilelist dir="${lib}"
                       files="jitsi-defaults.properties"/>
       </jarbundler>
 
+      <!-- -->
+      <replace file="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/felix.client.run.properties"
+               token="swingnotification.jar">
+            <replacevalue><![CDATA[swingnotification.jar reference\:file\:sc-bundles/growlnotification.jar]]></replacevalue>
+      </replace>
+
+      <!-- Remove the reference to the update bundle -->
+      <replace file="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/felix.client.run.properties"
+               token="reference:file:sc-bundles/update.jar"
+               value=""/>
+      <!-- colons can be escaped after some modifications -->
+      <replace file="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/felix.client.run.properties"
+               token="reference\:file\:sc-bundles/update.jar"
+               value=""/>
+      <replaceregexp file="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/felix.client.run.properties"
+                match="^org.osgi.framework.storage=\$\{user.home\}/.sip-communicator/sip-communicator.bin"
+                replace="org.osgi.framework.storage=$\{user.home\}/Library/Application Support/${application.name}/sip-communicator.bin"
+                flags="m"/>
+
       <!-- Install the Growl Framework in the application package -->
       <mkdir dir="${macosx.app.dir}/${application.name}.app/Contents/Frameworks"/>
       <unzip src="${macosx.resrc.dir}/GrowlFramework.zip"
@@ -1255,17 +1237,57 @@
       <true/>
       <key>CFBundleName</key>]]></replacevalue>
       </replace>
-      <symlink resource="lib/native/mac/libAEGetURLEventHandlerAgent.jnilib"
-               link="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/libAEGetURLEventHandlerAgent.jnilib"/>
+      <symlink resource="lib/native/mac/libAEGetURLEventHandlerAgent.dylib"
+               link="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/libAEGetURLEventHandlerAgent.dylib"/>
 
       <copy file="${macosx.resrc.dir}/libgrowl4j.dylib"
             todir="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/lib/native/mac/"/>
 
+      <antcall target="-macosx-include-jre"/>
+
       <!-- Delete the tmp if it exists -->
       <delete dir="${macosx.app.dir}/tmp"
               quiet="yes" failonerror="false"/>
     </target>
 
+    <!-- if folder for a macosx jdk is supplied we embed it in the distributed
+        dmg and provide info for it in Info.plist -->
+    <target name="-macosx-include-jre"
+            if="macosx.jre"
+            unless="macosx.embed.jre.disabled">
+
+        <basename property="jre.folder.name" file="${macosx.jre}"/>
+        <dirname property="jre.parent.folder" file="${macosx.jre}"/>
+
+        <mkdir dir="${macosx.app.dir}/${application.name}.app/Contents/PlugIns"/>
+        <copy todir="${macosx.app.dir}/${application.name}.app/Contents/PlugIns">
+              <fileset dir="${jre.parent.folder}">
+                  <include name="${jre.folder.name}/Contents/Info.plist"/>
+                  <include name="${jre.folder.name}/Contents/Home/jre/"/>
+                  <exclude name="${jre.folder.name}/Contents/Home/bin/"/>
+                  <exclude name="${jre.folder.name}/Contents/Home/jre/bin/"/>
+                  <exclude name="${jre.folder.name}/Contents/Home/jre/lib/deploy/"/>
+                  <exclude name="${jre.folder.name}/Contents/Home/jre/lib/deploy.jar"/>
+                  <exclude name="${jre.folder.name}/Contents/Home/jre/lib/javaws.jar"/>
+                  <exclude name="${jre.folder.name}/Contents/Home/jre/lib/libdeploy.dylib"/>
+                  <exclude name="${jre.folder.name}/Contents/Home/jre/lib/libnpjp2.dylib"/>
+                  <exclude name="${jre.folder.name}/Contents/Home/jre/lib/plugin.jar"/>
+                  <exclude name="${jre.folder.name}/Contents/Home/jre/lib/security/javaws.policy"/>
+              </fileset>
+        </copy>
+
+        <!-- and now the entry in Info.plist-->
+        <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
+            <replacetoken><![CDATA[<key>VMOptions</key>]]></replacetoken>
+            <replacevalue><![CDATA[<key>JVMRuntime</key>
+      <string>__jre.folder.name__</string>
+      <key>VMOptions</key>]]></replacevalue>
+        </replace>
+        <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
+            <replacefilter token="__jre.folder.name__" value="${jre.folder.name}"/>
+        </replace>
+    </target>
+
     <!-- Create a MacOSX application package with Sparkle support.
          Executed only if the sparkle label property is set, i.e. if the
          package is built from CruiseControl -->
diff --git a/resources/install/installers.properties b/resources/install/installers.properties
index de122d67f..132c281dc 100644
--- a/resources/install/installers.properties
+++ b/resources/install/installers.properties
@@ -15,3 +15,5 @@ windows.jre64.file=C:\\Install\\jre-7u17-windows-x64.exe
 # as part of the respective setups of SIP Communicator.
 windows.jre.zip=C:\\Install\\jre-7u45-windows-i586.zip
 windows.jre64.zip=C:\\Install\\jre-7u45-windows-x64.zip
+
+macosx.jre=${user.home}/bin/jdk1.7.0_45.jdk
diff --git a/resources/install/macosx/JavaApplicationStub b/resources/install/macosx/JavaApplicationStub
index a744bf93d1bb968f48e59dcbe4505777faaa138d..c28cd5e7c44329b30cb265c00bd7a2bae3fdbce3 100755
GIT binary patch
literal 38652
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

literal 64532
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

diff --git a/src/native/build.xml b/src/native/build.xml
index 8943f7c9a..23cbfcfd5 100644
--- a/src/native/build.xml
+++ b/src/native/build.xml
@@ -941,4 +941,37 @@
       <arg value="${native_install_dir}/jmsoutlookaddrbookcomserver64.exe"/>
     </exec>
   </target>
+
+  <!-- compile launcher for Mac OS X (32-bit/64-bit) -->
+  <target name="macosx-launcher"
+          description="Build macosx launcher shared library for Mac OS X"
+          if="is.running.macos"
+          depends="init-native">
+    <cc name="gcc"
+        outfile="${src}/native/macosx/launcher/JavaApplicationStub"
+        objdir="${obj}">
+
+        <compilerarg value="-Wall" />
+        <compilerarg value="-O2" />
+        <compilerarg value="-arch" />
+        <compilerarg value="x86_64" />
+        <compilerarg value="-arch" />
+        <compilerarg value="i386" />
+        <compilerarg value="-I${system.JAVA_HOME}/include" />
+        <compilerarg value="-I${system.JAVA_HOME}/include/darwin" />
+        <compilerarg value="-mmacosx-version-min=10.6"/>
+
+        <linkerarg value="-arch" />
+        <linkerarg value="x86_64" />
+        <linkerarg value="-arch" />
+        <linkerarg value="i386" />
+        <linkerarg value="-framework" />
+        <linkerarg value="Cocoa" />
+
+        <fileset dir="${src}/native/macosx/launcher" includes="*.m"/>
+    </cc>
+
+    <delete dir="${obj}" failonerror="false" />
+    <delete file="${src}/native/macosx/launcher/history.xml" failonerror="false" />
+  </target>
 </project>
diff --git a/src/native/macosx/launcher/launcher.m b/src/native/macosx/launcher/launcher.m
new file mode 100644
index 000000000..b0d106bef
--- /dev/null
+++ b/src/native/macosx/launcher/launcher.m
@@ -0,0 +1,235 @@
+/*
+ * Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+#include <jni.h>
+#import <Cocoa/Cocoa.h>
+#include <dlfcn.h>
+
+#define JVM_JAVA_KEY "Java"
+#define JVM_WORKING_DIR_KEY "WorkingDirectory"
+#define JVM_RUNTIME_KEY "JVMRuntime"
+#define JVM_MAIN_CLASS_NAME_KEY "MainClass"
+#define JVM_CLASSPATH_KEY "ClassPath"
+#define JVM_OPTIONS_KEY "VMOptions"
+#define JVM_PROPERTIES_KEY "Properties"
+
+#define LAUNCH_ERROR "LaunchError"
+
+#define APP_PACKAGE_PREFIX "$APP_PACKAGE"
+#define JAVA_ROOT_PREFIX "$JAVAROOT"
+
+#define LIBJLI_DYLIB "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/lib/jli/libjli.dylib"
+
+typedef int (JNICALL *JLI_Launch_t)(int argc, char ** argv,
+                                    int jargc, const char** jargv,
+                                    int appclassc, const char** appclassv,
+                                    const char* fullversion,
+                                    const char* dotversion,
+                                    const char* pname,
+                                    const char* lname,
+                                    jboolean javaargs,
+                                    jboolean cpwildcard,
+                                    jboolean javaw,
+                                    jint ergo);
+
+void launchJitsi(int, char **);
+
+static int argsSupplied = 0;
+// saving the original count of app arguments on the first main call
+static int jargc;
+
+int main(int argc, char *argv[])
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    // on the first call save the arguments count, main will be called several
+    // times while starting some threads and initializing jvm
+    if(argsSupplied == 0)
+    {
+        jargc = argc - 1;
+    }
+
+    @try
+    {
+        launchJitsi(argc, argv);
+        return 0;
+    } @catch (NSException *exception)
+    {
+        NSAlert *alert = [[NSAlert alloc] init];
+        [alert setAlertStyle:NSCriticalAlertStyle];
+        [alert setMessageText:[exception reason]];
+        [alert runModal];
+
+        return 1;
+    } @finally
+    {
+        [pool drain];
+    }
+}
+
+void launchJitsi(int argMainCount, char *argMainValues[])
+{
+    NSBundle *mainBundle = [NSBundle mainBundle];
+
+    NSDictionary *infoDictionary = [mainBundle infoDictionary];
+
+    // The java options
+    NSDictionary *javaDictionary = [infoDictionary objectForKey:@JVM_JAVA_KEY];
+
+    // Get the working directory options
+    NSString *workingDirectory =
+        [[javaDictionary objectForKey:@JVM_WORKING_DIR_KEY]
+            stringByReplacingOccurrencesOfString:@APP_PACKAGE_PREFIX
+            withString:[mainBundle bundlePath]];
+    if (workingDirectory == nil)
+    {
+        [[NSException exceptionWithName:@LAUNCH_ERROR
+                      reason:@"Working directory not set"
+                      userInfo:nil] raise];
+    }
+    else
+    {
+        chdir([workingDirectory UTF8String]);
+    }
+
+    // Locate the JLI_Launch() function
+    NSString *runtime = [javaDictionary objectForKey:@JVM_RUNTIME_KEY];
+
+    const char *libjliPath = NULL;
+    if (runtime != nil)
+    {
+        NSString *runtimePath =
+            [[[NSBundle mainBundle] builtInPlugInsPath]
+                stringByAppendingPathComponent:runtime];
+        libjliPath =
+            [[runtimePath stringByAppendingPathComponent:@"Contents/Home/jre/lib/jli/libjli.dylib"]
+                          fileSystemRepresentation];
+    } else {
+        libjliPath = LIBJLI_DYLIB;
+    }
+
+    void *libJLI = dlopen(libjliPath, RTLD_LAZY);
+
+    // if jre folder is deleted
+    if(libJLI == NULL)
+    {
+        libJLI = dlopen(LIBJLI_DYLIB, RTLD_LAZY);
+    }
+
+    JLI_Launch_t jli_LaunchFxnPtr = NULL;
+    if (libJLI != NULL)
+    {
+        jli_LaunchFxnPtr = dlsym(libJLI, "JLI_Launch");
+    }
+
+    if (jli_LaunchFxnPtr == NULL)
+    {
+        [[NSException exceptionWithName:@LAUNCH_ERROR
+            reason:@"JRE load error"
+            userInfo:nil] raise];
+    }
+
+    NSString *mainClassName =
+        [javaDictionary objectForKey:@JVM_MAIN_CLASS_NAME_KEY];
+    if (mainClassName == nil)
+    {
+        [[NSException exceptionWithName:@LAUNCH_ERROR
+            reason:@"Missing main class name"
+            userInfo:nil] raise];
+    }
+
+    NSMutableString *classPath =
+        [NSMutableString stringWithFormat:@"-Djava.class.path=%@", workingDirectory];
+
+    NSArray *jvmcp = [javaDictionary objectForKey:@JVM_CLASSPATH_KEY];
+    if (jvmcp == nil)
+    {
+        [[NSException exceptionWithName:@LAUNCH_ERROR
+            reason:@"Missing class path entry"
+            userInfo:nil] raise];
+    }
+    else
+    {
+        for (NSString *cpe in jvmcp)
+        {
+            [classPath appendFormat:@":%@",
+                [cpe stringByReplacingOccurrencesOfString:@JAVA_ROOT_PREFIX
+                     withString:workingDirectory]];
+        }
+    }
+
+    // Get the VM options
+    NSString *options = [javaDictionary objectForKey:@JVM_OPTIONS_KEY];
+
+    // Get the system properties
+    NSDictionary *sprops = [javaDictionary objectForKey:@JVM_PROPERTIES_KEY];
+
+    // application arguments to be added, add them on first and second call
+    // of the main, the first one starts the second one in new thread
+    // no further calls
+    int appArgc = 0;
+    if(argsSupplied < 2 && jargc > 0)
+        appArgc = jargc;
+
+    // Initialize the arguments to JLI_Launch()
+    int argc = 2 + [sprops count] + 1 + appArgc;
+    if(options != nil)
+        argc++;
+
+    char *argv[argc + appArgc];
+
+    int i = 0;
+    argv[i++] = argMainValues[0];
+    argv[i++] = strdup([classPath UTF8String]);
+
+    if(options != nil)
+    {
+        NSString *op =
+            [options stringByReplacingOccurrencesOfString:@JAVA_ROOT_PREFIX
+                    withString:workingDirectory];
+        op = [op stringByTrimmingCharactersInSet:
+                    [NSCharacterSet whitespaceAndNewlineCharacterSet]];
+        argv[i++] = strdup([op UTF8String]);
+    }
+
+    for( NSString *sPropKey in sprops )
+    {
+        NSString *sPropValue = [sprops objectForKey:sPropKey];
+        sPropValue = [sPropValue stringByTrimmingCharactersInSet:
+                        [NSCharacterSet whitespaceAndNewlineCharacterSet]];
+        argv[i++] = strdup(
+            [[NSMutableString stringWithFormat:@"-D%@=%@", sPropKey,
+                [sPropValue stringByReplacingOccurrencesOfString:@JAVA_ROOT_PREFIX
+                            withString:workingDirectory]]
+            UTF8String]);
+    }
+
+    argv[i++] = strdup([mainClassName UTF8String]);
+
+    // copy the application parameters, the number we have saved
+    // the params are last in the array of arguments
+    for(int j = appArgc; j > 0; j--)
+    {
+        argv[i++] = strdup(argMainValues[argMainCount-j]);
+    }
+    argsSupplied++;
+
+    NSString *pname = [infoDictionary objectForKey:@"CFBundleName"];
+
+    // Invoke JLI_Launch()
+    jli_LaunchFxnPtr(argc, argv,
+                     0, NULL,
+                     0, NULL,
+                     "",
+                     "",
+                     [pname UTF8String],
+                     [pname UTF8String],
+                     FALSE,
+                     FALSE,
+                     FALSE,
+                     0);
+}