diff options
Diffstat (limited to 'java/eclipse/files/patch-rt.equinox.framework')
| -rw-r--r-- | java/eclipse/files/patch-rt.equinox.framework | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/eclipse/files/patch-rt.equinox.framework b/java/eclipse/files/patch-rt.equinox.framework index b7d980910105..56716e64db33 100644 --- a/java/eclipse/files/patch-rt.equinox.framework +++ b/java/eclipse/files/patch-rt.equinox.framework @@ -229,7 +229,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse private static final String INTERNAL_OS_MACOSX = "Mac OS"; //$NON-NLS-1$ private static final String INTERNAL_OS_AIX = "AIX"; //$NON-NLS-1$ private static final String INTERNAL_OS_HPUX = "HP-UX"; //$NON-NLS-1$ -@@ -734,7 +735,7 @@ +@@ -746,7 +747,7 @@ // setup default values for known OSes if nothing was specified if (osName.equals(Constants.OS_WIN32)) return Constants.WS_WIN32; @@ -238,7 +238,7 @@ diff -ru rt.equinox.framework/bundles/org.eclipse.osgi/container/src/org/eclipse return Constants.WS_GTK; if (osName.equals(Constants.OS_MACOSX)) return Constants.WS_COCOA; -@@ -757,6 +758,8 @@ +@@ -769,6 +770,8 @@ // EXCEPTION: All mappings of SunOS convert to Solaris if (osName.equalsIgnoreCase(INTERNAL_OS_SUNOS)) return Constants.OS_SOLARIS; @@ -423,9 +423,9 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/li diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml --- rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/features/org.eclipse.equinox.executable.feature/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -127,8 +127,8 @@ +@@ -123,8 +123,8 @@ <copy todir="bin" verbose="true" includeEmptyDirs="false" failonerror="true"> - <fileset dir="${rt.equinox.binaries.loc}/rt.equinox.binaries/org.eclipse.equinox.executable/bin/"> + <fileset dir="${rt.equinox.binaries.loc}/org.eclipse.equinox.executable/bin/"> <include name="cocoa/macosx/x86_64/**/*"/> - <include name="gtk/linux/ppc64le/**/*"/> - <include name="gtk/linux/x86_64/**/*"/> @@ -546,7 +546,7 @@ diff -ru rt.equinox.framework/features/org.eclipse.equinox.executable.feature/re diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml --- rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 +++ rt.equinox.framework/pom.xml 0000-00-00 00:00:00.000000000 +0000 -@@ -50,27 +50,27 @@ +@@ -54,27 +54,27 @@ </repositories> </profile> <profile> @@ -580,7 +580,7 @@ diff -ru rt.equinox.framework/pom.xml rt.equinox.framework/pom.xml </modules> </profile> </profiles> -@@ -84,8 +84,8 @@ +@@ -88,8 +88,8 @@ <module>bundles/org.eclipse.equinox.launcher</module> <module>bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64</module> |