Attachment 65212 Details for Bug 184433 – Patch making EFS aware of the new lib for Linux x86_64

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

[patch] Patch making EFS aware of the new lib for Linux x86_64

localfile_linux64_patch.txt (text/plain), 5.03 KB, created by Martin Oberhuber

on 2007-04-27 10:00:36 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2007-04-27 10:00:36 EDT

Size: 5.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.core.filesystem
>Index: src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java,v
>retrieving revision 1.14
>diff -u -r1.14 LocalFileSystem.java
>--- src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java	23 Apr 2007 16:32:09 -0000	1.14
>+++ src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java	27 Apr 2007 13:58:16 -0000
>@@ -9,6 +9,7 @@
>  *     IBM Corporation - initial API and implementation
>  * Martin Oberhuber (Wind River) - [170317] add symbolic link support to API
>  * Martin Oberhuber (Wind River) - [183137] liblocalfile for solaris-sparc
>+ * Martin Oberhuber (Wind River) - [184433] liblocalfile for Linux x86_64
>  *******************************************************************************/
> package org.eclipse.core.internal.filesystem.local;
> 
>@@ -90,8 +91,9 @@
> 		String arch = System.getProperty("osgi.arch", ""); //$NON-NLS-1$ //$NON-NLS-2$
> 		if (os.equals(Constants.OS_WIN32))
> 			attributes |= EFS.ATTRIBUTE_ARCHIVE | EFS.ATTRIBUTE_HIDDEN;
>-		else if ( (os.equals(Constants.OS_LINUX) && (arch.equals(Constants.ARCH_X86) || arch.equals(Constants.ARCH_PPC)))
>-			 ||   (os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC))
>+		else if ( 
>+			(os.equals(Constants.OS_LINUX) && (arch.equals(Constants.ARCH_X86) || arch.equals(Constants.ARCH_X86_64) || arch.equals(Constants.ARCH_PPC)))
>+		 || (os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC))
> 		)
> 			attributes |= EFS.ATTRIBUTE_EXECUTABLE | EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET;
> 		else if (os.equals(Constants.OS_MACOSX) || os.equals(Constants.OS_HPUX) || os.equals(Constants.OS_QNX))
>#P org.eclipse.core.tests.resources
>Index: src/org/eclipse/core/tests/filesystem/SymlinkTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/SymlinkTest.java,v
>retrieving revision 1.7
>diff -u -r1.7 SymlinkTest.java
>--- src/org/eclipse/core/tests/filesystem/SymlinkTest.java	23 Apr 2007 16:32:07 -0000	1.7
>+++ src/org/eclipse/core/tests/filesystem/SymlinkTest.java	27 Apr 2007 13:58:18 -0000
>@@ -9,6 +9,7 @@
>  * Martin Oberhuber (Wind River) - initial API and implementation
>  * John Arthorne (IBM) - [172346] disable tests with problematic Platform encoding
>  * Martin Oberhuber (Wind River) - [183137] liblocalfile for solaris-sparc
>+ * Martin Oberhuber (Wind River) - [184433] liblocalfile for Linux x86_64
>  *******************************************************************************/
> package org.eclipse.core.tests.filesystem;
> 
>@@ -318,7 +319,7 @@
> 	public void testSymlinkEnabled() {
> 		String os = Platform.getOS();
> 		String arch=Platform.getOSArch();
>-		if ( (Platform.OS_LINUX.equals(os) && (Platform.ARCH_X86.equals(arch) || Platform.ARCH_PPC.equals(arch)))
>+		if ( (Platform.OS_LINUX.equals(os) && (Platform.ARCH_X86.equals(arch) || Platform.ARCH_X86_64.equals(arch) || Platform.ARCH_PPC.equals(arch)))
> 		 ||  (Platform.OS_SOLARIS.equals(os) && Platform.ARCH_SPARC.equals(arch))
> 		) {
> 			assertTrue(haveSymlinks());
>#P org.eclipse.core.filesystem.linux.x86_64
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.filesystem.linux.x86_64/META-INF/MANIFEST.MF,v
>retrieving revision 1.2
>diff -u -r1.2 MANIFEST.MF
>--- META-INF/MANIFEST.MF	8 Nov 2005 21:48:07 -0000	1.2
>+++ META-INF/MANIFEST.MF	27 Apr 2007 13:58:20 -0000
>@@ -2,8 +2,8 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %fragmentName
> Bundle-SymbolicName: org.eclipse.core.filesystem.linux.x86_64; singleton:=true
>-Bundle-Version: 1.0.0.qualifier
>+Bundle-Version: 1.0.100.qualifier
> Bundle-Vendor: %providerName
>-Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.0.0,2.0.0)"
>+Fragment-Host: org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)"
> Bundle-Localization: fragment
> Eclipse-PlatformFilter: (& (osgi.os=linux) (osgi.arch=x86_64))
>Index: BUILD_INFO.txt
>===================================================================
>RCS file: BUILD_INFO.txt
>diff -N BUILD_INFO.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ BUILD_INFO.txt	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,19 @@
>+Native Build Info:
>+------------------
>+
>+platform:         x86_64-redhat-linux
>+built by:         martin.oberhuber@windriver.com
>+build date:       27-Apr-2007
>+OS Name:          Red Hat Enterprise Linux Client release 5 (Tikanga)
>+OS Version:       Linux szg-qa-lx2-64 2.6.18-8.1.1.el5 #1 SMP x86_64 GNU/Linux (glibc-2.5-12)
>+Compiler version: gcc version 4.1.1 20070105 (Red Hat 4.1.1-52)
>+
>+build script:
>+-------------
>+#!/bin/sh
>+rpm -q glibc
>+#ensure system gcc
>+export PATH=/usr/bin:$PATH
>+cd org.eclipse.core.filesystem/natives/unix/linux
>+make JAVA_HOME=$HOME/jdk1.5.0_11_x86-64
>+cp liblocalfile_1_0_0.so ../../../../org.eclipse.core.filesystem.linux.x86_64/os/linux/x86_64/

Flags:

john.arthorne: iplog+

Actions: View | Diff

Attachments on bug 184433: 65211 | 65212 | 65231 | 65234 | 66509