mirror of
https://github.com/sigmasternchen/xtext-core
synced 2025-03-15 08:18:55 +00:00
[eclipse/xtext#1152] Java 9 - Added Automatic-Module-Name header
- added header to existing manifest files - added header to manifest generation in xtext generator and wizard Signed-off-by: Florian Stolte <fstolte@itemis.de>
This commit is contained in:
parent
94a90a486c
commit
1bc930b5b6
46 changed files with 57 additions and 0 deletions
|
@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
|
|||
org.eclipse.xtext.testlanguages,
|
||||
org.eclipse.xtext.testlanguages.ide
|
||||
Import-Package: org.apache.log4j;version="1.2.15"
|
||||
Automatic-Module-Name: org.eclipse.xtext.ide.tests
|
||||
|
|
|
@ -49,3 +49,4 @@ Export-Package: org.eclipse.xtext.ide;x-friends:="org.eclipse.xtend.ide",
|
|||
org.eclipse.xtext.ide.server.signatureHelp,
|
||||
org.eclipse.xtext.ide.server.symbol,
|
||||
org.eclipse.xtext.ide.util
|
||||
Automatic-Module-Name: org.eclipse.xtext.ide
|
||||
|
|
|
@ -24,3 +24,4 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
|
|||
Import-Package: org.apache.log4j;version="1.2.15",
|
||||
org.apache.log4j.spi;version="1.2.15"
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Automatic-Module-Name: org.eclipse.xtext.testing
|
||||
|
|
|
@ -23,3 +23,4 @@ Require-Bundle: org.eclipse.xtext.ide;visibility:=reexport,
|
|||
org.antlr.runtime,
|
||||
org.eclipse.xtend.lib;bundle-version="2.14.0"
|
||||
|
||||
Automatic-Module-Name: org.eclipse.xtext.testlanguages.ide
|
||||
|
|
|
@ -77,3 +77,4 @@ Export-Package: org.eclipse.xtext.testlanguages.backtracking,
|
|||
org.eclipse.xtext.testlanguages.fileAware.generator,
|
||||
org.eclipse.xtext.testlanguages.fileAware.tests;x-internal=true
|
||||
|
||||
Automatic-Module-Name: org.eclipse.xtext.testlanguages
|
||||
|
|
|
@ -610,3 +610,4 @@ Export-Package: org.eclipse.xtext,
|
|||
org.eclipse.xtext.xtextTest,
|
||||
org.eclipse.xtext.xtextTest.impl,
|
||||
org.eclipse.xtext.xtextTest.util
|
||||
Automatic-Module-Name: org.eclipse.xtext.tests
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.eclipsePlugin,
|
|||
org.eclipse.xtext.ide,
|
||||
org.eclipse.xtext.xbase.ide
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePlugin.ide
|
||||
|
|
|
@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.eclipsePlugin,
|
|||
org.eclipse.xtext.testing,
|
||||
org.eclipse.xtext.xbase.testing
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePlugin.tests
|
||||
|
|
|
@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.eclipsePlugin.ui,
|
|||
org.eclipse.xtext.junit4,
|
||||
org.eclipse.xtext.xbase.junit
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePlugin.ui.tests
|
||||
|
|
|
@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.eclipsePlugin,
|
|||
org.eclipse.ui.ide;bundle-version="3.5.0"
|
||||
Import-Package: org.apache.log4j
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePlugin.ui
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
|
|||
org.eclipse.xtext.xbase,
|
||||
org.eclipse.equinox.common;bundle-version="3.5.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePlugin
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.eclipsePluginP2,
|
|||
org.eclipse.xtext.ide,
|
||||
org.eclipse.xtext.xbase.ide
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePluginP2.ide
|
||||
|
|
|
@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.eclipsePluginP2,
|
|||
org.eclipse.xtext.testing,
|
||||
org.eclipse.xtext.xbase.testing
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePluginP2.tests
|
||||
|
|
|
@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.eclipsePluginP2.ui,
|
|||
org.eclipse.xtext.junit4,
|
||||
org.eclipse.xtext.xbase.junit
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePluginP2.ui.tests
|
||||
|
|
|
@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.eclipsePluginP2,
|
|||
org.eclipse.ui.ide;bundle-version="3.5.0"
|
||||
Import-Package: org.apache.log4j
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePluginP2.ui
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
|
|||
org.eclipse.xtext.xbase,
|
||||
org.eclipse.equinox.common;bundle-version="3.5.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.eclipsePluginP2
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.full,
|
|||
org.eclipse.xtext.ide,
|
||||
org.eclipse.xtext.xbase.ide
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.full.ide
|
||||
|
|
|
@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.full,
|
|||
org.eclipse.xtext.testing,
|
||||
org.eclipse.xtext.xbase.testing
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.full.tests
|
||||
|
|
|
@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.full.ui,
|
|||
org.eclipse.xtext.junit4,
|
||||
org.eclipse.xtext.xbase.junit
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.full.ui.tests
|
||||
|
|
|
@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.full,
|
|||
org.eclipse.ui.ide;bundle-version="3.5.0"
|
||||
Import-Package: org.apache.log4j
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.full.ui
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
|
|||
org.eclipse.xtext.xbase,
|
||||
org.eclipse.equinox.common;bundle-version="3.5.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.full
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.lsMavenTychoApp,
|
|||
org.eclipse.xtext.ide,
|
||||
org.eclipse.xtext.xbase.ide
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.lsMavenTychoApp.ide
|
||||
|
|
|
@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.lsMavenTychoApp,
|
|||
org.eclipse.ui.ide;bundle-version="3.5.0"
|
||||
Import-Package: org.apache.log4j
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.lsMavenTychoApp.ui
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
|
|||
org.eclipse.xtext.xbase,
|
||||
org.eclipse.equinox.common;bundle-version="3.5.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.lsMavenTychoApp
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.lsMavenTychoFatjar,
|
|||
org.eclipse.xtext.ide,
|
||||
org.eclipse.xtext.xbase.ide
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.lsMavenTychoFatjar.ide
|
||||
|
|
|
@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.lsMavenTychoFatjar,
|
|||
org.eclipse.ui.ide;bundle-version="3.5.0"
|
||||
Import-Package: org.apache.log4j
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.lsMavenTychoFatjar.ui
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
|
|||
org.eclipse.xtext.xbase,
|
||||
org.eclipse.equinox.common;bundle-version="3.5.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.lsMavenTychoFatjar
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.mavenTycho,
|
|||
org.eclipse.xtext.ide,
|
||||
org.eclipse.xtext.xbase.ide
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTycho.ide
|
||||
|
|
|
@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.mavenTycho,
|
|||
org.eclipse.xtext.testing,
|
||||
org.eclipse.xtext.xbase.testing
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTycho.tests
|
||||
|
|
|
@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.mavenTycho.ui,
|
|||
org.eclipse.xtext.junit4,
|
||||
org.eclipse.xtext.xbase.junit
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTycho.ui.tests
|
||||
|
|
|
@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.mavenTycho,
|
|||
org.eclipse.ui.ide;bundle-version="3.5.0"
|
||||
Import-Package: org.apache.log4j
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTycho.ui
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
|
|||
org.eclipse.xtext.xbase,
|
||||
org.eclipse.equinox.common;bundle-version="3.5.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTycho
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.xtext.example.mavenTychoP2,
|
|||
org.eclipse.xtext.ide,
|
||||
org.eclipse.xtext.xbase.ide
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTychoP2.ide
|
||||
|
|
|
@ -10,3 +10,4 @@ Require-Bundle: org.xtext.example.mavenTychoP2,
|
|||
org.eclipse.xtext.testing,
|
||||
org.eclipse.xtext.xbase.testing
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTychoP2.tests
|
||||
|
|
|
@ -12,3 +12,4 @@ Require-Bundle: org.xtext.example.mavenTychoP2.ui,
|
|||
org.eclipse.xtext.junit4,
|
||||
org.eclipse.xtext.xbase.junit
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTychoP2.ui.tests
|
||||
|
|
|
@ -14,3 +14,4 @@ Require-Bundle: org.xtext.example.mavenTychoP2,
|
|||
org.eclipse.ui.ide;bundle-version="3.5.0"
|
||||
Import-Package: org.apache.log4j
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTychoP2.ui
|
||||
|
|
|
@ -9,3 +9,4 @@ Require-Bundle: org.eclipse.xtext,
|
|||
org.eclipse.xtext.xbase,
|
||||
org.eclipse.equinox.common;bundle-version="3.5.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
|
||||
Automatic-Module-Name: org.xtext.example.mavenTychoP2
|
||||
|
|
|
@ -25,3 +25,4 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.10.2",
|
|||
javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
|
||||
org.eclipse.xtend.lib
|
||||
Import-Package: org.apache.log4j;version="1.2.15"
|
||||
Automatic-Module-Name: org.eclipse.xtext.util
|
||||
|
|
|
@ -63,3 +63,4 @@ Export-Package: org.eclipse.xtext.xtext.generator,
|
|||
org.eclipse.xtext.xtext.generator.validation;x-internal:=true,
|
||||
org.eclipse.xtext.xtext.generator.web;x-internal:=true,
|
||||
org.eclipse.xtext.xtext.generator.xbase;x-internal:=true
|
||||
Automatic-Module-Name: org.eclipse.xtext.xtext.generator
|
||||
|
|
|
@ -124,6 +124,7 @@ class ManifestAccess extends TextFileAccess implements IGuiceAwareGeneratorCompo
|
|||
«IF activator !== null»
|
||||
Bundle-Activator: «activator»
|
||||
«ENDIF»
|
||||
Automatic-Module-Name: «symbolicName ?: bundleName»
|
||||
'''
|
||||
|
||||
override void writeTo(IFileSystemAccess2 fileSystemAccess) {
|
||||
|
|
|
@ -244,6 +244,15 @@ public class ManifestAccess extends TextFileAccess implements IGuiceAwareGenerat
|
|||
_builder.newLineIfNotEmpty();
|
||||
}
|
||||
}
|
||||
_builder.append("Automatic-Module-Name: ");
|
||||
String _elvis_1 = null;
|
||||
if (this.symbolicName != null) {
|
||||
_elvis_1 = this.symbolicName;
|
||||
} else {
|
||||
_elvis_1 = this.bundleName;
|
||||
}
|
||||
_builder.append(_elvis_1);
|
||||
_builder.newLineIfNotEmpty();
|
||||
return _builder;
|
||||
}
|
||||
|
||||
|
|
|
@ -11,3 +11,4 @@ Import-Package: org.apache.log4j;version="1.2.15"
|
|||
Export-Package: org.eclipse.xtext.xtext.ide;x-friends:="org.eclipse.xtext.xtext.ui",
|
||||
org.eclipse.xtext.xtext.ide.contentassist.antlr;x-friends:="org.eclipse.xtext.xtext.ui",
|
||||
org.eclipse.xtext.xtext.ide.contentassist.antlr.internal;x-friends:="org.eclipse.xtext.xtext.ui"
|
||||
Automatic-Module-Name: org.eclipse.xtext.xtext.ide
|
||||
|
|
|
@ -12,3 +12,4 @@ Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
|
|||
org.eclipse.xtend.lib;resolution:=optional,
|
||||
org.eclipse.xtext.util,
|
||||
org.eclipse.emf.ecore;bundle-version="2.10.2"
|
||||
Automatic-Module-Name: org.eclipse.xtext.xtext.wizard
|
||||
|
|
|
@ -114,6 +114,7 @@ abstract class ProjectDescriptor {
|
|||
«manifestEntry("Require-Bundle", requiredBundles)»
|
||||
«manifestEntry("Import-Package", importedPackages)»
|
||||
Bundle-RequiredExecutionEnvironment: «bree»
|
||||
Automatic-Module-Name: «name»
|
||||
'''
|
||||
|
||||
|
||||
|
|
|
@ -210,6 +210,10 @@ public abstract class ProjectDescriptor {
|
|||
String _bree = this.getBree();
|
||||
_builder.append(_bree);
|
||||
_builder.newLineIfNotEmpty();
|
||||
_builder.append("Automatic-Module-Name: ");
|
||||
String _name_2 = this.getName();
|
||||
_builder.append(_name_2);
|
||||
_builder.newLineIfNotEmpty();
|
||||
return _builder.toString();
|
||||
}
|
||||
|
||||
|
|
|
@ -107,3 +107,4 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.10.2";visibility:=re
|
|||
Import-Package: org.apache.log4j;version="1.2.15",org.osgi.framework
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Activator: org.eclipse.xtext.internal.Activator
|
||||
Automatic-Module-Name: org.eclipse.xtext
|
||||
|
|
Loading…
Reference in a new issue