From 07d65b9b181f8501323b6742b0492e8db18eed24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Sun, 18 Feb 2024 17:53:56 +0100 Subject: [PATCH 1/4] Run migrations --- build.gradle | 4 +- build/scripts/build_all_scripts.xml | 7 +- .../inspectionProfiles/Project_Default.xml | 6 + .../org.mpsqa.arch/.mps/migration.xml | 3 +- .../org.mpsqa.base/.mps/migration.xml | 3 +- .../inspectionProfiles/Project_Default.xml | 6 + .../org.mpsqa.build/.mps/migration.xml | 3 +- .../models/org.mpsqa.build.sandboxes.mps | 2 +- .../org.mpsqa.build._060_arch_build.mps | 38 +- .../org.mpsqa.build._100_allInOne_build.mps | 64 +- .../inspectionProfiles/Project_Default.xml | 6 + .../org.mpsqa.clones/.mps/migration.xml | 3 +- .../org.mpsqa.clones.config.sandbox.msd | 2 +- .../models/_000_infrastructure@tests.mps | 32 +- .../org.mpsqa.deprecated/.mps/migration.xml | 3 +- .../org.mpsqa.lint/.mps/migration.xml | 3 +- ...int.generic.linters_library.filesystem.mps | 1272 ++++++++-------- ...sqa.lint.generic.linters_library.nodes.mps | 64 +- ...s_library.performance_typesystem_rules.mps | 8 +- .../org.mpsqa.mutant/.mps/migration.xml | 3 +- .../org.mpsqa.profile/.mps/migration.xml | 3 +- ...n.jacoco.generator.templates@generator.mps | 1342 ++++++++--------- .../models/org.mpsqa.testing.build.mps | 2 +- .../models/org.mpsqa.testing.tests.build.mps | 2 +- .../org.mpsqa.unused/.mps/migration.xml | 3 +- 25 files changed, 1456 insertions(+), 1428 deletions(-) create mode 100644 code/languages/org.mpsqa.arch/.mps/inspectionProfiles/Project_Default.xml create mode 100644 code/languages/org.mpsqa.build/.mps/inspectionProfiles/Project_Default.xml create mode 100644 code/languages/org.mpsqa.clones/.mps/inspectionProfiles/Project_Default.xml diff --git a/build.gradle b/build.gradle index 81ae65c0..f014c23a 100644 --- a/build.gradle +++ b/build.gradle @@ -60,11 +60,11 @@ ext.dependencyRepositories = [ ] // Dependency versions -ext.mpsVersion = '2023.2' +ext.mpsVersion = '2023.3' // Project versions ext.major = '2023' -ext.minor = '2' +ext.minor = '3' if (ciBuild) { String branch = GitBasedVersioning.gitBranch diff --git a/build/scripts/build_all_scripts.xml b/build/scripts/build_all_scripts.xml index b4652cd7..2a630b59 100644 --- a/build/scripts/build_all_scripts.xml +++ b/build/scripts/build_all_scripts.xml @@ -64,8 +64,8 @@ - - + + @@ -85,7 +85,6 @@ - @@ -98,6 +97,7 @@ + @@ -142,6 +142,7 @@ + diff --git a/code/languages/org.mpsqa.arch/.mps/inspectionProfiles/Project_Default.xml b/code/languages/org.mpsqa.arch/.mps/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..4d56860c --- /dev/null +++ b/code/languages/org.mpsqa.arch/.mps/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.arch/.mps/migration.xml b/code/languages/org.mpsqa.arch/.mps/migration.xml index d62e30e5..fa6a5eec 100644 --- a/code/languages/org.mpsqa.arch/.mps/migration.xml +++ b/code/languages/org.mpsqa.arch/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.base/.mps/migration.xml b/code/languages/org.mpsqa.base/.mps/migration.xml index d62e30e5..fa6a5eec 100644 --- a/code/languages/org.mpsqa.base/.mps/migration.xml +++ b/code/languages/org.mpsqa.base/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.build/.mps/inspectionProfiles/Project_Default.xml b/code/languages/org.mpsqa.build/.mps/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..4d56860c --- /dev/null +++ b/code/languages/org.mpsqa.build/.mps/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.build/.mps/migration.xml b/code/languages/org.mpsqa.build/.mps/migration.xml index d62e30e5..fa6a5eec 100644 --- a/code/languages/org.mpsqa.build/.mps/migration.xml +++ b/code/languages/org.mpsqa.build/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps index ef1d65f7..23015ae8 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build.sandboxes/models/org.mpsqa.build.sandboxes.mps @@ -8,7 +8,7 @@ - + diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps index b3d9578d..3b068713 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._060_arch_build.mps @@ -394,6 +394,25 @@ + + + + + + + + + + + + + + + + + + + @@ -432,25 +451,6 @@ - - - - - - - - - - - - - - - - - - - diff --git a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps index 58313395..8d65861e 100644 --- a/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps +++ b/code/languages/org.mpsqa.build/solutions/org.mpsqa.build/models/org.mpsqa.build._100_allInOne_build.mps @@ -7,8 +7,8 @@ - - + + @@ -129,36 +129,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -260,6 +230,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.clones/.mps/inspectionProfiles/Project_Default.xml b/code/languages/org.mpsqa.clones/.mps/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..53314207 --- /dev/null +++ b/code/languages/org.mpsqa.clones/.mps/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.clones/.mps/migration.xml b/code/languages/org.mpsqa.clones/.mps/migration.xml index d62e30e5..fa6a5eec 100644 --- a/code/languages/org.mpsqa.clones/.mps/migration.xml +++ b/code/languages/org.mpsqa.clones/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd index 6c268fef..478b1732 100644 --- a/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd +++ b/code/languages/org.mpsqa.clones/tests/org.mpsqa.clones.config.sandbox/org.mpsqa.clones.config.sandbox.msd @@ -6,7 +6,7 @@ - + diff --git a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps index 72e5711d..c2fab9f9 100644 --- a/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps +++ b/code/languages/org.mpsqa.clones/tests/test.org.mpsqa.clones/models/_000_infrastructure@tests.mps @@ -332,6 +332,10 @@ + + + + @@ -339,13 +343,13 @@ - - - - + + + + @@ -353,13 +357,13 @@ - - - - + + + + @@ -372,14 +376,14 @@ - - - - + + + + @@ -525,10 +529,6 @@ - - - - diff --git a/code/languages/org.mpsqa.deprecated/.mps/migration.xml b/code/languages/org.mpsqa.deprecated/.mps/migration.xml index d62e30e5..fa6a5eec 100644 --- a/code/languages/org.mpsqa.deprecated/.mps/migration.xml +++ b/code/languages/org.mpsqa.deprecated/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.lint/.mps/migration.xml b/code/languages/org.mpsqa.lint/.mps/migration.xml index 0946a125..306284cf 100644 --- a/code/languages/org.mpsqa.lint/.mps/migration.xml +++ b/code/languages/org.mpsqa.lint/.mps/migration.xml @@ -7,7 +7,8 @@ + - + \ No newline at end of file diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps index 457bf215..9f959a66 100644 --- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.filesystem.mps @@ -16,12 +16,12 @@ - + + - + - @@ -567,143 +567,143 @@ - - - - - - + + + + + + - - + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - + + - - + + - - + + - + - - - - - + + + + + - + - + - - - + + + - - - - + + + + - - + + - + - - - + + + - + - - - + + + - - - - + + + + - - - + + + - + - - - + + + - + - + - - + + - + - - + + - - - + + + - + @@ -711,126 +711,185 @@ - - - + + + - - + + - - + + - + - - + + - - - + + + - - - + + + - + - - - + + + - - - + + + - - - - + + + + - - - + + + - + - + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + - - + + + + + + + - - - - - - + + + - + @@ -840,75 +899,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - + + - - - - + + + + + + + + + - - + + + + + - - - - - + + + + + - - + + - + @@ -920,247 +954,329 @@ - - + + - - + + - + - - - + + + - - - + + + - + + + + + + + + + + - - + + - + - - + + - - + + + + + - - - + + + - - + + - - + + - - + + - - + + + + - - + + + + + + + + + + + - - - + + + - + + + + + + + + + + + + + + + + + + - + + + + + + + - - + + - - + + + + + - - - + + + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + - - + + - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - + + - - - + + + - - - - + + + + - - - - - - - + + + + + + + - - + + - - + + - - + + - + - - - - - + + + + + - + - + - - - + + + - - - - + + + + - - + + - + - - - + + + - + - - - + + + - - - - + + + + - - - + + + - + - - - + + + - + - + - - + + - + - - + + - - - + + + - + @@ -1168,185 +1284,126 @@ - - - + + + - - + + - - + + - + - - + + - - - + + + - - - + + + - + - - - + + + - - - + + + - - - - + + + + - - - + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - + + - - - + + + - - - - - - + + + + + + - - - + + + - - - - - - - - + + + + + - - - - - - - + + + + + - - - + + + - + @@ -1354,52 +1411,77 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + - - - - - + + - - - - - + + + + + - - + + - + @@ -1411,188 +1493,106 @@ - - + + - - + + - + - - - + + + - - - + + + - - - - - - - - - - + - - + + - + - - - - - - - - - - - - - - - - - - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - - - + + - - - - - - - - - - - - - - - + + + - + - - - - - - - + - - - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + - - + + - - + + - - + + - + - - - - - - - - - - - - - - - - - + + - - + + diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps index 19d104d6..42d8adc5 100644 --- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.generic.linters_library/models/org.mpsqa.lint.generic.linters_library.nodes.mps @@ -2871,38 +2871,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -3023,6 +2991,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps index 9a6a3e48..89a45f83 100644 --- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps @@ -92,7 +92,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -166,13 +166,13 @@ - + - + diff --git a/code/languages/org.mpsqa.mutant/.mps/migration.xml b/code/languages/org.mpsqa.mutant/.mps/migration.xml index d62e30e5..fa6a5eec 100644 --- a/code/languages/org.mpsqa.mutant/.mps/migration.xml +++ b/code/languages/org.mpsqa.mutant/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.profile/.mps/migration.xml b/code/languages/org.mpsqa.profile/.mps/migration.xml index 0946a125..306284cf 100644 --- a/code/languages/org.mpsqa.profile/.mps/migration.xml +++ b/code/languages/org.mpsqa.profile/.mps/migration.xml @@ -7,7 +7,8 @@ + - + \ No newline at end of file diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps index a56ddcb3..2faa5215 100644 --- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps +++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps @@ -114,7 +114,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -391,7 +391,7 @@ - + @@ -677,6 +677,344 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3009,762 +3347,424 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + - - - - - - - - - - - - - - + + + + + + + + - - - + - - - - - - - - - - - - - - - - - - - - + + + + + - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + + - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - + + + + - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3963,6 +3963,7 @@ + @@ -3987,7 +3988,6 @@ - diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps index f73b6f19..fe915fe5 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.build/models/org.mpsqa.testing.build.mps @@ -1,5 +1,5 @@ - + diff --git a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/models/org.mpsqa.testing.tests.build.mps b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/models/org.mpsqa.testing.tests.build.mps index aa2ff664..055826cf 100644 --- a/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/models/org.mpsqa.testing.tests.build.mps +++ b/code/languages/org.mpsqa.testing/solutions/org.mpsqa.testing.tests.build/models/org.mpsqa.testing.tests.build.mps @@ -7,7 +7,7 @@ - + diff --git a/code/languages/org.mpsqa.unused/.mps/migration.xml b/code/languages/org.mpsqa.unused/.mps/migration.xml index d62e30e5..fa6a5eec 100644 --- a/code/languages/org.mpsqa.unused/.mps/migration.xml +++ b/code/languages/org.mpsqa.unused/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ No newline at end of file From 6c5a78d33a0c452b93dd2c1995286c677c4a8cfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Fri, 5 Apr 2024 20:11:31 +0200 Subject: [PATCH 2/4] Upgrade jacoco integration --- .../inspectionProfiles/Project_Default.xml | 6 + ...s_library.performance_typesystem_rules.mps | 35 +- .../inspectionProfiles/Project_Default.xml | 6 + .../org.mpsqa.testing/.mps/migration.xml | 3 +- ...n.jacoco.generator.templates@generator.mps | 4675 ++++++++--------- .../sandbox/build.gradle.kts | 26 +- .../org.mpsqa.testing/sandbox/build.xml | 324 +- .../models/jacoco.sandbox.build.mps | 4 +- 8 files changed, 2529 insertions(+), 2550 deletions(-) create mode 100644 code/languages/org.mpsqa.lint/.mps/inspectionProfiles/Project_Default.xml create mode 100644 code/languages/org.mpsqa.testing/.mps/inspectionProfiles/Project_Default.xml diff --git a/code/languages/org.mpsqa.lint/.mps/inspectionProfiles/Project_Default.xml b/code/languages/org.mpsqa.lint/.mps/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..4d56860c --- /dev/null +++ b/code/languages/org.mpsqa.lint/.mps/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps index 89a45f83..a814675a 100644 --- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps @@ -22,6 +22,7 @@ + @@ -49,6 +50,7 @@ + @@ -57,6 +59,9 @@ + + + @@ -97,6 +102,9 @@ + + + @@ -641,7 +649,9 @@ - + + + @@ -677,16 +687,23 @@ - - - - - - - - + + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.testing/.mps/inspectionProfiles/Project_Default.xml b/code/languages/org.mpsqa.testing/.mps/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..4d56860c --- /dev/null +++ b/code/languages/org.mpsqa.testing/.mps/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.testing/.mps/migration.xml b/code/languages/org.mpsqa.testing/.mps/migration.xml index d62e30e5..fa6a5eec 100644 --- a/code/languages/org.mpsqa.testing/.mps/migration.xml +++ b/code/languages/org.mpsqa.testing/.mps/migration.xml @@ -11,6 +11,7 @@ - + + \ No newline at end of file diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps index 2faa5215..2f02d802 100644 --- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps +++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps @@ -71,7 +71,6 @@ - @@ -111,6 +110,7 @@ + @@ -127,12 +127,23 @@ + + + + + + + + + + + @@ -154,7 +165,6 @@ - @@ -166,9 +176,6 @@ - - - @@ -179,7 +186,9 @@ - + + + @@ -580,7 +589,7 @@ - + @@ -591,7 +600,7 @@ - + @@ -674,6 +683,9 @@ + + + @@ -702,84 +714,84 @@ - + - - - - - + + + + + - + - + - + - + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - + - + - - - + + + - + - - - - + + + + - + - + @@ -787,25 +799,25 @@ - + - - - - + + + + - + - - - - - - - - - + + + + + + + + + @@ -813,176 +825,187 @@ - - - - + + + + - + - - - - - + + + + + - + - - - - - - - + + + + + + + - - + + - - + + - + - - - - - - - - - - - - + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - + + + + + + - - + + - + - - + + - + - - - - + + + + - + - - + + - + - - - - - - - - + + + + + + + + - + - - + + - - + + - - - - - - - + + + + + + + - - + + - + - - + + - - - + + + - + - - + + + + + + + + + + + + + + + + + + + + + + @@ -1015,125 +1038,29 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - + + + + + + + + + + + + + @@ -1142,774 +1069,310 @@ - - - - - - - - - - - - - + + + + + + + - - - - - - - - - + + - - - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + - - + + - - + + - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + + + + - - + + - - + + + + + + - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - - + + + - + - + - + - + - + - + - + - + - + - - + + - + - - - - - + + + + + @@ -1917,64 +1380,64 @@ - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - - - + + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - + + + @@ -1983,9 +1446,9 @@ - + - + @@ -1995,24 +1458,24 @@ - + - + - + - + - - - - - + + + + + - + @@ -2020,21 +1483,21 @@ - - - - - + + + + + - + - - - - - + + + + + @@ -2042,67 +1505,67 @@ - - + + - - + + - - - - - - - - + + + + + + + + - + - + - + - - - + + + - + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - + + + @@ -2111,315 +1574,57 @@ - + - + - - + + - + - + - - + + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - @@ -2448,123 +1653,120 @@ - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + - + + + + - - - - - + + + + + + + + + + + - - - - - - - - + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - + + + + + + + + - - - - - + + + + + + + + @@ -2573,355 +1775,697 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2929,569 +2473,575 @@ - - - - - + + + + + - + - - + + - - + + - - - + + + - + - - - + + + - - - - + + + + - - - + + + - + - - - - + + + + - - - + + + - - - - - + + + + + - + - + - + - - - + + + - + - - + + - + - + - - + + - + - + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - + - - + + - - + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -3499,31 +3049,25 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -3532,30 +3076,66 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -3564,30 +3144,207 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3596,56 +3353,71 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + @@ -3654,58 +3426,103 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + + + + + - - - - + + + + @@ -3714,38 +3531,209 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - @@ -3755,16 +3743,9 @@ - - - - - - - - - - + + + @@ -3891,7 +3872,7 @@ - + @@ -3964,26 +3945,20 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/code/languages/org.mpsqa.testing/sandbox/build.gradle.kts b/code/languages/org.mpsqa.testing/sandbox/build.gradle.kts index 4a4e07c7..b98b832f 100644 --- a/code/languages/org.mpsqa.testing/sandbox/build.gradle.kts +++ b/code/languages/org.mpsqa.testing/sandbox/build.gradle.kts @@ -19,11 +19,29 @@ tasks { } } + val patchedScriptsDir = layout.buildDirectory.dir("patched-scripts") + val patchedBuildXml = patchedScriptsDir.map { dir -> dir.file("build.xml") } + + val patchJacocoBuildscript by registering(Copy::class) { + from(file("build.xml")) + into(patchedScriptsDir) + + val isAarch64 = System.getProperty("os.arch") == "aarch64" + val jnaArch = if (isAarch64) "aarch64" else "amd64" + + filter { + it.replace( + "\"-Djna.boot.library.path=\${artifacts.mps}/lib/jna\"", + "\"-Djna.boot.library.path=\${artifacts.mps}/lib/jna/${jnaArch}\"") + } + } + val assembleJacoco by registering(BuildLanguages::class) { - dependsOn(configureJava, ":resolveMps", ":build_testing_languages") + dependsOn(configureJava, patchJacocoBuildscript, ":resolveMps", ":build_testing_languages") group = LifecycleBasePlugin.BUILD_GROUP description = "Builds jacoco sandbox tests." - script = file("build.xml") + script = patchedBuildXml + scriptArgs = listOf("-Dbasedir=${projectDir}") } assemble { dependsOn(assembleJacoco) } @@ -32,7 +50,9 @@ tasks { dependsOn(configureJava, ":resolveMps", assembleJacoco) group = LifecycleBasePlugin.VERIFICATION_GROUP description = "Executes jacoco sandbox tests." - script = file("build.xml") + script = patchedBuildXml + scriptArgs = listOf("-Dbasedir=${projectDir}") + targets("check") val reportFile = rootProject.file("build/jacoco-reports/jacoco.sandbox/test.xml") diff --git a/code/languages/org.mpsqa.testing/sandbox/build.xml b/code/languages/org.mpsqa.testing/sandbox/build.xml index b7a7aa84..3ad38d69 100644 --- a/code/languages/org.mpsqa.testing/sandbox/build.xml +++ b/code/languages/org.mpsqa.testing/sandbox/build.xml @@ -38,6 +38,8 @@ + + @@ -148,13 +150,13 @@ - - - - - - - + + + + + + + @@ -174,7 +176,6 @@ - @@ -187,6 +188,7 @@ + @@ -231,6 +233,7 @@ + @@ -258,9 +261,7 @@ - - - + @@ -279,6 +280,9 @@ + + + @@ -293,6 +297,9 @@ + + + @@ -322,185 +329,132 @@ + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/code/languages/org.mpsqa.testing/sandbox/jacoco.sandbox.build/models/jacoco.sandbox.build.mps b/code/languages/org.mpsqa.testing/sandbox/jacoco.sandbox.build/models/jacoco.sandbox.build.mps index 8405a4f8..4eb807fd 100644 --- a/code/languages/org.mpsqa.testing/sandbox/jacoco.sandbox.build/models/jacoco.sandbox.build.mps +++ b/code/languages/org.mpsqa.testing/sandbox/jacoco.sandbox.build/models/jacoco.sandbox.build.mps @@ -9,8 +9,8 @@ - - + + From 1a03e9935be483083d3acdc155b0c5a1e05ab9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Tue, 9 Apr 2024 11:08:04 +0200 Subject: [PATCH 3/4] Use rerun-migrations 0.0.3 to support MPS 2023.3 --- build.gradle | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index f014c23a..f5f69131 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { id 'maven-publish' id 'co.riiid.gradle' version '0.4.2' - id 'de.itemis.mps.gradle.launcher' version '2.2.0.+' + id 'de.itemis.mps.gradle.launcher' version '2.3.0.+' } ext.jbrVers = '17.0.8.1-b1000.32' @@ -381,7 +381,7 @@ configurations { } dependencies { - rerunMigrationsBackend("de.itemis.mps.build-backends:rerun-migrations:0.0.2.+") + rerunMigrationsBackend("de.itemis.mps.build-backends:rerun-migrations:0.0.3.+") } tasks.register('rerunMigrations', JavaExec) { @@ -394,10 +394,10 @@ tasks.register('rerunMigrations', JavaExec) { .withJavaExecutable(tasks.named('downloadJbr', DownloadJbrForPlatform).map { it.javaExecutable.path }) .configure(it) - classpath(configurations.rerunMigrationsBackend) classpath(fileTree(mpsHomeDir) { include("lib/**/*.jar") }) + classpath(configurations.rerunMigrationsBackend) mainClass = 'de.itemis.mps.gradle.migrate.MainKt' for (dir in allProjectDirectories()) { @@ -405,6 +405,18 @@ tasks.register('rerunMigrations', JavaExec) { } args("--macro=mpsqa.home::${rootDir}") + + // rerun-migrations needs its own jar added as a plugin + argumentProviders.add(new CommandLineArgumentProvider() { + @Override + Iterable asArguments() { + def config = configurations.rerunMigrationsBackend + + ["--plugin=de.itemis.mps.buildbackends.rerun-migrations::" + + configurations.rerunMigrationsBackend.files(config.dependencies.first()).first()] + } + }) + args("--plugin=jetbrains.mps.console::mps-console") args("--plugin=jetbrains.mps.trove::mps-trove") args("--plugin=jetbrains.mps.ide.modelchecker::mps-modelchecker") From 8f6fd772e1b577f8685c7f3befe3c779b69b15fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergej=20Ko=C5=A1=C4=8Dejev?= Date: Fri, 12 Apr 2024 16:31:54 +0200 Subject: [PATCH 4/4] Run migrations --- ...s_library.performance_typesystem_rules.mps | 10 +-- ...n.jacoco.generator.templates@generator.mps | 88 +++++++++---------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps index a814675a..3ddcc95f 100644 --- a/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps +++ b/code/languages/org.mpsqa.lint/solutions/org.mpsqa.lint.mps_lang.linters_library/models/org.mpsqa.lint.mps_lang.linters_library.performance_typesystem_rules.mps @@ -59,7 +59,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -174,13 +174,13 @@ - + - + diff --git a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps index 2f02d802..8279c095 100644 --- a/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps +++ b/code/languages/org.mpsqa.testing/languages/org.mpsqa.testcov.buildIntegration.jacoco/generator/templates/org.mpsqa.testcov.buildIntegration.jacoco.generator.templates@generator.mps @@ -114,7 +114,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -400,7 +400,7 @@ - + @@ -750,7 +750,7 @@ - + @@ -774,7 +774,7 @@ - + @@ -782,7 +782,7 @@ - + @@ -811,7 +811,7 @@ - + @@ -849,15 +849,15 @@ - + - + - + @@ -888,7 +888,7 @@ - + @@ -898,11 +898,11 @@ - + - + @@ -935,7 +935,7 @@ - + @@ -960,11 +960,11 @@ - + - + @@ -1411,7 +1411,7 @@ - + @@ -1536,7 +1536,7 @@ - + @@ -1687,7 +1687,7 @@ - + @@ -1697,11 +1697,11 @@ - + - + @@ -1734,7 +1734,7 @@ - + @@ -1756,11 +1756,11 @@ - + - + @@ -2035,7 +2035,7 @@ - + @@ -2197,7 +2197,7 @@ - + @@ -2207,11 +2207,11 @@ - + - + @@ -2244,7 +2244,7 @@ - + @@ -2266,11 +2266,11 @@ - + - + @@ -2295,11 +2295,11 @@ - + - + @@ -2308,7 +2308,7 @@ - + @@ -2385,7 +2385,7 @@ - + @@ -2395,11 +2395,11 @@ - + - + @@ -2432,7 +2432,7 @@ - + @@ -2454,11 +2454,11 @@ - + - + @@ -3417,7 +3417,7 @@ - + @@ -3458,7 +3458,7 @@ - +