Updates setup configuration #150

- Filters out project import for org.eclipse.viatra.query.patternlanguage.metamodel.queries.test that is an incomplete, currently unused project - Adds missing code generator - Minor updates to mwe configurations - Minor fixes in the metamodel.validation project to avoid compile errors
eclipse-viatra · Apr 13, 2024 · 669c79e · 669c79e
1 parent fbb980c
commit 669c79e
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 34 deletions.
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.metamodel.validation/.classpath b/query/plugins/org.eclipse.viatra.query.patternlanguage.metamodel.validation/.classpath
@@ -1,8 +1,11 @@
 <?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/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/query/plugins/org.eclipse.viatra.query.patternlanguage.metamodel.validation/build.properties b/query/plugins/org.eclipse.viatra.query.patternlanguage.metamodel.validation/build.properties
@@ -2,6 +2,5 @@ bin.includes = META-INF/,\
                .,\
                plugin.xml,\
                about.html
-source.. = src/,\
-           src-gen/
+source.. = src-gen/
 output.. = bin/
diff --git a/releng/org.eclipse.viatra.generators/META-INF/MANIFEST.MF b/releng/org.eclipse.viatra.generators/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.emf.mwe2.launch,
  org.eclipse.viatra.examples.cps.model;resolution:=optional,
  org.eclipse.viatra.query.runtime.cps.tests;resolution:=optional,
  org.eclipse.viatra.query.rcptt.queries;resolution:=optional,
- org.eclipse.viatra.query.patternlanguage.metamodel;resolution:=optional
+ org.eclipse.viatra.query.patternlanguage.metamodel;resolution:=optional,
+ org.eclipse.viatra.documentation.example;bundle-version="2.9.0"
 Import-Package: org.apache.log4j,
  org.eclipse.viatra.addon.databinding.runtime.validation,
  org.eclipse.viatra.addon.querybasedfeatures.runtime.validation,

diff --git a/releng/org.eclipse.viatra.setup/GenerateDocumentationQueries.mwe2.launch b/releng/org.eclipse.viatra.setup/GenerateDocumentationQueries.mwe2.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
+    <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
+    <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/org.eclipse.viatra.documentation.example&quot; type=&quot;4&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/org.eclipse.viatra.generators"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="4"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.viatra.generators"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/GenerateQueryCode.mwe2 -p projectName=org.eclipse.viatra.documentation.example -p projectPath=documentation -p escapedProjectName=org\.eclipse\.viatra\.documentation\.example"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.viatra.generators"/>
+</launchConfiguration>
diff --git a/releng/org.eclipse.viatra.setup/GenerateEMFPatternLanguage.mwe2.launch b/releng/org.eclipse.viatra.setup/GenerateEMFPatternLanguage.mwe2.launch
@@ -9,8 +9,10 @@
         <listEntry value="4"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.viatra.query.patternlanguage.emf"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/viatra/query/patternlanguage/emf/GenerateEMFPatternLanguage.mwe2"/>

diff --git a/releng/org.eclipse.viatra.setup/GenerateGeneratorModel.mwe2.launch b/releng/org.eclipse.viatra.setup/GenerateGeneratorModel.mwe2.launch
@@ -9,8 +9,10 @@
         <listEntry value="4"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.eclipse.viatra.query.tooling.generator.model"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/org/eclipse/viatra/query/tooling/generator/model/GenerateGeneratorModel.mwe2"/>

diff --git a/releng/org.eclipse.viatra.setup/GeneratePatternLanguageTestMetamodel.mwe2.launch b/releng/org.eclipse.viatra.setup/GeneratePatternLanguageTestMetamodel.mwe2.launch
@@ -9,6 +9,7 @@
         <listEntry value="4"/>
     </listAttribute>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_CLASSPATH_ONLY_JAR" value="false"/>
     <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>

diff --git a/releng/org.eclipse.viatra.setup/VIATRAEMF.setup b/releng/org.eclipse.viatra.setup/VIATRAEMF.setup
@@ -312,26 +312,15 @@
       xsi:type="projects:ProjectsImportTask"
       predecessor="git.clone.viatra">
     <sourceLocator
-        rootFolder="${git.clone.viatra.location}/addon"
-        locateNestedProjects="true"/>
-    <sourceLocator
-        rootFolder="${git.clone.viatra.location}/integration"
-        locateNestedProjects="true"/>
-    <sourceLocator
-        rootFolder="${git.clone.viatra.location}/query"
-        locateNestedProjects="true"/>
-    <sourceLocator
-        rootFolder="${git.clone.viatra.location}/transformation"
-        locateNestedProjects="true"/>
-    <sourceLocator
-        rootFolder="${git.clone.viatra.location}/documentation"
-        locateNestedProjects="true"/>
-    <sourceLocator
-        rootFolder="${git.clone.viatra.location}/releng"
-        locateNestedProjects="true"/>
-    <sourceLocator
-        rootFolder="${git.clone.viatra.location}/dse"
-        locateNestedProjects="true"/>
+        rootFolder="${git.clone.viatra.location}"
+        locateNestedProjects="true">
+      <predicate
+          xsi:type="predicates:NotPredicate">
+        <operand
+            xsi:type="predicates:NamePredicate"
+            pattern="org.eclipse.viatra.query.patternlanguage.metamodel.queries.test"/>
+      </predicate>
+    </sourceLocator>
   </setupTask>
   <setupTask
       xsi:type="setup:CompoundTask"
@@ -457,6 +446,12 @@
         launcher="org.eclipse.viatra.setup/GeneratePatternLanguageSiriusQueries.mwe2.launch">
       <description></description>
     </setupTask>
+    <setupTask
+        xsi:type="launching:LaunchTask"
+        predecessor="viatra.xtext.pregen"
+        launcher="org.eclipse.viatra.setup/GenerateDocumentationQueries.mwe2.launch">
+      <description></description>
+    </setupTask>
   </setupTask>
   <project name="core"
       label="VIATRA Core (Discontinued, contents moved to parent project)">
@@ -790,23 +785,15 @@
         <requirement
             name="org.eclipse.sdk.feature.group"/>
         <requirement
-            name="com.google.inject"
-            versionRange="[3.0.0,4.0.0)"/>
-        <requirement
-            name="com.google.inject.multibindings"
-            versionRange="[3.0.0,4.0.0)"/>
+            name="com.google.inject"/>
         <requirement
             name="org.mockito"/>
         <requirement
             name="org.hamcrest"/>
         <requirement
             name="com.google.guava"/>
-        <requirement
-            name="org.eclipse.zest.feature.group"/>
         <requirement
             name="org.eclipse.zest.sdk.feature.group"/>
-        <requirement
-            name="org.eclipse.zest.source.feature.group"/>
         <repositoryList
             name="2022-06">
           <repository