Skip to content

Commit

Permalink
Added Manifest entries for native jar java-native-access#7
Browse files Browse the repository at this point in the history
whatnick committed Jul 8, 2011

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
1 parent 0cdc7ff commit 5a8d538
Showing 1 changed file with 21 additions and 1 deletion.
22 changes: 21 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
@@ -229,7 +229,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*"/>
<attribute name="Export-Package" value="com.sun.jna,com.sun.jna.ptr,com.sun.jna.win32"/>
</section>
</manifest>
<fileset dir="${classes}" excludes="${jar.omitted}">
@@ -416,6 +416,26 @@
<manifest>
<attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
<attribute name="Specification-Version" value="${jni.version}"/>
<!-- OSGi Bundle attributes -->
<!-- Need this variable to be conditional per platform -->

This comment has been minimized.

Copy link
@twall

twall Jul 21, 2011

This comment is ambiguous. Does the attribute below handle the per-platform conditions, or is that something that still needs to be done? I note this only identifies three os/cpu pairs, while there exist for JNA three of those for macos alone.

This comment has been minimized.

Copy link
@whatnick

whatnick Jul 21, 2011

Author Owner

This is indeed incomplete. I only have the 3 platforms to test with (Win32 Xp - 32bit, MacOSX 10.6 (I use universal compile options , Intel), Ubuntu 64 bit) . The platform specific native metadata needs work and testing from platform users.

This comment has been minimized.

Copy link
@whatnick

whatnick Jul 29, 2011

Author Owner

I have located a much better set of platform filters - http://josh-in-antarctica.blogspot.com/2008/05/visualizer-part-2-osgi-native-libraries.html , I will include them in the build.xml and make another push.

<attribute name="Bundle-NativeCode" value="jnidispatch.dll ;
osname=Win32 ;
processor=x86,
libjnidispatch.so ;
osname=Linux;
processor=x86,
libjnidispatch.dylib ;
osname=MacOS;
processor=x86"/>
<attribute name="Bundle-Name" value="JNA Native Code"/>
<attribute name="Fragment-Host" value="com.sun.jna"/>

<attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Bundle-SymbolicName" value="com.sun.jna.native.${os.prefix}.${ARCH}"/>
<attribute name="Bundle-Version" value="${spec.version}"/>
<attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/>
<attribute name="Bundle-Vendor" value="${vendor}"/>
<attribute name="Bundle-ActivationPolicy" value="lazy"/>
</manifest>
</jar>
</target>

0 comments on commit 5a8d538

Please sign in to comment.