From 2e9caf94b1f16b0eef7dd6b0a42452ea99ef7306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Wed, 11 Sep 2024 08:42:25 +0200 Subject: [PATCH 01/17] build: upgrade mps-gradle-plugin to 1.28 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 8da7ee1917..7dd267911a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ import de.itemis.mps.gradle.RunAntScript plugins { - id 'de.itemis.mps.gradle.common' version '1.16.+' - id 'download-jbr' version '1.16.+' + id 'de.itemis.mps.gradle.common' version '1.28.+' + id 'download-jbr' version '1.28.+' } repositories { From 46e8062dd313c26f5f7c05c8be8f49f0e105fbea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Fri, 13 Sep 2024 23:28:10 +0200 Subject: [PATCH 02/17] Add platform sandboxes build script --- .../com.mbeddr.platform.tests.build.mps | 1249 ++++++++++++++++- subprojects/com.mbeddr/platform/build.gradle | 8 + 2 files changed, 1229 insertions(+), 28 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps index ea42b7b4bc..f99b3c382d 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps @@ -1476,6 +1476,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1506,34 +1534,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2855,5 +2855,1198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/subprojects/com.mbeddr/platform/build.gradle b/subprojects/com.mbeddr/platform/build.gradle index 3e65046979..ed74229756 100755 --- a/subprojects/com.mbeddr/platform/build.gradle +++ b/subprojects/com.mbeddr/platform/build.gradle @@ -6,6 +6,7 @@ plugins { import de.itemis.mps.gradle.* def script_test_mbeddrPlatform = new File(scriptsBasePath + "/com.mbeddr.platform/" + "build-ts-tests.xml") +def script_mbeddrPlatform_sandboxes = new File(scriptsBasePath, "com.mbeddr.platform/build-sandboxes.xml") if (project.skipresolve_mps) { task resolve_mps { @@ -103,6 +104,13 @@ task install_actionsfilter(type: Copy, dependsOn: build_actionsfilter) { } tasks.getByPath(':com.mbeddr:install').dependsOn install_actionsfilter +tasks.register('generate_platform_sandboxes', RunAntScript) { + dependsOn build_platform + script script_mbeddrPlatform_sandboxes + description "build mbeddr platform sandboxes" + targets 'generate' +} + task test_mbeddr_platform(type: TestLanguages, dependsOn: build_platform) { script script_test_mbeddrPlatform description "execute typesystem and generator tests for the plaform" From 440869a68f3e585976dce1f79a6656b2cf1ad0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Fri, 13 Sep 2024 23:37:42 +0200 Subject: [PATCH 03/17] Task to build all platform languages (for migration) --- subprojects/com.mbeddr/platform/build.gradle | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/subprojects/com.mbeddr/platform/build.gradle b/subprojects/com.mbeddr/platform/build.gradle index ed74229756..66dc8750d3 100755 --- a/subprojects/com.mbeddr/platform/build.gradle +++ b/subprojects/com.mbeddr/platform/build.gradle @@ -5,7 +5,7 @@ plugins { import de.itemis.mps.gradle.* -def script_test_mbeddrPlatform = new File(scriptsBasePath + "/com.mbeddr.platform/" + "build-ts-tests.xml") +def script_test_mbeddrPlatform = new File(scriptsBasePath, "com.mbeddr.platform/build-ts-tests.xml") def script_mbeddrPlatform_sandboxes = new File(scriptsBasePath, "com.mbeddr.platform/build-sandboxes.xml") if (project.skipresolve_mps) { @@ -104,6 +104,13 @@ task install_actionsfilter(type: Copy, dependsOn: build_actionsfilter) { } tasks.getByPath(':com.mbeddr:install').dependsOn install_actionsfilter +tasks.register('generate_mbeddr_platform_tests', RunAntScript) { + dependsOn build_platform + script script_test_mbeddrPlatform + description "build mbeddr platform tests" + targets 'generate' +} + tasks.register('generate_platform_sandboxes', RunAntScript) { dependsOn build_platform script script_mbeddrPlatform_sandboxes @@ -111,9 +118,14 @@ tasks.register('generate_platform_sandboxes', RunAntScript) { targets 'generate' } -task test_mbeddr_platform(type: TestLanguages, dependsOn: build_platform) { +tasks.register('generate_platform_languages') { + dependsOn build_platform, generate_mbeddr_platform_tests, generate_platform_sandboxes +} + +task test_mbeddr_platform(type: TestLanguages, dependsOn: [build_platform, generate_mbeddr_platform_tests]) { script script_test_mbeddrPlatform description "execute typesystem and generator tests for the plaform" + targets 'check' } task build_platform_distribution(type: BuildLanguages, dependsOn: [build_platform, test_mbeddr_platform]) { From 68f3458cbfa8f621c3a7e6b162f64fda96e1f439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Sun, 15 Sep 2024 16:02:55 +0200 Subject: [PATCH 04/17] Add migrate task --- subprojects/com.mbeddr/build.gradle | 49 ++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/subprojects/com.mbeddr/build.gradle b/subprojects/com.mbeddr/build.gradle index c9431989d0..9166341dc0 100755 --- a/subprojects/com.mbeddr/build.gradle +++ b/subprojects/com.mbeddr/build.gradle @@ -1,3 +1,10 @@ +import de.itemis.mps.gradle.tasks.MpsMigrate +import de.itemis.mps.gradle.tasks.Remigrate + +plugins { + id 'de.itemis.mps.gradle.common' +} + // path variables // If mpsHomeDir is set explicitly, skip the MPS resolution step and use the explicit path (which may be relative from // the root directory). @@ -168,10 +175,44 @@ task printRepositories { } } -tasks.register('migrate') { - // No-op in this version +List projectsInDependencyOrder = [ + 'com.mbeddr.mpsutil', +// 'com.mbeddr.doc', +// 'com.mbeddr.doc.aspect', +// 'com.mbeddr.core', +// 'com.mbeddr.ext', +// 'com.mbeddr.cc', +// 'com.mbeddr.xmodel', + 'com.mbeddr.build', +] + +List projectDirectoriesInDependencyOrder = projectsInDependencyOrder.collect { + new File(rootProject.file('code/languages'), it) +} + +tasks.register('migrate', MpsMigrate) { + dependsOn(':com.mbeddr:platform:generate_platform_languages') + mpsHome = mpsHomeDir + projectDirectories.from(projectDirectoriesInDependencyOrder) + + folderMacros['mbeddr.github.core.home'] = rootProject.layout.projectDirectory + + pluginRoots.from(new File(mpsHomeDir, 'plugins')) + + maxHeapSize = "4G" } -tasks.register('remigrate') { - // No-op in this version +tasks.register('remigrate', Remigrate) { + dependsOn(':com.mbeddr:platform:generate_platform_languages') + mpsHome = mpsHomeDir + projectDirectories.from(projectDirectoriesInDependencyOrder) + + folderMacros['mbeddr.github.core.home'] = rootProject.layout.projectDirectory + + pluginRoots.from(new File(mpsHomeDir, 'plugins')) + + maxHeapSize = "4G" } + +// For the remigrate backend +configureRepositories(project) From f141b08412d2224dbc2f1220f0dd8ae53bdb746c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Fri, 16 Aug 2024 22:24:43 +0200 Subject: [PATCH 05/17] build: add com.mbeddr.slides --- .../models/com/mbeddr/platform/build.mps | 136 +++++++++++++++++- 1 file changed, 130 insertions(+), 6 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index f439b8cffb..1bef813519 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -1790,6 +1790,12 @@ + + + + + + @@ -1812,12 +1818,6 @@ - - - - - - @@ -17218,6 +17218,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 38a170225bb4d9823874a5bf704127e416c2a422 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Tue, 17 Sep 2024 17:34:06 +0200 Subject: [PATCH 06/17] Migrate com.mbeddr.build --- code/languages/com.mbeddr.build/.mps/vcs.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/languages/com.mbeddr.build/.mps/vcs.xml b/code/languages/com.mbeddr.build/.mps/vcs.xml index b4275b6f03..c2365ab11f 100644 --- a/code/languages/com.mbeddr.build/.mps/vcs.xml +++ b/code/languages/com.mbeddr.build/.mps/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file From 5cd4a4f5f0169ed3ea94ca8b82321b70b3a3c68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Thu, 26 Sep 2024 19:58:50 +0200 Subject: [PATCH 07/17] Enhance build scripts --- .../com/mbeddr/core/tests/build/build.mps | 16 ++ .../com.mbeddr.platform.tests.build.mps | 152 ++++++++++++++++++ .../models/com/mbeddr/platform/build.mps | 60 ++++++- 3 files changed, 222 insertions(+), 6 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps index cee127fade..c18e10bd43 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.core.tests.build/models/com/mbeddr/core/tests/build/build.mps @@ -1051,6 +1051,22 @@ + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps index f99b3c382d..50843a6b31 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps @@ -477,6 +477,22 @@ + + + + + + + + + + + + + + + + @@ -537,6 +553,22 @@ + + + + + + + + + + + + + + + + @@ -4047,6 +4079,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index 1bef813519..914ece6d07 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -1790,12 +1790,6 @@ - - - - - - @@ -1818,6 +1812,12 @@ + + + + + + @@ -20099,6 +20099,22 @@ + + + + + + + + + + + + + + + + @@ -20179,6 +20195,22 @@ + + + + + + + + + + + + + + + + @@ -20290,6 +20322,22 @@ + + + + + + + + + + + + + + + + From 2a03c2f591f3054451be8b91f58246775a8d65e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Thu, 26 Sep 2024 19:14:04 +0200 Subject: [PATCH 08/17] build: add graphstream language and example to sandboxes --- .../com.mbeddr.platform.tests.build.mps | 420 ++++++++++++++++-- 1 file changed, 392 insertions(+), 28 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps index 50843a6b31..d2ffba374f 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps @@ -144,10 +144,14 @@ + + + + @@ -1508,34 +1512,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1566,6 +1542,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4199,6 +4203,366 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 09becb3f90c490e65ee5280c70aec3db7bde6fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Thu, 19 Sep 2024 08:52:36 +0200 Subject: [PATCH 09/17] actionsfilter: remove broken reference in comment --- ...m.mbeddr.mpsutil.actionsfilter.runtime.msd | 5 +- .../mbeddr/mpsutil/actionsfilter/runtime.mps | 117 +----------------- 2 files changed, 6 insertions(+), 116 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd index 7aace4fa6d..bf4d550f0c 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd @@ -1,7 +1,7 @@ - + @@ -22,6 +22,7 @@ + @@ -30,6 +31,8 @@ + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps index 34332b0a9c..c8b8109a2d 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps @@ -7,6 +7,8 @@ + + @@ -24,7 +26,6 @@ - @@ -35,15 +36,10 @@ - - - - - @@ -4966,115 +4962,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 3392a9aac9a7a3f1725e73f193a4a4ff5c0c99ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Thu, 26 Sep 2024 19:35:59 +0200 Subject: [PATCH 10/17] Remove enum property migration info with broken references --- .../testFailDifferentPropertyName.mps | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps index 74675f10af..8eff757f1b 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps @@ -24,9 +24,6 @@ - - - @@ -158,24 +155,10 @@ - - - - - - - - - - - - - - From 297c687e3ae4853ab84bba31d6bbce86b1df6e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Wed, 11 Sep 2024 08:37:53 +0200 Subject: [PATCH 11/17] Use tasks.register API --- subprojects/com.mbeddr/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/com.mbeddr/build.gradle b/subprojects/com.mbeddr/build.gradle index 9166341dc0..fffe957f70 100755 --- a/subprojects/com.mbeddr/build.gradle +++ b/subprojects/com.mbeddr/build.gradle @@ -160,14 +160,14 @@ private static void configureRepositories(Project project) { } -task printVersions { +tasks.register('printVersions') { doLast { println "mbeddrBuildNumber: $project.mbeddrBuildNumber" println "mbeddrPlatformBuildNumber: $project.mbeddrPlatformBuildNumber" } } -task printRepositories { +tasks.register('printRepositories') { doLast { println "snapshotRepository: $snapshotRepository" println "releaseRepository: $releaseRepository" From e72ca17957fad47687f05350ee83912ff466f1f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Tue, 17 Sep 2024 17:33:28 +0200 Subject: [PATCH 12/17] com.mbeddr.build: clean up project libraries No need to add the rest of mbeddr as a library. --- code/languages/com.mbeddr.build/.mps/libraries.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/languages/com.mbeddr.build/.mps/libraries.xml b/code/languages/com.mbeddr.build/.mps/libraries.xml index a89f90c6ec..7689063b9e 100644 --- a/code/languages/com.mbeddr.build/.mps/libraries.xml +++ b/code/languages/com.mbeddr.build/.mps/libraries.xml @@ -3,14 +3,6 @@ - + @@ -475,7 +475,7 @@ - + @@ -518,7 +518,7 @@ - + @@ -531,7 +531,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps index f1263001e7..a2e5a3751a 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps @@ -193,7 +193,7 @@ - + @@ -218,11 +218,11 @@ - + - + @@ -270,7 +270,7 @@ - + @@ -300,11 +300,11 @@ - + - + @@ -358,7 +358,7 @@ - + @@ -397,11 +397,11 @@ - + - + @@ -446,7 +446,7 @@ - + @@ -487,11 +487,11 @@ - + - + @@ -564,11 +564,11 @@ - + - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd index 9ff270b49a..e04b4f8c56 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.genplan/com.mbeddr.mpsutil.comparator.diff.demo.genplan.msd @@ -6,7 +6,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd index c7988183fa..7488e21a82 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator.diff.demo.tests/com.mbeddr.mpsutil.comparator.diff.demo.tests.msd @@ -6,9 +6,10 @@ - + + diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd index c5f2721715..49ada4bb0b 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.common/test.com.mbeddr.mpsutil.common.msd @@ -6,9 +6,10 @@ - + + From 95800a778b78a2ea38b63cd12afca71d6fc1ed5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Tue, 8 Oct 2024 18:06:08 +0200 Subject: [PATCH 15/17] build: remove redundant languages from sandboxes Some modules were added to the tests build script, no need to build them twice. --- .../com.mbeddr.platform.tests.build.mps | 390 ------------------ 1 file changed, 390 deletions(-) diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps index d2ffba374f..ba239e1dac 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform.tests.build/models/com.mbeddr.platform.tests.build.mps @@ -3609,66 +3609,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3753,336 +3693,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From f8177f1c5e86d6ede19e7098380836a6d98aa24d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Wed, 9 Oct 2024 08:57:34 +0200 Subject: [PATCH 16/17] ecoretransformation: fix broken references --- .../models/structure.mps | 2 +- .../models/structure.mps | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps index 3927f77fe8..32ce8c2f79 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransformation.amaltheametamodel/models/structure.mps @@ -4049,7 +4049,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps index 567adcc0e3..692215034e 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/models/structure.mps @@ -91,7 +91,7 @@ - + From 2b2b49087878b22c4c762d2dc5519607ab53008e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Wed, 9 Oct 2024 20:01:10 +0200 Subject: [PATCH 17/17] Run migrations --- .../generator/template/main@generator.mps | 13 ++-- .../models/behavior.mps | 6 +- .../models/editor.mps | 8 +-- .../languageModels/behavior.mps | 22 +++--- .../languageModels/editor.mps | 7 +- ...om.mbeddr.mpsutil.favourites.migration.mps | 10 +-- ...om.mbeddr.mpsutil.interpreter.dataFlow.mps | 8 +-- .../com/mbeddr/mpsutil/interpreter/rt.mps | 19 +++-- .../com.mbeddr.mpsutil.json/models/plugin.mps | 2 +- ...m.mbeddr.mpsutil.actionsfilter.runtime.msd | 2 +- .../mbeddr/mpsutil/actionsfilter/runtime.mps | 25 ++++--- ...util.checkinHandler.demo.plugin.plugin.mps | 8 +-- ...m.mbeddr.mpsutil.checkinHandler.plugin.mps | 22 +++--- .../com/mbeddr/mpsutil/common/graph.mps | 10 +-- .../DifferentNumberOfChildrenDifference.mpsr | 14 ++-- .../com/mbeddr/mpsutil/ecore/runtime/main.mps | 9 ++- .../mpsutil/ecore/testing/runtime/main.mps | 15 ++-- .../com.mbeddr.mpsutil.ecore.stubs.msd | 72 ------------------- .../testFailDifferentPropertyName.mps | 2 +- 19 files changed, 98 insertions(+), 176 deletions(-) diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/generator/template/main@generator.mps index afdeebdb2e..30ca52e4d4 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/generator/template/main@generator.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.actionsfilter/generator/template/main@generator.mps @@ -253,7 +253,6 @@ - @@ -1019,7 +1018,7 @@ - + @@ -1031,9 +1030,9 @@ - + - + @@ -1044,7 +1043,7 @@ - + @@ -1052,9 +1051,9 @@ - + - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps index fbec871eee..6e1e24ffbd 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/behavior.mps @@ -99,7 +99,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -139,7 +139,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps index a2e5a3751a..04ed330abf 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.asynccell.sandbox/models/editor.mps @@ -51,7 +51,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -156,7 +156,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/behavior.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/behavior.mps index 50cdf36fdf..d53893f249 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/behavior.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/behavior.mps @@ -123,6 +123,7 @@ + @@ -221,7 +222,6 @@ - @@ -314,7 +314,7 @@ - + @@ -346,16 +346,16 @@ - + - + - + @@ -383,15 +383,15 @@ - + - + - + @@ -455,15 +455,15 @@ - + - + - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps index 1e783d4b9d..287b722b02 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps @@ -559,7 +559,6 @@ - @@ -5969,16 +5968,16 @@ - + - + - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/com.mbeddr.mpsutil.favourites.migration.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/com.mbeddr.mpsutil.favourites.migration.mps index 4d8c511b89..98036426eb 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/com.mbeddr.mpsutil.favourites.migration.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.favourites/models/com.mbeddr.mpsutil.favourites.migration.mps @@ -93,6 +93,7 @@ + @@ -166,7 +167,6 @@ - @@ -295,7 +295,7 @@ - + @@ -354,15 +354,15 @@ - + - + - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.dataFlow.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.dataFlow.mps index 5227ad5b08..4d13d1f22c 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.dataFlow.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/languageModels/com.mbeddr.mpsutil.interpreter.dataFlow.mps @@ -36,6 +36,7 @@ + @@ -79,7 +80,6 @@ - @@ -288,13 +288,13 @@ - + - + - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps index 8cabd46f5d..80e361f9f2 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps @@ -495,7 +495,6 @@ - @@ -1070,7 +1069,7 @@ - + @@ -1078,9 +1077,9 @@ - + - + @@ -9274,7 +9273,7 @@ - + @@ -9283,9 +9282,9 @@ - + - + @@ -13259,14 +13258,14 @@ - + - + - + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps index e331b06bea..c6463d88f8 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.json/models/plugin.mps @@ -2,7 +2,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd index f90d9fde34..e2e7e3a52b 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/com.mbeddr.mpsutil.actionsfilter.runtime.msd @@ -29,7 +29,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps index 0b4f32341d..57973ef3fb 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps @@ -6,7 +6,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -348,7 +348,7 @@ - + @@ -408,7 +408,6 @@ - @@ -9926,7 +9925,7 @@ - + @@ -9938,7 +9937,7 @@ - + @@ -9947,9 +9946,9 @@ - + - + @@ -9960,7 +9959,7 @@ - + @@ -9968,9 +9967,9 @@ - + - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/models/com.mbeddr.mpsutil.checkinHandler.demo.plugin.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/models/com.mbeddr.mpsutil.checkinHandler.demo.plugin.plugin.mps index 7ba8fb0257..23e486bad3 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/models/com.mbeddr.mpsutil.checkinHandler.demo.plugin.plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler.demo.plugin/models/com.mbeddr.mpsutil.checkinHandler.demo.plugin.plugin.mps @@ -526,7 +526,7 @@ - + @@ -926,7 +926,7 @@ - + @@ -941,7 +941,7 @@ - + @@ -976,7 +976,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler/models/com.mbeddr.mpsutil.checkinHandler.plugin.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler/models/com.mbeddr.mpsutil.checkinHandler.plugin.mps index 72de3a211b..3f89dd4e49 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler/models/com.mbeddr.mpsutil.checkinHandler.plugin.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.checkinHandler/models/com.mbeddr.mpsutil.checkinHandler.plugin.mps @@ -1703,7 +1703,7 @@ - + @@ -1933,7 +1933,7 @@ - + @@ -2074,7 +2074,7 @@ - + @@ -2142,7 +2142,7 @@ - + @@ -2185,7 +2185,7 @@ - + @@ -2326,7 +2326,7 @@ - + @@ -2418,7 +2418,7 @@ - + @@ -2512,7 +2512,7 @@ - + @@ -2691,7 +2691,7 @@ - + @@ -2787,7 +2787,7 @@ - + @@ -2883,7 +2883,7 @@ - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps index 24b7ef92bf..deefc525b1 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.common/models/com/mbeddr/mpsutil/common/graph.mps @@ -2,7 +2,7 @@ - + @@ -227,6 +227,7 @@ + @@ -324,7 +325,6 @@ - @@ -3425,14 +3425,14 @@ - + - + - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr index 29773b4a29..8026c01408 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.comparator/models/DifferentNumberOfChildrenDifference.mpsr @@ -113,6 +113,7 @@ + @@ -141,7 +142,6 @@ - @@ -290,7 +290,7 @@ - + @@ -307,9 +307,9 @@ - + - + @@ -432,7 +432,7 @@ - + @@ -449,9 +449,9 @@ - + - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps index a20722b463..3405eceb87 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.runtime/models/com/mbeddr/mpsutil/ecore/runtime/main.mps @@ -480,7 +480,6 @@ - @@ -9123,7 +9122,7 @@ - + @@ -9133,7 +9132,7 @@ - + @@ -9143,9 +9142,9 @@ - + - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/models/com/mbeddr/mpsutil/ecore/testing/runtime/main.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/models/com/mbeddr/mpsutil/ecore/testing/runtime/main.mps index 9bd4399aa3..52d6685022 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/models/com/mbeddr/mpsutil/ecore/testing/runtime/main.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/models/com/mbeddr/mpsutil/ecore/testing/runtime/main.mps @@ -284,7 +284,6 @@ - @@ -487,7 +486,7 @@ - + @@ -496,9 +495,9 @@ - + - + @@ -660,22 +659,22 @@ - + - + - + - + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd index c9fa0a2a65..6579df8bfe 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd @@ -38,80 +38,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK) 498d89d2-c2e9-11e2-ad49-6cf049e62fe5(MPS.IDEA) diff --git a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps index 8eff757f1b..6b54bfff3d 100644 --- a/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps +++ b/code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.ecore.metaModelImport/models/test/com/mbeddr/mpsutil/ecoreimporter/testFailDifferentPropertyName.mps @@ -55,7 +55,7 @@ - +