Attachment 136339 Details for Bug 276564 – Possible fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Possible fix

load.patch (text/plain), 1.81 KB, created by Silenio Quarti

on 2009-05-19 13:10:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Silenio Quarti

Created: 2009-05-19 13:10:27 EDT

Size: 1.81 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt
>Index: Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt/Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java,v
>retrieving revision 1.362
>diff -u -r1.362 Library.java
>--- Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java	8 May 2009 20:08:19 -0000	1.362
>+++ Eclipse SWT PI/common_j2se/org/eclipse/swt/internal/Library.java	19 May 2009 17:09:11 -0000
>@@ -201,8 +201,8 @@
> 		}
> 		libName1 = name + "-" + Platform.PLATFORM + "-" + version;  //$NON-NLS-1$ //$NON-NLS-2$
> 		libName2 = name + "-" + Platform.PLATFORM;  //$NON-NLS-1$
>-		mappedName1 = System.mapLibraryName (libName1);
>-		mappedName2 = System.mapLibraryName (libName2);
>+		mappedName1 = mapLibraryName (libName1);
>+		mappedName2 = mapLibraryName (libName2);
> 	} else {
> 		libName1 = libName2 = mappedName1 = mappedName2 = name;
> 	}
>@@ -230,8 +230,8 @@
> 		} else {
> 			/* fall back to using the tmp directory */
> 			if (IS_64) {
>-				fileName1 = System.mapLibraryName (libName1 + SUFFIX_64);
>-				fileName2 = System.mapLibraryName (libName2 + SUFFIX_64);
>+				fileName1 = mapLibraryName (libName1 + SUFFIX_64);
>+				fileName2 = mapLibraryName (libName2 + SUFFIX_64);
> 			}
> 		}
> 		if (load (path + SEPARATOR + fileName1)) return;
>@@ -248,4 +248,13 @@
> 	throw new UnsatisfiedLinkError ("no " + libName1 + " or " + libName2 + " in swt.library.path, java.library.path or the jar file"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> }
> 
>+static String mapLibraryName (String libName) {
>+	libName = System.mapLibraryName (libName);
>+	String ext = ".dylib";
>+	if (libName.endsWith(".dylib")) {
>+		libName = libName.substring(0, libName.length() - ext.length()) + ".jnilib";
>+	}
>+	return libName;
>+}
>+
> }

Actions: View | Diff

Attachments on bug 276564: 136087 | 136088 | 136339 | 136677 | 137195