From 33c8642f88ff77cc7a075266bb3d1c6a652b38f4 Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Fri, 9 May 2014 08:55:39 -0500 Subject: Bug 421439 - remove unsupported platforms from delta pack Change-Id: I38e838e8e42653ced775b5f838a535aad5dbfc23 Signed-off-by: Thomas Watson --- .../macosx/ppc/Eclipse.app/Contents/Info.plist | 73 --------------------- .../macosx/x86/Eclipse.app/Contents/Info.plist | 73 --------------------- .../macosx/ppc/Eclipse.app/Contents/Info.plist | 73 --------------------- .../bin/motif/linux/x86/libXm.so.2 | Bin 1915756 -> 0 bytes .../build.properties | 12 ++-- .../forceQualifierUpdate.txt | 1 + .../org.eclipse.equinox.executable.feature/pom.xml | 35 +++++----- .../resources/build.properties | 4 +- 8 files changed, 25 insertions(+), 246 deletions(-) delete mode 100644 features/org.eclipse.equinox.executable.feature/bin/carbon/macosx/ppc/Eclipse.app/Contents/Info.plist delete mode 100644 features/org.eclipse.equinox.executable.feature/bin/carbon/macosx/x86/Eclipse.app/Contents/Info.plist delete mode 100644 features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/ppc/Eclipse.app/Contents/Info.plist delete mode 100644 features/org.eclipse.equinox.executable.feature/bin/motif/linux/x86/libXm.so.2 diff --git a/features/org.eclipse.equinox.executable.feature/bin/carbon/macosx/ppc/Eclipse.app/Contents/Info.plist b/features/org.eclipse.equinox.executable.feature/bin/carbon/macosx/ppc/Eclipse.app/Contents/Info.plist deleted file mode 100644 index e784368f7..000000000 --- a/features/org.eclipse.equinox.executable.feature/bin/carbon/macosx/ppc/Eclipse.app/Contents/Info.plist +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - CFBundleExecutable - eclipse - CFBundleGetInfoString - Eclipse 3.8 for Mac OS X, Copyright IBM Corp. and others 2002, 2011. All rights reserved. - CFBundleIconFile - Eclipse.icns - CFBundleIdentifier - org.eclipse.eclipse - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Eclipse - CFBundlePackageType - APPL - CFBundleShortVersionString - 3.8 - CFBundleSignature - ???? - CFBundleVersion - 3.8 - CFBundleDevelopmentRegion - English - CFBundleLocalizations - - ar - cs - da - el - en - es - de - fi - fr - hu - it - iw - ja - ko - nl - no - pl - pt_BR - pt - ru - sv - tr - zh_HK - zh_TW - zh - - - Eclipse - - - -keyring~/.eclipse_keyring - -showlocation - - - - - diff --git a/features/org.eclipse.equinox.executable.feature/bin/carbon/macosx/x86/Eclipse.app/Contents/Info.plist b/features/org.eclipse.equinox.executable.feature/bin/carbon/macosx/x86/Eclipse.app/Contents/Info.plist deleted file mode 100644 index b55548fb3..000000000 --- a/features/org.eclipse.equinox.executable.feature/bin/carbon/macosx/x86/Eclipse.app/Contents/Info.plist +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - CFBundleExecutable - eclipse - CFBundleGetInfoString - Eclipse 3.8 for Mac OS X, Copyright IBM Corp. and others 2002, 2011. All rights reserved. - CFBundleIconFile - Eclipse.icns - CFBundleIdentifier - org.eclipse.eclipse - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Eclipse - CFBundlePackageType - APPL - CFBundleShortVersionString - 3.8 - CFBundleSignature - ???? - CFBundleVersion - 3.8 - CFBundleDevelopmentRegion - English - CFBundleLocalizations - - ar - cs - da - el - en - es - de - fi - fr - hu - it - iw - ja - ko - nl - no - pl - pt_BR - pt - ru - sv - tr - zh_HK - zh_TW - zh - - - Eclipse - - - -keyring~/.eclipse_keyring - -showlocation - - - - - diff --git a/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/ppc/Eclipse.app/Contents/Info.plist b/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/ppc/Eclipse.app/Contents/Info.plist deleted file mode 100644 index e784368f7..000000000 --- a/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/ppc/Eclipse.app/Contents/Info.plist +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - CFBundleExecutable - eclipse - CFBundleGetInfoString - Eclipse 3.8 for Mac OS X, Copyright IBM Corp. and others 2002, 2011. All rights reserved. - CFBundleIconFile - Eclipse.icns - CFBundleIdentifier - org.eclipse.eclipse - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Eclipse - CFBundlePackageType - APPL - CFBundleShortVersionString - 3.8 - CFBundleSignature - ???? - CFBundleVersion - 3.8 - CFBundleDevelopmentRegion - English - CFBundleLocalizations - - ar - cs - da - el - en - es - de - fi - fr - hu - it - iw - ja - ko - nl - no - pl - pt_BR - pt - ru - sv - tr - zh_HK - zh_TW - zh - - - Eclipse - - - -keyring~/.eclipse_keyring - -showlocation - - - - - diff --git a/features/org.eclipse.equinox.executable.feature/bin/motif/linux/x86/libXm.so.2 b/features/org.eclipse.equinox.executable.feature/bin/motif/linux/x86/libXm.so.2 deleted file mode 100644 index dc827a974..000000000 Binary files a/features/org.eclipse.equinox.executable.feature/bin/motif/linux/x86/libXm.so.2 and /dev/null differ diff --git a/features/org.eclipse.equinox.executable.feature/build.properties b/features/org.eclipse.equinox.executable.feature/build.properties index 841e3078a..08cd96991 100644 --- a/features/org.eclipse.equinox.executable.feature/build.properties +++ b/features/org.eclipse.equinox.executable.feature/build.properties @@ -13,16 +13,14 @@ bin.includes = bin/,\ feature.xml,\ feature.properties,\ - gtk_root/,\ - motif_root/,\ - contributed/ + gtk_root/ ####Even though marked as custom, the content of the build.properties needs to be updated to ensure correctness of RCP app exported #root.permissions.755=${launcherName} -root.win32.win32.x86=file:bin/win32/win32/x86/launcher.exe +root.win32.win32.x86=bin/win32/win32/x86 root.win32.win32.x86.permissions.755=launcher.exe -root.win32.win32.x86_64=file:bin/win32/win32/x86_64/launcher.exe +root.win32.win32.x86_64=bin/win32/win32/x86_64 root.win32.win32.x86_64.permissions.755=launcher.exe root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root @@ -56,9 +54,9 @@ root.solaris.gtk.sparc.permissions.755=launcher root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so -root.linux.gtk.s390x=contributed/gtk/linux/s390x,gtk_root +root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root root.linux.gtk.s390x.permissions.755=launcher -root.linux.gtk.s390=contributed/gtk/linux/s390,gtk_root +root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root root.linux.gtk.s390.permissions.755=launcher diff --git a/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt index f80e66f70..673b7b880 100644 --- a/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt +++ b/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt @@ -1,3 +1,4 @@ # To force a version qualifier update add the bug here Bug 403352 - Update all parent versions to match our build stream Bug 407109 - Launcher executable is missing from s390/s390x builds +Bug 421439 - remove unsupported platforms from delta pack diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml index 414be1b21..156de22e8 100644 --- a/features/org.eclipse.equinox.executable.feature/pom.xml +++ b/features/org.eclipse.equinox.executable.feature/pom.xml @@ -331,34 +331,33 @@ - + + - + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - diff --git a/features/org.eclipse.equinox.executable.feature/resources/build.properties b/features/org.eclipse.equinox.executable.feature/resources/build.properties index 0f30a876d..a224ffa4e 100644 --- a/features/org.eclipse.equinox.executable.feature/resources/build.properties +++ b/features/org.eclipse.equinox.executable.feature/resources/build.properties @@ -50,8 +50,8 @@ root.solaris.gtk.sparc.permissions.755=launcher root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root root.linux.gtk.x86_64.permissions.755=libcairo-swt.so -root.linux.gtk.s390x=contributed/gtk/linux/s390x,gtk_root +root.linux.gtk.s390x=bin/gtk/linux/s390x,gtk_root root.linux.gtk.s390x.permissions.755=launcher -root.linux.gtk.s390=contributed/gtk/linux/s390,gtk_root +root.linux.gtk.s390=bin/gtk/linux/s390,gtk_root root.linux.gtk.s390.permissions.755=launcher -- cgit v1.2.3