From 1b29a19a2823fdf002861df83f1c214a6dfb1981 Mon Sep 17 00:00:00 2001
From: Tisham Dhar <Tisham Dhar at csiro dot au>
Date: Fri, 8 Jul 2011 18:21:18 +1000
Subject: [PATCH] Added bnd based wrapping of jna.jar to jna_osgi.jar instead
 of static manifest entries #7

---
 build.xml          | 9 +++++++--
 bnd.bnd => jna.bnd | 0
 2 files changed, 7 insertions(+), 2 deletions(-)
 rename bnd.bnd => jna.bnd (100%)

diff --git a/build.xml b/build.xml
index 20bc1f79b0..5d7f2b8c51 100644
--- a/build.xml
+++ b/build.xml
@@ -225,7 +225,7 @@
           <attribute name="Specification-Title" value="${spec.title}"/>
           <attribute name="Specification-Vendor" value="${spec.vendor}"/>
           <attribute name="Specification-Version" value="${spec.version}"/>
-          <!-- OSGi Bundle attributes -->
+          <!-- OSGi Bundle attributes 
           <attribute name="Bundle-ManifestVersion" value="2"/>
           <attribute name="Bundle-Name" value="jna"/>
           <attribute name="Bundle-Description" value="JNA Library"/>
@@ -234,7 +234,7 @@
           <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/>
           <attribute name="Bundle-Vendor" value="${vendor}"/>
           <attribute name="Bundle-ActivationPolicy" value="lazy"/>
-          <attribute name="Export-Package" value="com.sun.jna,com.sun.jna.ptr,com.sun.jna.win32"/>
+          <attribute name="Export-Package" value="com.sun.jna,com.sun.jna.ptr,com.sun.jna.win32"/>-->
         </section>
       </manifest>
       <fileset dir="${classes}" excludes="${jar.omitted}">
@@ -243,6 +243,11 @@
     </jar>
   </target>
 
+  <target name="osgi-jar" depends="jar" description="Wrap Jar including OSGi manifest entries">
+  	<bnd-wrap definitions="${basedir}" output="${build}" jars="${build}/${jar}"/>
+  	<move file="${build}/jna.bar" tofile="${build}/jna_osgi.jar"/>
+  </target>
+
   <target name="contrib-jars" depends="jar" description="Build contrib jars">
     <subant target="jar">
       <property name="file.reference.jna.build" location="${build}"/>
diff --git a/bnd.bnd b/jna.bnd
similarity index 100%
rename from bnd.bnd
rename to jna.bnd