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/14] 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 8da7ee19173..7dd267911aa 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/14] 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 ea42b7b4bcb..f99b3c382d3 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 3e650469794..ed742297566 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/14] 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 ed742297566..66dc8750d3e 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/14] 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 c9431989d07..9166341dc0c 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/14] 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 f439b8cffbf..1bef8135192 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/14] 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 b4275b6f039..c2365ab11f9 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/14] 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 cee127fade8..c18e10bd438 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 f99b3c382d3..50843a6b316 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 1bef8135192..914ece6d071 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/14] 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 50843a6b316..d2ffba374f3 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/14] 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 7aace4fa6d8..bf4d550f0c5 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 34332b0a9c5..c8b8109a2de 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/14] 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 74675f10afc..8eff757f1b2 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/14] 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 9166341dc0c..fffe957f701 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/14] 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 a89f90c6ec1..7689063b9e4 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 f1263001e7c..a2e5a3751a5 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 9ff270b49ae..e04b4f8c567 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 c7988183fab..7488e21a828 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 c5f27217155..49ada4bb0be 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 @@ - + +