Skip to content

Commit 312f2e1

Browse files
slissonslisson
committed
Merge branch 'shadowmodels'
2 parents 6c0c9cd + 301de44 commit 312f2e1

File tree

20 files changed

+9106
-1198
lines changed

20 files changed

+9106
-1198
lines changed

‎code/.mps/modules.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@
103103
<modulePath path="$PROJECT_DIR$/shadowmodels/solutions/de.q60.mps.shadowmodels.examples.input/de.q60.mps.shadowmodels.examples.input.msd" folder="shadowmodels.examples" />
104104
<modulePath path="$PROJECT_DIR$/shadowmodels/solutions/de.q60.mps.shadowmodels.genplan/de.q60.mps.shadowmodels.genplan.msd" folder="shadowmodels.core" />
105105
<modulePath path="$PROJECT_DIR$/shadowmodels/solutions/de.q60.mps.shadowmodels.runtime/de.q60.mps.shadowmodels.runtime.msd" folder="shadowmodels.core" />
106-
<modulePath path="$PROJECT_DIR$/solutions/de.itemis.mps.modelmerger.runtime/de.itemis.mps.modelmerger.runtime.msd" folder="modelmerger" />
107106
<modulePath path="$PROJECT_DIR$/shadowmodels/solutions/test.de.q60.mps.shadowmodels.examples/test.de.q60.mps.shadowmodels.examples.msd" folder="shadowmodels.tests" />
107+
<modulePath path="$PROJECT_DIR$/solutions/de.itemis.mps.modelmerger.runtime/de.itemis.mps.modelmerger.runtime.msd" folder="modelmerger" />
108+
<modulePath path="$PROJECT_DIR$/shadowmodels/solutions/de.q60.mps.shadowmodels.debugview/de.q60.mps.shadowmodels.debugview.msd" folder="shadowmodels.core" />
108109
<modulePath path="$PROJECT_DIR$/solutions/tests.de.itemis.mps.modelmerger/tests.de.itemis.mps.modelmerger.msd" folder="modelmerger" />
109110
<modulePath path="$PROJECT_DIR$/structurecheck/languages/de.slisson.mps.structurecheck/de.slisson.mps.structurecheck.mpl" folder="structurecheck" />
110111
<modulePath path="$PROJECT_DIR$/structurecheck/solutions/de.slisson.mps.structurecheck.runtime/de.slisson.mps.structurecheck.runtime.msd" folder="structurecheck" />

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 94 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
<model ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.itemis.mps.extensions.build)">
33
<persistence version="9" />
44
<languages>
5-
<use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
6-
<use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="0" />
7-
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="7" />
8-
<use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="1" />
5+
<use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="-1" />
6+
<use id="479c7a8c-02f9-43b5-9139-d910cb22f298" name="jetbrains.mps.core.xml" version="-1" />
7+
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="-1" />
8+
<use id="3600cb0a-44dd-4a5b-9968-22924406419e" name="jetbrains.mps.build.mps.tests" version="-1" />
99
</languages>
1010
<imports>
1111
<import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
@@ -6035,6 +6035,66 @@
60356035
</node>
60366036
</node>
60376037
</node>
6038+
<node concept="1E1JtA" id="5wnrAmUmAQt" role="2G$12L">
6039+
<property role="BnDLt" value="true" />
6040+
<property role="TrG5h" value="de.q60.mps.shadowmodels.debugview" />
6041+
<property role="3LESm3" value="883c431a-2ba7-415a-a318-5eb9b7eb3672" />
6042+
<node concept="398BVA" id="5wnrAmUmB5T" role="3LF7KH">
6043+
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
6044+
<node concept="2Ry0Ak" id="5wnrAmUmBc8" role="iGT6I">
6045+
<property role="2Ry0Am" value="shadowmodels" />
6046+
<node concept="2Ry0Ak" id="5wnrAmUmBov" role="2Ry0An">
6047+
<property role="2Ry0Am" value="solutions" />
6048+
<node concept="2Ry0Ak" id="5wnrAmUmB$Q" role="2Ry0An">
6049+
<property role="2Ry0Am" value="de.q60.mps.shadowmodels.debugview" />
6050+
<node concept="2Ry0Ak" id="5wnrAmUmBLd" role="2Ry0An">
6051+
<property role="2Ry0Am" value="de.q60.mps.shadowmodels.debugview.msd" />
6052+
</node>
6053+
</node>
6054+
</node>
6055+
</node>
6056+
</node>
6057+
<node concept="1SiIV0" id="5wnrAmUmBXx" role="3bR37C">
6058+
<node concept="3bR9La" id="5wnrAmUmBXy" role="1SiIV1">
6059+
<ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
6060+
</node>
6061+
</node>
6062+
<node concept="1SiIV0" id="5wnrAmUmBXz" role="3bR37C">
6063+
<node concept="3bR9La" id="5wnrAmUmBX$" role="1SiIV1">
6064+
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
6065+
</node>
6066+
</node>
6067+
<node concept="1SiIV0" id="5wnrAmUmBX_" role="3bR37C">
6068+
<node concept="3bR9La" id="5wnrAmUmBXA" role="1SiIV1">
6069+
<ref role="3bR37D" node="4iIKqJTZ5Hm" resolve="de.q60.mps.shadowmodels.runtime" />
6070+
</node>
6071+
</node>
6072+
<node concept="1SiIV0" id="5wnrAmUmBXB" role="3bR37C">
6073+
<node concept="3bR9La" id="5wnrAmUmBXC" role="1SiIV1">
6074+
<ref role="3bR37D" to="ffeo:1TaHNgiIbJb" resolve="MPS.Platform" />
6075+
</node>
6076+
</node>
6077+
<node concept="1SiIV0" id="5wnrAmUmBXD" role="3bR37C">
6078+
<node concept="3bR9La" id="5wnrAmUmBXE" role="1SiIV1">
6079+
<ref role="3bR37D" node="4iIKqJTZ5HO" resolve="de.q60.mps.shadowmodels.transformation" />
6080+
</node>
6081+
</node>
6082+
<node concept="1SiIV0" id="5wnrAmUmBXF" role="3bR37C">
6083+
<node concept="3bR9La" id="5wnrAmUmBXG" role="1SiIV1">
6084+
<ref role="3bR37D" to="ffeo:2eDSGe9d1q1" resolve="MPS.Workbench" />
6085+
</node>
6086+
</node>
6087+
<node concept="1SiIV0" id="5wnrAmUmBXH" role="3bR37C">
6088+
<node concept="3bR9La" id="5wnrAmUmBXI" role="1SiIV1">
6089+
<ref role="3bR37D" to="ffeo:1TaHNgiIbIQ" resolve="MPS.Core" />
6090+
</node>
6091+
</node>
6092+
<node concept="1SiIV0" id="5wnrAmUmBXJ" role="3bR37C">
6093+
<node concept="3bR9La" id="5wnrAmUmBXK" role="1SiIV1">
6094+
<ref role="3bR37D" to="ffeo:1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
6095+
</node>
6096+
</node>
6097+
</node>
60386098
<node concept="1E1JtD" id="4iIKqJTZ5Hs" role="2G$12L">
60396099
<property role="BnDLt" value="true" />
60406100
<property role="TrG5h" value="de.q60.mps.polymorphicfunctions" />
@@ -6330,6 +6390,11 @@
63306390
<ref role="3bR37D" node="4iIKqJTZ5Hs" resolve="de.q60.mps.polymorphicfunctions" />
63316391
</node>
63326392
</node>
6393+
<node concept="1SiIV0" id="5b_lkyAfF7_" role="3bR37C">
6394+
<node concept="3bR9La" id="5b_lkyAfF7A" role="1SiIV1">
6395+
<ref role="3bR37D" to="ffeo:7Kfy9QB6L2F" resolve="jetbrains.mps.baseLanguage.tuples" />
6396+
</node>
6397+
</node>
63336398
</node>
63346399
<node concept="1SiIV0" id="4iIKqJTZ63r" role="3bR37C">
63356400
<node concept="3bR9La" id="4iIKqJTZ63s" role="1SiIV1">
@@ -6349,6 +6414,11 @@
63496414
<ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
63506415
</node>
63516416
</node>
6417+
<node concept="1SiIV0" id="5b_lkyAfF7z" role="3bR37C">
6418+
<node concept="3bR9La" id="5b_lkyAfF7$" role="1SiIV1">
6419+
<ref role="3bR37D" to="ffeo:7Kfy9QB6L2F" resolve="jetbrains.mps.baseLanguage.tuples" />
6420+
</node>
6421+
</node>
63526422
</node>
63536423
<node concept="1E1JtD" id="4iIKqJTZ5I0" role="2G$12L">
63546424
<property role="BnDLt" value="true" />
@@ -6483,6 +6553,21 @@
64836553
<ref role="3bR37D" node="BRK1N8p1tm" resolve="de.q60.mps.shadowmodels.examples.blext" />
64846554
</node>
64856555
</node>
6556+
<node concept="1SiIV0" id="2qi4B7uzvIW" role="3bR37C">
6557+
<node concept="3bR9La" id="2qi4B7uzvIX" role="1SiIV1">
6558+
<ref role="3bR37D" to="ffeo:7Kfy9QB6KXW" resolve="jetbrains.mps.lang.core" />
6559+
</node>
6560+
</node>
6561+
<node concept="1SiIV0" id="2qi4B7uzvIY" role="3bR37C">
6562+
<node concept="3bR9La" id="2qi4B7uzvIZ" role="1SiIV1">
6563+
<ref role="3bR37D" node="4iIKqJTZ5I0" resolve="de.q60.mps.shadowmodels.repository" />
6564+
</node>
6565+
</node>
6566+
<node concept="1SiIV0" id="2qi4B7uzvJ0" role="3bR37C">
6567+
<node concept="3bR9La" id="2qi4B7uzvJ1" role="1SiIV1">
6568+
<ref role="3bR37D" node="4iIKqJTZ5HI" resolve="de.q60.mps.shadowmodels.runtimelang" />
6569+
</node>
6570+
</node>
64866571
</node>
64876572
<node concept="1E1JtD" id="BRK1N8p1qk" role="2G$12L">
64886573
<property role="BnDLt" value="true" />
@@ -8149,6 +8234,11 @@
81498234
<ref role="3bR37D" node="BRK1N8p1xv" resolve="de.q60.mps.shadowmodels.examples.input" />
81508235
</node>
81518236
</node>
8237+
<node concept="1SiIV0" id="2qi4B7uvqM5" role="3bR37C">
8238+
<node concept="3bR9La" id="2qi4B7uvqM6" role="1SiIV1">
8239+
<ref role="3bR37D" node="BRK1N8p1tm" resolve="de.q60.mps.shadowmodels.examples.blext" />
8240+
</node>
8241+
</node>
81528242
</node>
81538243
</node>
81548244
<node concept="10PD9b" id="6$6tsX_CF7b" role="10PD9s" />

‎code/shadowmodels/languages/de.q60.mps.shadowmodels.examples.blext/de.q60.mps.shadowmodels.examples.blext.mpl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
<dependencies>
5353
<dependency reexport="false">f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)</dependency>
5454
<dependency reexport="false">bbb5f4e2-794a-4b91-bd27-caf7d437ac9e(de.q60.mps.shadowmodels.examples.blext)</dependency>
55+
<dependency reexport="false">0bf7bc3b-b11d-42e4-b160-93d72af96397(de.q60.mps.shadowmodels.runtimelang)</dependency>
56+
<dependency reexport="false">fdda8484-fc57-4faa-9059-032e2b8b648f(de.q60.mps.shadowmodels.repository)</dependency>
57+
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
5558
</dependencies>
5659
<languageVersions>
5760
<language slang="l:94b64715-a263-4c36-a138-8da14705ffa7:de.q60.mps.shadowmodels.transformation" version="0" />
@@ -85,6 +88,8 @@
8588
<module reference="8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)" version="0" />
8689
<module reference="bbb5f4e2-794a-4b91-bd27-caf7d437ac9e(de.q60.mps.shadowmodels.examples.blext)" version="0" />
8790
<module reference="f5997610-4d27-40a3-872c-d06cf404755b(de.q60.mps.shadowmodels.genplan)" version="0" />
91+
<module reference="fdda8484-fc57-4faa-9059-032e2b8b648f(de.q60.mps.shadowmodels.repository)" version="0" />
92+
<module reference="0bf7bc3b-b11d-42e4-b160-93d72af96397(de.q60.mps.shadowmodels.runtimelang)" version="0" />
8893
<module reference="f3061a53-9226-4cc5-a443-f952ceaf5816(jetbrains.mps.baseLanguage)" version="0" />
8994
<module reference="e39e4a59-8cb6-498e-860e-8fa8361c0d90(jetbrains.mps.baseLanguage.scopes)" version="0" />
9095
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />

0 commit comments

Comments
 (0)