diff --git a/com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF
index b5feab9..4e91ae2 100644
--- a/com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF
+++ b/com.minres.rdl.parent/com.minres.rdl.ide/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl,
org.eclipse.xtext.ide,
org.eclipse.xtext.xbase.ide,
- org.antlr.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.minres.rdl.ide.contentassist.antlr.internal,
com.minres.rdl.ide.contentassist.antlr
-
diff --git a/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml b/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml
index 562185e..54fda20 100644
--- a/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml
+++ b/com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml
@@ -795,13 +795,6 @@
fragment="true"
unpack="false"/>
-
-
-
-
-
+
diff --git a/com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml b/com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml
index e24a759..1c550f2 100644
--- a/com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml
+++ b/com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml
@@ -77,7 +77,7 @@
com.minres.rdl
com.minres.rdl
- ${rdl-plugin-version}
+ ${rdl-plugin.version}
jar
false
${project.build.directory}/classes
@@ -175,7 +175,7 @@
com.minres.rdl
com.minres.rdl
- ${rdl-plugin-version}
+ ${rdl-plugin.version}
eclipse-plugin
diff --git a/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target b/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target
index d222fbc..01fc01f 100644
--- a/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target
+++ b/com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target
@@ -1,5 +1,6 @@
-
+
+
@@ -7,31 +8,32 @@
-
+
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
+
diff --git a/com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF
index 0c25f3e..0833c51 100644
--- a/com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF
+++ b/com.minres.rdl.parent/com.minres.rdl.tests/META-INF/MANIFEST.MF
@@ -7,10 +7,9 @@ Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: com.minres.rdl.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl,
- org.junit;bundle-version="4.12.0",
+ org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.minres.rdl.tests;x-internal=true
-
diff --git a/com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF
index d741c5e..7a5fe06 100644
--- a/com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF
+++ b/com.minres.rdl.parent/com.minres.rdl.ui.tests/META-INF/MANIFEST.MF
@@ -7,13 +7,12 @@ Bundle-Version: 1.0.0.qualifier
Bundle-SymbolicName: com.minres.rdl.ui.tests; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: com.minres.rdl.ui,
- org.junit;bundle-version="4.12.0",
+ org.junit.jupiter.api;bundle-version="[5.1.0,6.0.0)",
org.eclipse.xtext.testing,
org.eclipse.xtext.xbase.testing,
- org.eclipse.xtext.junit4,
org.eclipse.xtext.xbase.junit,
org.eclipse.core.runtime,
+ org.eclipse.xtext.ui.testing,
org.eclipse.ui.workbench;resolution:=optional
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.minres.rdl.ui.tests;x-internal=true
-
diff --git a/com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml b/com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml
index 369be2f..2e7abf9 100644
--- a/com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml
+++ b/com.minres.rdl.parent/com.minres.rdl.ui.tests/pom.xml
@@ -23,25 +23,7 @@
true
-
- org.eclipse.tycho
- target-platform-configuration
-
-
-
-
-
- eclipse-feature
- org.eclipse.rcp
- 0.0.0
-
-
-
-
-
+
diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF
index 60cadfb..314272e 100644
--- a/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF
+++ b/com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF
@@ -17,14 +17,14 @@ Require-Bundle: com.minres.rdl,
org.eclipse.compare,
org.eclipse.xtext.builder,
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
- org.eclipse.xtend.lib;resolution:=optional,
+ org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.ui.forms,
org.eclipse.jdt.core,
org.eclipse.pde.core
Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.minres.rdl.ui.internal,
com.minres.rdl.ui.contentassist,
com.minres.rdl.ui.quickfix,
diff --git a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/structural/ui/hyperlink/MyHyperlinkHelper.xtend b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/structural/ui/hyperlink/MyHyperlinkHelper.xtend
index ab20f90..ff233dd 100644
--- a/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/structural/ui/hyperlink/MyHyperlinkHelper.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl.ui/src/com/minres/structural/ui/hyperlink/MyHyperlinkHelper.xtend
@@ -11,6 +11,7 @@ import org.eclipse.xtext.scoping.impl.ImportUriResolver
import org.eclipse.xtext.ui.editor.hyperlinking.HyperlinkHelper
import org.eclipse.xtext.ui.editor.hyperlinking.IHyperlinkAcceptor
import org.eclipse.xtext.util.TextRegion
+import org.eclipse.jface.text.IRegion
class MyHyperlinkHelper extends HyperlinkHelper {
@@ -33,7 +34,7 @@ class MyHyperlinkHelper extends HyperlinkHelper {
val textRegion = leaf.getTextRegion();
val uri = EcoreUtil.getURI(top);
val result = hyperlinkProvider.get();
- result.setHyperlinkRegion(new Region(textRegion.getOffset(), textRegion.getLength()));
+ result.setHyperlinkRegion(new Region(textRegion.getOffset(), textRegion.getLength()) as IRegion);
result.setURI(if(uri.isPlatformResource()) uri else resource.getResourceSet().getURIConverter().normalize(uri));
result.setHyperlinkText(labelProvider.getText(top));
if(result instanceof MyXtextHyperlink) result.selectTarget=false
diff --git a/com.minres.rdl.parent/com.minres.rdl.web/pom.xml b/com.minres.rdl.parent/com.minres.rdl.web/pom.xml
index 7d2e221..1c3b14e 100644
--- a/com.minres.rdl.parent/com.minres.rdl.web/pom.xml
+++ b/com.minres.rdl.parent/com.minres.rdl.web/pom.xml
@@ -27,7 +27,7 @@
maven-war-plugin
- 3.2.0
+ 3.2.3
WebRoot
false
@@ -36,7 +36,7 @@
org.eclipse.jetty
jetty-maven-plugin
- 9.4.9.v20180320
+ 9.4.34.v20201102
WebRoot
@@ -44,7 +44,7 @@
org.codehaus.mojo
build-helper-maven-plugin
- 1.9.1
+ 3.0.0
add-source
@@ -76,7 +76,7 @@
${project.groupId}
com.minres.rdl
- ${rdl-plugin-version}
+ ${rdl-plugin.version}
${project.groupId}
@@ -101,22 +101,22 @@
org.webjars
requirejs
- 2.3.2
+ 2.3.6
org.webjars
jquery
- 2.2.4
+ 3.5.1
org.webjars
ace
- 1.2.3
+ 1.3.3
org.eclipse.jetty
jetty-annotations
- 9.4.9.v20180320
+ 9.4.34.v20201102
provided
diff --git a/com.minres.rdl.parent/com.minres.rdl/.gitignore b/com.minres.rdl.parent/com.minres.rdl/.gitignore
index a9f1b80..27be895 100644
--- a/com.minres.rdl.parent/com.minres.rdl/.gitignore
+++ b/com.minres.rdl.parent/com.minres.rdl/.gitignore
@@ -2,3 +2,4 @@
/Run RDL Generator DBT-RISCV.launch
/Run RDL Generator SC-Components-Test.launch
/plugin.xml_gen
+/model/
diff --git a/com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF b/com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF
index 201754d..fdf5f22 100644
--- a/com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF
+++ b/com.minres.rdl.parent/com.minres.rdl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: com.minres.rdl
Bundle-ManifestVersion: 2
Bundle-Name: com.minres.rdl
Bundle-Vendor: MINRES Technologies GmbH
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.3.0.qualifier
Bundle-SymbolicName: com.minres.rdl; singleton:=true
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext,
@@ -14,9 +14,10 @@ Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.util,
org.eclipse.emf.common,
org.eclipse.xtend.lib;bundle-version="2.14.0",
- org.antlr.runtime,
- org.eclipse.equinox.preferences
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
+ org.eclipse.equinox.preferences,
+ org.eclipse.emf.mwe.utils
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: com.minres.rdl,
com.minres.rdl.generator,
com.minres.rdl.parser.antlr,
diff --git a/com.minres.rdl.parent/com.minres.rdl/pom.xml b/com.minres.rdl.parent/com.minres.rdl/pom.xml
index 7a90d9b..b967baa 100644
--- a/com.minres.rdl.parent/com.minres.rdl/pom.xml
+++ b/com.minres.rdl.parent/com.minres.rdl/pom.xml
@@ -14,7 +14,7 @@
org.codehaus.mojo
exec-maven-plugin
- 1.4.0
+ 1.6.0
mwe2Launcher
@@ -39,7 +39,7 @@
org.eclipse.emf
org.eclipse.emf.mwe2.launch
- 2.9.1.201705291010
+ ${mwe2Version}
org.eclipse.xtext
@@ -59,7 +59,7 @@
org.eclipse.xtext
xtext-antlr-generator
- [2.1.1, 3)
+ 2.1.1
@@ -152,5 +152,5 @@
- 1.1.1-SNAPSHOT
+ 1.3.0-SNAPSHOT
diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/GenerateRDL.mwe2 b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/GenerateRDL.mwe2
index ae8bcff..3847b61 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/GenerateRDL.mwe2
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/GenerateRDL.mwe2
@@ -30,7 +30,7 @@ Workflow {
encoding = "UTF-8"
lineDelimiter = "\n"
fileHeader = "/*\n * generated by Xtext \${version}\n */"
- preferXtendStubs = false
+ preferXtendStubs = true
}
}
language = StandardLanguage {
@@ -39,34 +39,33 @@ Workflow {
fragment = exporting.SimpleNamesFragment2 auto-inject {}
- parserGenerator = {
+ parserGenerator = {
options = {
- backtrack = true
- }
- }
+ backtrack = true
+ }
+ }
formatter = {
generateStub = true
}
-
serializer = {
generateStub = false
}
-
validator = {
composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"
// composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
// Generates checks for @Deprecated grammar annotations, an IssueProvider and a corresponding PropertyPage
generateDeprecationValidation = true
}
-
generator = {
- generateXtendMain = true
- }
-
+ generateXtendMain = true
+ }
projectWizard = {
- generate = true
- }
+ generate = true
+ }
+ generator = {
+ generateXtendStub = true
+ }
junitSupport = {
junitVersion = "5"
}
diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend
index 5cd2c8b..f227723 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/Main.xtend
@@ -8,7 +8,6 @@ import org.eclipse.emf.common.util.URI
import org.eclipse.emf.ecore.resource.ResourceSet
import org.eclipse.emf.mwe.utils.ProjectMapping
import org.eclipse.emf.mwe.utils.StandaloneSetup
-import org.eclipse.xtext.generator.GeneratorContext
import org.eclipse.xtext.generator.GeneratorDelegate
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
import org.eclipse.xtext.resource.XtextResource
@@ -20,6 +19,7 @@ import java.text.ParseException
import com.minres.rdl.generator.Options.Multiplicity
import com.minres.rdl.generator.Options.Separator
import org.eclipse.xtext.generator.IFileSystemAccess
+import java.io.File
class Main {
@@ -74,12 +74,12 @@ class Main {
return
}
val verbose = if(opt.getSet().isSet("v")) true else false;
-
+ val setup = new StandaloneSetup()
if (opt.getSet().isSet("I")) {
val projectMapping = new ProjectMapping
projectMapping.projectName = "RDL Repository"
- projectMapping.path = opt.getSet().getOption("I").getResultValue(0)
- new StandaloneSetup().addProjectMapping(projectMapping)
+ projectMapping.path = new File(opt.getSet().getOption("I").getResultValue(0)).canonicalFile.absolutePath
+ setup.addProjectMapping(projectMapping)
}
// Configure and start the generator
fileAccess.outputPath = 'src-gen/'
diff --git a/com.minres.rdl.parent/pom.xml b/com.minres.rdl.parent/pom.xml
index b1f5d95..2c21f39 100644
--- a/com.minres.rdl.parent/pom.xml
+++ b/com.minres.rdl.parent/pom.xml
@@ -7,18 +7,19 @@
pom
- 2.14.0
+ 2.25.0
+ 2.12.1
UTF-8
- 1.8
- 1.8
+ 11
+ 11
- 1.1.0
+ 1.7.0
-
- 1.1.1-SNAPSHOT
+
+ 1.3.0-SNAPSHOT
com.minres.rdl
@@ -36,6 +37,17 @@
com.minres.rdl.product.releng
com.minres.rdl.standalone
+
+
+
+ org.eclipse.xtext
+ xtext-dev-bom
+ ${xtextVersion}
+ pom
+ import
+
+
+
@@ -46,11 +58,6 @@
org.eclipse.tycho
- tycho-versions-plugin
- ${tycho-version}
-
-
- org.eclipse.tycho
tycho-source-plugin
${tycho-version}
@@ -120,6 +127,23 @@
x86_64
+
+
+
+ eclipse-plugin
+ org.eclipse.xtext.logging
+ 1.2.15
+
+
+
+ eclipse-feature
+ org.eclipse.rcp
+ 0.0.0
+
+
+
@@ -147,7 +171,7 @@
org.apache.maven.plugins
maven-clean-plugin
- 2.5
+ 3.1.0
@@ -166,26 +190,6 @@
-
-
-
- org.apache.maven.plugins
-
-
- maven-resources-plugin
-
-
- [2.4.3,)
-
-
- resources
- testResources
-
-
-
-
-
-
@@ -276,7 +280,7 @@
${tycho-version}
- ${tycho.testArgLine} ${platformSystemProperties} ${systemProperties} ${moduleProperties}
+ ${platformSystemProperties} ${systemProperties} ${moduleProperties} ${additionalTestArguments}
false
false