From 0dd7968e657e673e64d4dbbae356106c9546ffd7 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Tue, 25 Nov 2014 17:39:07 +0200
Subject: [PATCH] Renames agent binary used to dylib, as this is the supported
 by java 1.7+.

---
 ...nt.jnilib => libAEGetURLEventHandlerAgent.dylib} | Bin
 resources/install/build.xml                         |   8 ++------
 src/native/build.xml                                |   2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename lib/native/mac/{libAEGetURLEventHandlerAgent.jnilib => libAEGetURLEventHandlerAgent.dylib} (100%)

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/build.xml b/resources/install/build.xml
index ae3ae10e2..971ca7dd8 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -1043,7 +1043,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"/>
@@ -1268,12 +1268,8 @@
       <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.jnilib"
+      <symlink resource="lib/native/mac/libAEGetURLEventHandlerAgent.dylib"
                link="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/libAEGetURLEventHandlerAgent.dylib"/>
-      <symlink resource="libAEGetURLEventHandlerAgent.jnilib"
-               link="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/lib/native/mac/libAEGetURLEventHandlerAgent.dylib"/>
 
       <copy file="${macosx.resrc.dir}/JavaApplicationStub_Old"
             tofile="${macosx.app.dir}/${application.name}.app/Contents/MacOS/${application.name}_Launcher"/>
diff --git a/src/native/build.xml b/src/native/build.xml
index c77e8926a..917b247e2 100644
--- a/src/native/build.xml
+++ b/src/native/build.xml
@@ -311,7 +311,7 @@
       <compilerarg value="-I/System/Library/Frameworks/JavaVM.framework/Headers" />
 
       <linkerarg value="-o" location="end" />
-      <linkerarg value="libAEGetURLEventHandlerAgent.jnilib" location="end" />
+      <linkerarg value="libAEGetURLEventHandlerAgent.dylib" location="end" />
       <linkerarg value="-arch" />
       <linkerarg value="x86_64" />
       <linkerarg value="-framework" />