From 1333d6b53a389faba66107fa03a190d31fa3fe5f Mon Sep 17 00:00:00 2001 From: Martin Oberhuber Date: Fri, 30 May 2014 14:08:41 +0200 Subject: [PATCH] Bug 303083 - Fix MANIFEST.MF split package and BREE for native plugin After studying in more detail how the org.eclipse.core.runtime / org.eclipse.equinox.common bundles deal with the split package situation, I believe that our split package declaration must be fixed in MANIFEST.MF or there is risk that an "import-package" client would be wired by OSGi against the wrong bundle. Also reduced the minimum execution environment of the native bundle to J2SE-1.5 such that it is more widely usable across a broader range of possible aadopters. Change-Id: I6dfc0c67987203810a3fd75d49a5f26bb7ee30c1 Signed-off-by: Martin Oberhuber Reviewed-on: https://git.eclipse.org/r/27581 Tested-by: Hudson CI Reviewed-by: Doug Schaefer --- core/org.eclipse.cdt.core.native/.classpath | 14 +++++++------- .../.settings/org.eclipse.jdt.core.prefs | 7 +++---- .../META-INF/MANIFEST.MF | 6 +++--- core/org.eclipse.cdt.core/META-INF/MANIFEST.MF | 4 ++-- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/core/org.eclipse.cdt.core.native/.classpath b/core/org.eclipse.cdt.core.native/.classpath index 3bc247511f0..2d1a4302f04 100644 --- a/core/org.eclipse.cdt.core.native/.classpath +++ b/core/org.eclipse.cdt.core.native/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.core.prefs index 4de53820811..0c036c2d5e5 100644 --- a/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.core.prefs +++ b/core/org.eclipse.cdt.core.native/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,8 @@ -#Mon Oct 17 17:36:13 PDT 2011 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -78,7 +77,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.7 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 diff --git a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF index 9419d11da78..3178b04001d 100644 --- a/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core.native/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-Version: 5.7.0.qualifier Bundle-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.cdt.core;org.eclipse.cdt.core.native=split;mandatory=org.eclipse.cdt.core.native, - org.eclipse.cdt.utils;org.eclipse.cdt.core.native=split;mandatory=org.eclipse.cdt.core.native, +Export-Package: org.eclipse.cdt.core;native=split;mandatory:=native, + org.eclipse.cdt.utils;native=split;mandatory:=native, org.eclipse.cdt.utils.pty;version="5.7", org.eclipse.cdt.utils.spawner;version="5.7" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF index c6eb843c1d2..a07fce70c98 100644 --- a/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.cdt.core/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 5.7.0.qualifier Bundle-Activator: org.eclipse.cdt.core.CCorePlugin Bundle-Vendor: %providerName Bundle-Localization: plugin -Export-Package: org.eclipse.cdt.core;org.eclipse.cdt.core=split;mandatory=org.eclipse.cdt.core, +Export-Package: org.eclipse.cdt.core, org.eclipse.cdt.core.browser, org.eclipse.cdt.core.cdtvariables, org.eclipse.cdt.core.dom, @@ -94,7 +94,7 @@ Export-Package: org.eclipse.cdt.core;org.eclipse.cdt.core=split;mandatory=org.ec org.eclipse.cdt.internal.formatter;x-friends:="org.eclipse.cdt.ui", org.eclipse.cdt.internal.formatter.align;x-internal:=true, org.eclipse.cdt.internal.formatter.scanner;x-friends:="org.eclipse.cdt.ui", - org.eclipse.cdt.utils;org.eclipse.cdt.core=split;mandatory=org.eclipse.cdt.core, + org.eclipse.cdt.utils, org.eclipse.cdt.utils.cdtvariables, org.eclipse.cdt.utils.coff, org.eclipse.cdt.utils.coff.parser,