From 9f8aee979aac3b92b4ce44c4201e5ef799355b3d Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Mon, 4 Nov 2019 14:34:21 +0100 Subject: [PATCH] [eclipse/xtext#1573] Ensure that all plugins do have a ManifestBuilder --- gradle/eclipse-project-layout.gradle | 6 +++ org.eclipse.xtext.ide.tests/.project | 13 ++++- org.eclipse.xtext.ide/.project | 13 ++++- org.eclipse.xtext.testing/.project | 13 ++++- .../META-INF/MANIFEST.MF | 3 ++ org.eclipse.xtext.testlanguages.ide/.project | 13 ++++- .../META-INF/MANIFEST.MF | 11 ++-- org.eclipse.xtext.testlanguages/.project | 13 ++++- .../META-INF/MANIFEST.MF | 54 ++++++++++--------- org.eclipse.xtext.tests/.project | 13 ++++- org.eclipse.xtext.util/.project | 13 ++++- org.eclipse.xtext.xtext.generator/.project | 13 ++++- org.eclipse.xtext.xtext.ide/.project | 13 ++++- org.eclipse.xtext.xtext.wizard/.project | 13 ++++- .../META-INF/MANIFEST.MF | 5 +- org.eclipse.xtext/.project | 13 ++++- 16 files changed, 178 insertions(+), 44 deletions(-) diff --git a/gradle/eclipse-project-layout.gradle b/gradle/eclipse-project-layout.gradle index 9695d3bd2..6cb09db55 100644 --- a/gradle/eclipse-project-layout.gradle +++ b/gradle/eclipse-project-layout.gradle @@ -5,6 +5,7 @@ import org.apache.tools.ant.filters.* */ def isTestProject = name.endsWith('tests') +def isPlugin = new File("$projectDir/META-INF/MANIFEST.MF").exists() def sourceDirs = ['src', 'src-gen', 'emf-gen'] sourceSets { @@ -120,5 +121,10 @@ eclipse { project { natures 'org.eclipse.xtext.ui.shared.xtextNature' buildCommands.add(0,new org.gradle.plugins.ide.eclipse.model.BuildCommand('org.eclipse.xtext.ui.shared.xtextBuilder')) + if (isPlugin) { + natures 'org.eclipse.pde.PluginNature' + buildCommands.add(new org.gradle.plugins.ide.eclipse.model.BuildCommand('org.eclipse.pde.ManifestBuilder')) + buildCommands.add(new org.gradle.plugins.ide.eclipse.model.BuildCommand('org.eclipse.pde.SchemaBuilder')) + } } } diff --git a/org.eclipse.xtext.ide.tests/.project b/org.eclipse.xtext.ide.tests/.project index 189d0c567..952105dce 100644 --- a/org.eclipse.xtext.ide.tests/.project +++ b/org.eclipse.xtext.ide.tests/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.ide/.project b/org.eclipse.xtext.ide/.project index 19a65ecb5..3f5500ae5 100644 --- a/org.eclipse.xtext.ide/.project +++ b/org.eclipse.xtext.ide/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.testing/.project b/org.eclipse.xtext.testing/.project index c3ecece48..cbcc5a4a2 100644 --- a/org.eclipse.xtext.testing/.project +++ b/org.eclipse.xtext.testing/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF index 544976f05..470ba1aff 100644 --- a/org.eclipse.xtext.testing/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testing/META-INF/MANIFEST.MF @@ -10,10 +10,13 @@ Export-Package: org.eclipse.xtext.testing, org.eclipse.xtext.testing.builder, org.eclipse.xtext.testing.extensions, org.eclipse.xtext.testing.formatter, + org.eclipse.xtext.testing.internal;x-internal:=true, org.eclipse.xtext.testing.logging, org.eclipse.xtext.testing.serializer, org.eclipse.xtext.testing.smoketest, + org.eclipse.xtext.testing.smoketest.internal;x-internal:=true, org.eclipse.xtext.testing.smoketest.processors, + org.eclipse.xtext.testing.tests;x-internal:=true, org.eclipse.xtext.testing.util, org.eclipse.xtext.testing.validation Require-Bundle: org.eclipse.xtext;visibility:=reexport, diff --git a/org.eclipse.xtext.testlanguages.ide/.project b/org.eclipse.xtext.testlanguages.ide/.project index 175d535a2..aeac7f23d 100644 --- a/org.eclipse.xtext.testlanguages.ide/.project +++ b/org.eclipse.xtext.testlanguages.ide/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF index d1b23518d..69b358bbb 100644 --- a/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 2.20.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: Eclipse Xtext Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr, +Export-Package: org.eclipse.xtext.testlanguages.backtracking.ide;x-internal:=true, + org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr, org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr.internal, org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.antlr.lexer, org.eclipse.xtext.testlanguages.fileAware.ide, @@ -14,13 +15,15 @@ Export-Package: org.eclipse.xtext.testlanguages.backtracking.ide.contentassist.a org.eclipse.xtext.testlanguages.fileAware.ide.contentassist.antlr.internal, org.eclipse.xtext.testlanguages.fileAware.ide.refactoring, org.eclipse.xtext.testlanguages.fileAware.ide.tests, + org.eclipse.xtext.testlanguages.nestedRefs.ide;x-internal:=true, + org.eclipse.xtext.testlanguages.nestedRefs.ide.contentassist.antlr, + org.eclipse.xtext.testlanguages.nestedRefs.ide.contentassist.antlr.internal, + org.eclipse.xtext.testlanguages.noJdt.ide;x-internal:=true, org.eclipse.xtext.testlanguages.noJdt.ide.contentassist.antlr, org.eclipse.xtext.testlanguages.noJdt.ide.contentassist.antlr.internal, org.eclipse.xtext.testlanguages.xtextgrammar.ide;x-friends:="org.eclipse.xtext.ide.tests", org.eclipse.xtext.testlanguages.xtextgrammar.ide.contentassist.antlr, - org.eclipse.xtext.testlanguages.xtextgrammar.ide.contentassist.antlr.internal, - org.eclipse.xtext.testlanguages.nestedRefs.ide.contentassist.antlr.internal, - org.eclipse.xtext.testlanguages.nestedRefs.ide.contentassist.antlr + org.eclipse.xtext.testlanguages.xtextgrammar.ide.contentassist.antlr.internal Require-Bundle: org.eclipse.xtext.ide;visibility:=reexport, org.eclipse.xtext.testlanguages, org.eclipse.xtext.testing, diff --git a/org.eclipse.xtext.testlanguages/.project b/org.eclipse.xtext.testlanguages/.project index 8ea51f710..d1ad1baf9 100644 --- a/org.eclipse.xtext.testlanguages/.project +++ b/org.eclipse.xtext.testlanguages/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF index 7da2160e9..42d23ada5 100644 --- a/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF @@ -26,7 +26,8 @@ Import-Package: org.apache.log4j;version="1.2.15", org.junit.runners;version="4.12.0", org.junit.runners.model;version="4.12.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.xtext.testlanguages.backtracking, +Export-Package: org.eclipse.xtext.testlanguages;x-internal:=true, + org.eclipse.xtext.testlanguages.backtracking, org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage, org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.impl, org.eclipse.xtext.testlanguages.backtracking.beeLangTestLanguage.util, @@ -40,6 +41,31 @@ Export-Package: org.eclipse.xtext.testlanguages.backtracking, org.eclipse.xtext.testlanguages.backtracking.services, org.eclipse.xtext.testlanguages.backtracking.validation, org.eclipse.xtext.testlanguages.ecore, + org.eclipse.xtext.testlanguages.fileAware, + org.eclipse.xtext.testlanguages.fileAware.fileAware, + org.eclipse.xtext.testlanguages.fileAware.fileAware.impl, + org.eclipse.xtext.testlanguages.fileAware.fileAware.util, + org.eclipse.xtext.testlanguages.fileAware.formatting2, + org.eclipse.xtext.testlanguages.fileAware.generator, + org.eclipse.xtext.testlanguages.fileAware.parser.antlr, + org.eclipse.xtext.testlanguages.fileAware.parser.antlr.internal, + org.eclipse.xtext.testlanguages.fileAware.scoping, + org.eclipse.xtext.testlanguages.fileAware.serializer, + org.eclipse.xtext.testlanguages.fileAware.services, + org.eclipse.xtext.testlanguages.fileAware.tests;x-internal=true, + org.eclipse.xtext.testlanguages.fileAware.validation, + org.eclipse.xtext.testlanguages.fragments;x-internal:=true, + org.eclipse.xtext.testlanguages.nestedRefs, + org.eclipse.xtext.testlanguages.nestedRefs.generator, + org.eclipse.xtext.testlanguages.nestedRefs.nestedRefs, + org.eclipse.xtext.testlanguages.nestedRefs.nestedRefs.impl, + org.eclipse.xtext.testlanguages.nestedRefs.nestedRefs.util, + org.eclipse.xtext.testlanguages.nestedRefs.parser.antlr, + org.eclipse.xtext.testlanguages.nestedRefs.parser.antlr.internal, + org.eclipse.xtext.testlanguages.nestedRefs.scoping, + org.eclipse.xtext.testlanguages.nestedRefs.serializer, + org.eclipse.xtext.testlanguages.nestedRefs.services, + org.eclipse.xtext.testlanguages.nestedRefs.validation, org.eclipse.xtext.testlanguages.noJdt, org.eclipse.xtext.testlanguages.noJdt.formatting2, org.eclipse.xtext.testlanguages.noJdt.generator, @@ -62,29 +88,5 @@ Export-Package: org.eclipse.xtext.testlanguages.backtracking, org.eclipse.xtext.testlanguages.xtextgrammar.validation, org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest, org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.impl, - org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.util, - org.eclipse.xtext.testlanguages.fileAware.serializer, - org.eclipse.xtext.testlanguages.fileAware.fileAware, - org.eclipse.xtext.testlanguages.fileAware.parser.antlr, - org.eclipse.xtext.testlanguages.fileAware.formatting2, - org.eclipse.xtext.testlanguages.fileAware.fileAware.impl, - org.eclipse.xtext.testlanguages.fileAware.services, - org.eclipse.xtext.testlanguages.fileAware.fileAware.util, - org.eclipse.xtext.testlanguages.fileAware.parser.antlr.internal, - org.eclipse.xtext.testlanguages.fileAware.validation, - org.eclipse.xtext.testlanguages.fileAware.scoping, - org.eclipse.xtext.testlanguages.fileAware, - org.eclipse.xtext.testlanguages.fileAware.generator, - org.eclipse.xtext.testlanguages.fileAware.tests;x-internal=true, - org.eclipse.xtext.testlanguages.nestedRefs, - org.eclipse.xtext.testlanguages.nestedRefs.nestedRefs, - org.eclipse.xtext.testlanguages.nestedRefs.scoping, - org.eclipse.xtext.testlanguages.nestedRefs.generator, - org.eclipse.xtext.testlanguages.nestedRefs.services, - org.eclipse.xtext.testlanguages.nestedRefs.parser.antlr, - org.eclipse.xtext.testlanguages.nestedRefs.parser.antlr.internal, - org.eclipse.xtext.testlanguages.nestedRefs.validation, - org.eclipse.xtext.testlanguages.nestedRefs.serializer, - org.eclipse.xtext.testlanguages.nestedRefs.nestedRefs.util, - org.eclipse.xtext.testlanguages.nestedRefs.nestedRefs.impl + org.eclipse.xtext.testlanguages.xtextgrammar.xtextGrammarTest.util Automatic-Module-Name: org.eclipse.xtext.testlanguages diff --git a/org.eclipse.xtext.tests/.project b/org.eclipse.xtext.tests/.project index f42e37da1..0c5e6f295 100644 --- a/org.eclipse.xtext.tests/.project +++ b/org.eclipse.xtext.tests/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.util/.project b/org.eclipse.xtext.util/.project index 92f779a2d..bd67aaf55 100644 --- a/org.eclipse.xtext.util/.project +++ b/org.eclipse.xtext.util/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.xtext.generator/.project b/org.eclipse.xtext.xtext.generator/.project index a6e80ff8d..9cbb5dc28 100644 --- a/org.eclipse.xtext.xtext.generator/.project +++ b/org.eclipse.xtext.xtext.generator/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.xtext.ide/.project b/org.eclipse.xtext.xtext.ide/.project index c07c6d084..a3899cc38 100644 --- a/org.eclipse.xtext.xtext.ide/.project +++ b/org.eclipse.xtext.xtext.ide/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.xtext.wizard/.project b/org.eclipse.xtext.xtext.wizard/.project index cf0f054bf..063b94004 100644 --- a/org.eclipse.xtext.xtext.wizard/.project +++ b/org.eclipse.xtext.xtext.wizard/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature diff --git a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF index 55dd78978..9a6ba3caf 100644 --- a/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.xtext.wizard/META-INF/MANIFEST.MF @@ -5,9 +5,8 @@ Bundle-SymbolicName: org.eclipse.xtext.xtext.wizard Bundle-Version: 2.20.0.qualifier Bundle-Vendor: Eclipse Xtext Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.xtext.xtext.wizard;x-friends:="org.eclipse.xtext.tests, - org.eclipse.xtext.xtext.ui, - org.eclipse.xtext.xtext.ui.tests", +Export-Package: gradlew;x-internal:=true, + org.eclipse.xtext.xtext.wizard;x-friends:="org.eclipse.xtext.tests,org.eclipse.xtext.xtext.ui,org.eclipse.xtext.xtext.ui.tests", org.eclipse.xtext.xtext.wizard.cli;x-friends:="org.eclipse.xtext.tests", org.eclipse.xtext.xtext.wizard.ecore2xtext;x-friends:="org.eclipse.xtext.xtext.ui,org.eclipse.xtext.xtext.ui.tests" Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.20.0", diff --git a/org.eclipse.xtext/.project b/org.eclipse.xtext/.project index e30585a4c..89a3a61f6 100644 --- a/org.eclipse.xtext/.project +++ b/org.eclipse.xtext/.project @@ -15,6 +15,16 @@ + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + org.eclipse.buildship.core.gradleprojectbuilder @@ -22,8 +32,9 @@ - org.eclipse.buildship.core.gradleprojectnature org.eclipse.jdt.core.javanature org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.pde.PluginNature + org.eclipse.buildship.core.gradleprojectnature