- Drop dependency on main package from -javadoc.
- Add license to -javadoc, and OTHERS and TODO to main package docs. - Install javadocs and jars unversioned. - Fix release-notes.html permissions. - Make -javadoc and -contrib noarch where available.
This commit is contained in:
Ville Skyttä
parent
d0e5b654c2
commit
d445a216cd
@ -1,142 +0,0 @@
|
|||||||
diff -up ./src/com/sun/jna/Native.java.loadlib ./src/com/sun/jna/Native.java
|
|
||||||
--- ./src/com/sun/jna/Native.java.loadlib 2009-11-09 10:23:05.000000000 +0100
|
|
||||||
+++ ./src/com/sun/jna/Native.java 2009-11-09 10:30:41.000000000 +0100
|
|
||||||
@@ -630,131 +630,19 @@ public final class Native {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
- * Loads the JNA stub library. It will first attempt to load this library
|
|
||||||
- * from the directories specified in jna.boot.library.path. If that fails,
|
|
||||||
- * it will fallback to loading from the system library paths. Finally it will
|
|
||||||
- * attempt to extract the stub library from from the JNA jar file, and load it.
|
|
||||||
- * <p>
|
|
||||||
- * The jna.boot.library.path property is mainly to support jna.jar being
|
|
||||||
- * included in -Xbootclasspath, where java.library.path and LD_LIBRARY_PATH
|
|
||||||
- * are ignored. It might also be useful in other situations.
|
|
||||||
- * </p>
|
|
||||||
+ * Loads the JNA stub library.
|
|
||||||
+ *
|
|
||||||
+ ** MODIFIED FROM UPSTREAM - we rip out all sorts of gunk here that is
|
|
||||||
+ ** unnecessary when JNA is properly installed with the OS.
|
|
||||||
*/
|
|
||||||
private static void loadNativeLibrary() {
|
|
||||||
- String libName = "jnidispatch";
|
|
||||||
- String bootPath = System.getProperty("jna.boot.library.path");
|
|
||||||
- if (bootPath != null) {
|
|
||||||
- String[] dirs = bootPath.split(File.pathSeparator);
|
|
||||||
- for (int i = 0; i < dirs.length; ++i) {
|
|
||||||
- String path = new File(new File(dirs[i]), System.mapLibraryName(libName)).getAbsolutePath();
|
|
||||||
- try {
|
|
||||||
- System.load(path);
|
|
||||||
- nativeLibraryPath = path;
|
|
||||||
- return;
|
|
||||||
- } catch (UnsatisfiedLinkError ex) {
|
|
||||||
- }
|
|
||||||
- if (Platform.isMac()) {
|
|
||||||
- String orig, ext;
|
|
||||||
- if (path.endsWith("dylib")) {
|
|
||||||
- orig = "dylib";
|
|
||||||
- ext = "jnilib";
|
|
||||||
- } else {
|
|
||||||
- orig = "jnilib";
|
|
||||||
- ext = "dylib";
|
|
||||||
- }
|
|
||||||
- try {
|
|
||||||
- path = path.substring(0, path.lastIndexOf(orig)) + ext;
|
|
||||||
- System.load(path);
|
|
||||||
- nativeLibraryPath = path;
|
|
||||||
- return;
|
|
||||||
- } catch (UnsatisfiedLinkError ex) {
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
try {
|
|
||||||
- System.loadLibrary(libName);
|
|
||||||
- nativeLibraryPath = libName;
|
|
||||||
+ System.load("@JNIPATH@/" + System.mapLibraryName("jnidispatch"));
|
|
||||||
+ nativeLibraryPath = "@JNIPATH@/" + System.mapLibraryName("jnidispatch");
|
|
||||||
}
|
|
||||||
catch(UnsatisfiedLinkError e) {
|
|
||||||
- loadNativeLibraryFromJar();
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /**
|
|
||||||
- * Attempts to load the native library resource from the filesystem,
|
|
||||||
- * extracting the JNA stub library from jna.jar if not already available.
|
|
||||||
- */
|
|
||||||
- private static void loadNativeLibraryFromJar() {
|
|
||||||
- String libname = System.mapLibraryName("jnidispatch");
|
|
||||||
- String arch = System.getProperty("os.arch");
|
|
||||||
- String name = System.getProperty("os.name");
|
|
||||||
- String resourceName = getNativeLibraryResourcePath(Platform.getOSType(), arch, name) + "/" + libname;
|
|
||||||
- URL url = Native.class.getResource(resourceName);
|
|
||||||
-
|
|
||||||
- // Add an ugly hack for OpenJDK (soylatte) - JNI libs use the usual
|
|
||||||
- // .dylib extension
|
|
||||||
- if (url == null && Platform.isMac()
|
|
||||||
- && resourceName.endsWith(".dylib")) {
|
|
||||||
- resourceName = resourceName.substring(0, resourceName.lastIndexOf(".dylib")) + ".jnilib";
|
|
||||||
- url = Native.class.getResource(resourceName);
|
|
||||||
- }
|
|
||||||
- if (url == null) {
|
|
||||||
- throw new UnsatisfiedLinkError("jnidispatch (" + resourceName
|
|
||||||
- + ") not found in resource path");
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- File lib = null;
|
|
||||||
- if (url.getProtocol().toLowerCase().equals("file")) {
|
|
||||||
- try {
|
|
||||||
- lib = new File(url.toURI());
|
|
||||||
- }
|
|
||||||
- catch(URISyntaxException e) {
|
|
||||||
- lib = new File(url.getPath());
|
|
||||||
- }
|
|
||||||
- if (!lib.exists()) {
|
|
||||||
- throw new Error("File URL " + url + " could not be properly decoded");
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- else {
|
|
||||||
- InputStream is = Native.class.getResourceAsStream(resourceName);
|
|
||||||
- if (is == null) {
|
|
||||||
- throw new Error("Can't obtain jnidispatch InputStream");
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- FileOutputStream fos = null;
|
|
||||||
- try {
|
|
||||||
- // Suffix is required on windows, or library fails to load
|
|
||||||
- // Let Java pick the suffix, except on windows, to avoid
|
|
||||||
- // problems with Web Start.
|
|
||||||
- lib = File.createTempFile("jna", Platform.isWindows()?".dll":null);
|
|
||||||
- lib.deleteOnExit();
|
|
||||||
- ClassLoader cl = Native.class.getClassLoader();
|
|
||||||
- if (Platform.deleteNativeLibraryAfterVMExit()
|
|
||||||
- && (cl == null
|
|
||||||
- || cl.equals(ClassLoader.getSystemClassLoader()))) {
|
|
||||||
- Runtime.getRuntime().addShutdownHook(new DeleteNativeLibrary(lib));
|
|
||||||
- }
|
|
||||||
- fos = new FileOutputStream(lib);
|
|
||||||
- int count;
|
|
||||||
- byte[] buf = new byte[1024];
|
|
||||||
- while ((count = is.read(buf, 0, buf.length)) > 0) {
|
|
||||||
- fos.write(buf, 0, count);
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- catch(IOException e) {
|
|
||||||
- throw new Error("Failed to create temporary file for jnidispatch library: " + e);
|
|
||||||
- }
|
|
||||||
- finally {
|
|
||||||
- try { is.close(); } catch(IOException e) { }
|
|
||||||
- if (fos != null) {
|
|
||||||
- try { fos.close(); } catch(IOException e) { }
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
- unpacked = true;
|
|
||||||
+ throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
- System.load(lib.getAbsolutePath());
|
|
||||||
- nativeLibraryPath = lib.getAbsolutePath();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
32
jna.spec
32
jna.spec
@ -1,6 +1,6 @@
|
|||||||
Name: jna
|
Name: jna
|
||||||
Version: 3.2.7
|
Version: 3.2.7
|
||||||
Release: 10%{?dist}
|
Release: 11%{?dist}
|
||||||
Summary: Pure Java access to native libraries
|
Summary: Pure Java access to native libraries
|
||||||
|
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -54,7 +54,9 @@ of use take priority.
|
|||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: Javadocs for %{name}
|
Summary: Javadocs for %{name}
|
||||||
Group: Documentation
|
Group: Documentation
|
||||||
Requires: %{name} = %{version}-%{release}
|
%if 0%{?fedora} || 0%{?rhel} > 5
|
||||||
|
BuildArch: noarch
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%description javadoc
|
%description javadoc
|
||||||
@ -66,6 +68,9 @@ Summary: Contrib for %{name}
|
|||||||
Group: Documentation
|
Group: Documentation
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Obsoletes: %{name}-examples
|
Obsoletes: %{name}-examples
|
||||||
|
%if 0%{?fedora} || 0%{?rhel} > 5
|
||||||
|
BuildArch: noarch
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%description contrib
|
%description contrib
|
||||||
@ -98,7 +103,8 @@ rm -rf native/libffi
|
|||||||
|
|
||||||
# clean LICENSE.txt
|
# clean LICENSE.txt
|
||||||
sed -i 's/\r//' LICENSE.txt
|
sed -i 's/\r//' LICENSE.txt
|
||||||
chmod 0644 LICENSE.txt
|
|
||||||
|
chmod -c 0644 LICENSE.txt OTHERS release-notes.html
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -113,8 +119,7 @@ sed -i "s/VERSION/%{version}/" %{name}-pom.xml
|
|||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
# jars
|
# jars
|
||||||
install -D -m 644 build*/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
|
install -D -m 644 build*/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||||
(cd %{buildroot}%{_javadir}/; for jar in `ls *-%{version}.jar`; do ln -s $jar `echo $jar | sed -e 's/-%{version}//'`; done)
|
|
||||||
install -d -m 755 %{buildroot}%{_javadir}/%{name}
|
install -d -m 755 %{buildroot}%{_javadir}/%{name}
|
||||||
find contrib -name '*.jar' -exec cp {} %{buildroot}%{_javadir}/%{name}/ \;
|
find contrib -name '*.jar' -exec cp {} %{buildroot}%{_javadir}/%{name}/ \;
|
||||||
# NOTE: JNA has highly custom code to look for native jars in this
|
# NOTE: JNA has highly custom code to look for native jars in this
|
||||||
@ -132,8 +137,8 @@ install -Dm 644 %{name}-pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# javadocs
|
# javadocs
|
||||||
install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
|
install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
|
cp -a doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|
||||||
|
|
||||||
#if 0%{?rhel} >= 6 || 0%{?fedora} >= 9
|
#if 0%{?rhel} >= 6 || 0%{?fedora} >= 9
|
||||||
@ -161,10 +166,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc LICENSE.txt release-notes.html
|
%doc LICENSE.txt OTHERS release-notes.html TODO
|
||||||
%{_libdir}/%{name}
|
%{_libdir}/%{name}
|
||||||
%{_javadir}/%{name}.jar
|
%{_javadir}/%{name}.jar
|
||||||
%{_javadir}/%{name}-%{version}.jar
|
|
||||||
%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
|
%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
|
||||||
%{_mavenpomdir}/*.pom
|
%{_mavenpomdir}/*.pom
|
||||||
%{_mavendepmapfragdir}/%{name}
|
%{_mavendepmapfragdir}/%{name}
|
||||||
@ -173,7 +177,8 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_javadocdir}/%{name}-%{version}
|
%doc LICENSE.txt
|
||||||
|
%{_javadocdir}/%{name}
|
||||||
|
|
||||||
|
|
||||||
%files contrib
|
%files contrib
|
||||||
@ -182,6 +187,13 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 9 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.2.7-11
|
||||||
|
- Drop dependency on main package from -javadoc.
|
||||||
|
- Add license to -javadoc, and OTHERS and TODO to main package docs.
|
||||||
|
- Install javadocs and jars unversioned.
|
||||||
|
- Fix release-notes.html permissions.
|
||||||
|
- Make -javadoc and -contrib noarch where available.
|
||||||
|
|
||||||
* Fri Dec 3 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-10
|
* Fri Dec 3 2010 Levente Farkas <lfarkas@lfarkas.org> - 3.2.7-10
|
||||||
- fix pom file name #655810
|
- fix pom file name #655810
|
||||||
- disable check everywhere since it seems to always fail in mock
|
- disable check everywhere since it seems to always fail in mock
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user