mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 14:42:11 +02:00
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>
This commit is contained in:
parent
523a74a56c
commit
1333d6b53a
4 changed files with 15 additions and 16 deletions
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" path="src"/>
|
<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.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="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
<classpathentry kind="src" path="src"/>
|
||||||
<classpathentry kind="output" path="bin"/>
|
<classpathentry kind="output" path="bin"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
#Mon Oct 17 17:36:13 PDT 2011
|
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
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.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.lineNumber=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||||
org.eclipse.jdt.core.compiler.debug.sourceFile=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.unusedPrivateMember=warning
|
||||||
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
|
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
|
||||||
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=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.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_allocation_expression=16
|
||||||
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
|
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
|
||||||
|
|
|
@ -6,10 +6,10 @@ Bundle-Version: 5.7.0.qualifier
|
||||||
Bundle-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin
|
Bundle-Activator: org.eclipse.cdt.internal.core.natives.CNativePlugin
|
||||||
Bundle-Vendor: %providerName
|
Bundle-Vendor: %providerName
|
||||||
Bundle-Localization: plugin
|
Bundle-Localization: plugin
|
||||||
Export-Package: org.eclipse.cdt.core;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;org.eclipse.cdt.core.native=split;mandatory=org.eclipse.cdt.core.native,
|
org.eclipse.cdt.utils;native=split;mandatory:=native,
|
||||||
org.eclipse.cdt.utils.pty;version="5.7",
|
org.eclipse.cdt.utils.pty;version="5.7",
|
||||||
org.eclipse.cdt.utils.spawner;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)"
|
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)"
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
|
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||||
|
|
|
@ -6,7 +6,7 @@ Bundle-Version: 5.7.0.qualifier
|
||||||
Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
|
Bundle-Activator: org.eclipse.cdt.core.CCorePlugin
|
||||||
Bundle-Vendor: %providerName
|
Bundle-Vendor: %providerName
|
||||||
Bundle-Localization: plugin
|
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.browser,
|
||||||
org.eclipse.cdt.core.cdtvariables,
|
org.eclipse.cdt.core.cdtvariables,
|
||||||
org.eclipse.cdt.core.dom,
|
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;x-friends:="org.eclipse.cdt.ui",
|
||||||
org.eclipse.cdt.internal.formatter.align;x-internal:=true,
|
org.eclipse.cdt.internal.formatter.align;x-internal:=true,
|
||||||
org.eclipse.cdt.internal.formatter.scanner;x-friends:="org.eclipse.cdt.ui",
|
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.cdtvariables,
|
||||||
org.eclipse.cdt.utils.coff,
|
org.eclipse.cdt.utils.coff,
|
||||||
org.eclipse.cdt.utils.coff.parser,
|
org.eclipse.cdt.utils.coff.parser,
|
||||||
|
|
Loading…
Add table
Reference in a new issue