diff options
| author | Martin Oberhuber | 2014-05-30 12:08:41 +0000 |
|---|---|---|
| committer | Doug Schaefer | 2014-05-30 15:48:34 +0000 |
| commit | 1333d6b53a389faba66107fa03a190d31fa3fe5f (patch) | |
| tree | ec68ab7f4990f25d83813b98bcba6b4d9f67e778 /core/org.eclipse.cdt.core.native | |
| parent | 523a74a56c7e76fc388eaa56d4a591156b7b7ed5 (diff) | |
| download | org.eclipse.cdt-1333d6b53a389faba66107fa03a190d31fa3fe5f.tar.gz org.eclipse.cdt-1333d6b53a389faba66107fa03a190d31fa3fe5f.tar.xz org.eclipse.cdt-1333d6b53a389faba66107fa03a190d31fa3fe5f.zip | |
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 <martin.oberhuber@windriver.com>
Reviewed-on: https://git.eclipse.org/r/27581
Tested-by: Hudson CI
Reviewed-by: Doug Schaefer <dschaefer@qnx.com>
Diffstat (limited to 'core/org.eclipse.cdt.core.native')
3 files changed, 13 insertions, 14 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
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 |