From 8bee4d318ea5a5bf29a83e02a5ec8d68e74434df Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Sun, 29 May 2016 23:10:01 +0200
Subject: [PATCH] Stop messing with the JNA manifest and libraries

---
 build.xml                             | 15 +++------------
 lib/felix.client.run.properties       |  3 ++-
 lib/felix.unit.test.properties        |  3 ++-
 lib/installer-exclude/jna.manifest.mf | 12 ------------
 resources/install/build.xml           |  4 ++--
 5 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 lib/installer-exclude/jna.manifest.mf

diff --git a/build.xml b/build.xml
index 75bea81c9..6bc941cfa 100644
--- a/build.xml
+++ b/build.xml
@@ -1053,7 +1053,7 @@
         bundle-protocol,bundle-protocol-media,bundle-icq,
         bundle-icq-slick,bundle-mock,bundle-smacklib,bundle-jmdnslib,
         bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service,
-        bundle-jnalib,bundle-phonenumbers,
+        bundle-phonenumbers,
         bundle-irc,bundle-irc-commands,bundle-plugin-ircaccregwizz,
         bundle-yahoo,bundle-yahoo-slick,
         bundle-contactlist,meta-contactlist,meta-contactlist-slick,
@@ -1129,6 +1129,8 @@
         <copy file="${lib.noinst}/jain-sip-ri-ossonly-1.2.279-jitsi-oss1.jar" tofile="${bundles.dest}/jain-sip-ri.jar"/>
         <copy file="${lib.noinst}/dnsjava-2.1.7.jar" tofile="${bundles.dest}/dnsjava.jar"/>
         <copy file="${lib.noinst}/dnssecjava-1.1.jar" tofile="${bundles.dest}/dnssecjava.jar"/>
+        <copy file="${lib.noinst}/jna.jar" tofile="${bundles.dest}/jna.jar"/>
+        <copy file="${lib.noinst}/jna-platform.jar" tofile="${bundles.dest}/jna-platform.jar"/>
     </target>
 
     <!--BUNDLE-SC-LAUNCHER-->
@@ -1596,17 +1598,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-    <target name="bundle-jnalib">
-        <!-- Creates a bundle containing the win jna implementation.-->
-        <jar
-            compress="false" destfile="${bundles.dest}/jnalib.jar"
-            manifest="${lib.noinst}/jna.manifest.mf">
-
-            <zipfileset src="${lib.noinst}/jna.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/jna-platform.jar" prefix=""/>
-        </jar>
-    </target>
-
     <!-- BUNDLE-ICQ -->
     <target name="bundle-icq">
         <!-- Creates a bundle containing the icq impl of the protocol provider.-->
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index c596e495d..e36bf54ff 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -105,7 +105,8 @@ felix.auto.start.35= \
 
 felix.auto.start.40= \
  reference:file:sc-bundles/jmdnslib.jar \
- reference:file:sc-bundles/jnalib.jar \
+ reference:file:sc-bundles/jna.jar \
+ reference:file:sc-bundles/jna-platform.jar \
  reference:file:sc-bundles/provdisc.jar \
  reference:file:sc-bundles/jfontchooserlib.jar \
  reference:file:sc-bundles/netaddr.jar \
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index b4f1a7fc4..5db3a83b7 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -112,7 +112,8 @@ felix.auto.start.40= \
  reference:file:sc-bundles/jfontchooserlib.jar \
  reference:file:sc-bundles/version-impl.jar \
  reference:file:sc-bundles/keybindings.jar \
- reference:file:sc-bundles/jnalib.jar \
+ reference:file:sc-bundles/jna.jar \
+ reference:file:sc-bundles/jna-platform.jar \
  reference:file:sc-bundles/netaddr.jar \
  reference:file:sc-bundles/sysactivitynotifications.jar \
  reference:file:sc-bundles/browserlauncher.jar \
diff --git a/lib/installer-exclude/jna.manifest.mf b/lib/installer-exclude/jna.manifest.mf
deleted file mode 100644
index 0c32920b0..000000000
--- a/lib/installer-exclude/jna.manifest.mf
+++ /dev/null
@@ -1,12 +0,0 @@
-Bundle-Name: JNA Lib Provider
-Bundle-Description: JNA Lib Provider
-Bundle-Vendor: sip-communicator.org
-Bundle-Version: 0.0.1
-Bundle-SymbolicName: com.sun.jna
-Export-Package: com.sun.jna.win32,
- com.sun.jna,
- com.sun.jna.ptr,
- com.sun.jna.platform,
- com.sun.jna.platform.win32
-
-
diff --git a/resources/install/build.xml b/resources/install/build.xml
index 669351318..88ec7256c 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -584,7 +584,7 @@
             <param name="platform" value="windows-${windows.arch}" />
         </antcall>
         <antcall target="strip-multi-platform-jar">
-            <param name="jar" value="${light.dir}/sc-bundles/jnalib.jar"/>
+            <param name="jar" value="${light.dir}/sc-bundles/jna.jar"/>
             <param name="platform" value="windows-${windows.arch}" />
         </antcall>
 
@@ -1204,7 +1204,7 @@
           <param name="platform" value="osx" />
       </antcall>
       <antcall target="strip-multi-platform-jar">
-          <param name="jar" value="${bundles.dest}/jnalib.jar"/>
+          <param name="jar" value="${bundles.dest}/jna.jar"/>
           <param name="platform" value="osx" />
       </antcall>