From bd87873160972c534a5e3dc142a23111343f371b Mon Sep 17 00:00:00 2001 From: Grigorii Kirgizov Date: Mon, 13 Apr 2020 14:36:37 +0300 Subject: [PATCH] Move baseLanguage.tuplesExt lang to 'samples' and upd build script --- .mps/modules.xml | 6 +- .../generator/templates/main@generator.mps | 0 .../jetbrains.mps.baseLanguage.tuplesExt.mpl | 0 ...ns.mps.baseLanguage.tuplesExt.behavior.mps | 0 ...mps.baseLanguage.tuplesExt.constraints.mps | 0 ...ains.mps.baseLanguage.tuplesExt.editor.mps | 0 ...s.mps.baseLanguage.tuplesExt.structure.mps | 0 ...rains.mps.baseLanguage.tuplesExt.types.mps | 0 ....mps.baseLanguage.tuplesExt.typesystem.mps | 0 ...brains.mps.baseLanguage.tuplesExt.test.msd | 0 ...mps.baseLanguage.tuplesExt.test.tuples.mps | 0 ...seLanguage.tuplesExt.test.tuples@tests.mps | 0 .../models/samples.mpscore.build.mps | 168 +++++++++++++++++- 13 files changed, 170 insertions(+), 4 deletions(-) rename {languages => samples/mpscore/languages}/jetbrains.mps.baseLanguage.tuplesExt/generator/templates/main@generator.mps (100%) rename {languages => samples/mpscore/languages}/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl (100%) rename {languages => samples/mpscore/languages}/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.behavior.mps (100%) rename {languages => samples/mpscore/languages}/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.constraints.mps (100%) rename {languages => samples/mpscore/languages}/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.editor.mps (100%) rename {languages => samples/mpscore/languages}/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.structure.mps (100%) rename {languages => samples/mpscore/languages}/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps (100%) rename {languages => samples/mpscore/languages}/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.typesystem.mps (100%) rename {solutions => samples/mpscore/solutions}/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd (100%) rename {solutions => samples/mpscore/solutions}/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps (100%) rename {solutions => samples/mpscore/solutions}/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps (100%) diff --git a/.mps/modules.xml b/.mps/modules.xml index e5534d85..338aa965 100644 --- a/.mps/modules.xml +++ b/.mps/modules.xml @@ -25,7 +25,7 @@ - + @@ -40,7 +40,7 @@ - + - \ No newline at end of file + diff --git a/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/templates/main@generator.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/templates/main@generator.mps similarity index 100% rename from languages/jetbrains.mps.baseLanguage.tuplesExt/generator/templates/main@generator.mps rename to samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/generator/templates/main@generator.mps diff --git a/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl similarity index 100% rename from languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl rename to samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/jetbrains.mps.baseLanguage.tuplesExt.mpl diff --git a/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.behavior.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.behavior.mps similarity index 100% rename from languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.behavior.mps rename to samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.behavior.mps diff --git a/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.constraints.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.constraints.mps similarity index 100% rename from languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.constraints.mps rename to samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.constraints.mps diff --git a/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.editor.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.editor.mps similarity index 100% rename from languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.editor.mps rename to samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.editor.mps diff --git a/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.structure.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.structure.mps similarity index 100% rename from languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.structure.mps rename to samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.structure.mps diff --git a/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps similarity index 100% rename from languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps rename to samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.types.mps diff --git a/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.typesystem.mps b/samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.typesystem.mps similarity index 100% rename from languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.typesystem.mps rename to samples/mpscore/languages/jetbrains.mps.baseLanguage.tuplesExt/models/jetbrains.mps.baseLanguage.tuplesExt.typesystem.mps diff --git a/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd similarity index 100% rename from solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd rename to samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/jetbrains.mps.baseLanguage.tuplesExt.test.msd diff --git a/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps similarity index 100% rename from solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps rename to samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples.mps diff --git a/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps b/samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps similarity index 100% rename from solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps rename to samples/mpscore/solutions/jetbrains.mps.baseLanguage.tuplesExt.test/models/jetbrains.mps.baseLanguage.tuplesExt.test.tuples@tests.mps diff --git a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps index 77b7685a..e30ae72c 100644 --- a/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps +++ b/samples/mpscore/solutions/samples.mpscore.build/models/samples.mpscore.build.mps @@ -106,6 +106,7 @@ + @@ -118,7 +119,9 @@ - + + + @@ -187,9 +190,15 @@ + + + + + + @@ -595,6 +604,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +