Skip to content

Commit e4576d5

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #2954 from mbeddr/merge/master
Merge maintenance/mps20251 into master
2 parents e76058b + c842964 commit e4576d5

File tree

8 files changed

+94
-76
lines changed

8 files changed

+94
-76
lines changed

‎code/languages/com.mbeddr.build/solutions/com.mbeddr.ext.build/models/com/mbeddr/ext/build.mps

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
<concept id="4560297596904469362" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModule" flags="nn" index="22LTRM">
2222
<reference id="4560297596904469363" name="module" index="22LTRN" />
2323
</concept>
24-
<concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW" />
24+
<concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW">
25+
<child id="7978162869575635130" name="projectPath" index="1RZ71A" />
26+
</concept>
2527
<concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
2628
</language>
2729
<language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
@@ -1183,7 +1185,6 @@
11831185
<property role="3LESm3" value="65b00399-c5df-4987-baee-fe04224907ff" />
11841186
<property role="TrG5h" value="test.ts.ext.components" />
11851187
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1186-
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
11871188
<node concept="1SiIV0" id="3YIXnYN2g6K" role="3bR37C">
11881189
<node concept="3bR9La" id="3YIXnYN2g6L" role="1SiIV1">
11891190
<ref role="3bR37D" to="p6ld:7tgCHAyOtFQ" resolve="com.mbeddr.ext.compositecomponents" />
@@ -1259,13 +1260,7 @@
12591260
<property role="BnDLt" value="true" />
12601261
<property role="3LESm3" value="cc872c37-5126-4cea-bcc0-b45897eba581" />
12611262
<property role="TrG5h" value="test.ts.ext.components.embedded" />
1262-
<property role="aoJFB" value="eYcmk9QOli/sources" />
1263-
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
1264-
<node concept="1SiIV0" id="3F9kUGaP0yE" role="3bR37C">
1265-
<node concept="3bR9La" id="3F9kUGaP0yF" role="1SiIV1">
1266-
<ref role="3bR37D" to="p6ld:7eF9rfAuAO0" resolve="com.mbeddr.ext.components" />
1267-
</node>
1268-
</node>
1263+
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
12691264
<node concept="398BVA" id="3F9kUGaP0yK" role="3LF7KH">
12701265
<ref role="398BVh" node="7Vt15sLW_nb" resolve="mbeddr.ext" />
12711266
<node concept="2Ry0Ak" id="3F9kUGaP0yL" role="iGT6I">
@@ -1287,8 +1282,8 @@
12871282
<ref role="398BVh" node="7Vt15sLW_nb" resolve="mbeddr.ext" />
12881283
<node concept="2Ry0Ak" id="3F9kUGaP0yS" role="iGT6I">
12891284
<property role="2Ry0Am" value="tests" />
1290-
<node concept="2Ry0Ak" id="3F9kUGaP0yT" role="2Ry0An">
1291-
<property role="2Ry0Am" value="test.ts.ext.components" />
1285+
<node concept="2Ry0Ak" id="5ZZlSojjwIq" role="2Ry0An">
1286+
<property role="2Ry0Am" value="test.ts.ext.components.embedded" />
12921287
</node>
12931288
</node>
12941289
</node>
@@ -1327,7 +1322,6 @@
13271322
<property role="TrG5h" value="test.ext.components.nodes_tracing" />
13281323
<property role="3LESm3" value="3296cd37-5e43-4ad5-8880-d0471ef48d5d" />
13291324
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1330-
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
13311325
<node concept="398BVA" id="7IMscoYPuuB" role="3LF7KH">
13321326
<ref role="398BVh" node="7Vt15sLW_nb" resolve="mbeddr.ext" />
13331327
<node concept="2Ry0Ak" id="7IMscoYPuuC" role="iGT6I">
@@ -1394,7 +1388,6 @@
13941388
<property role="TrG5h" value="test.ts.ext.units" />
13951389
<property role="3LESm3" value="3e91b33c-9c18-4307-9388-e5d6e8b6ef30" />
13961390
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1397-
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
13981391
<node concept="398BVA" id="1VMOGozl6KZ" role="3LF7KH">
13991392
<ref role="398BVh" node="7Vt15sLW_nb" resolve="mbeddr.ext" />
14001393
<node concept="2Ry0Ak" id="1VMOGozl6Pe" role="iGT6I">
@@ -1461,7 +1454,6 @@
14611454
<property role="TrG5h" value="test.ts.ext.concurrency" />
14621455
<property role="3LESm3" value="1150a9b6-68b1-44b7-a7e5-cba98fe879c1" />
14631456
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1464-
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
14651457
<node concept="1SiIV0" id="6qOUCDpKTrb" role="3bR37C">
14661458
<node concept="3bR9La" id="6qOUCDpKTrc" role="1SiIV1">
14671459
<ref role="3bR37D" to="p6ld:73JrkgyB$b9" resolve="com.mbeddr.ext.concurrency" />
@@ -1523,7 +1515,6 @@
15231515
<property role="TrG5h" value="test.editor.ext" />
15241516
<property role="3LESm3" value="578ac46a-d23e-4d41-919e-312fa2683e3f" />
15251517
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1526-
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
15271518
<node concept="398BVA" id="5$jJV5ebzIf" role="3LF7KH">
15281519
<ref role="398BVh" node="7Vt15sLW_nb" resolve="mbeddr.ext" />
15291520
<node concept="2Ry0Ak" id="5$jJV5ebzM6" role="iGT6I">
@@ -1603,7 +1594,6 @@
16031594
<property role="TrG5h" value="test.ex.ext.statemachine" />
16041595
<property role="3LESm3" value="3ef85fa6-42d3-4b91-b2be-19b37203ff69" />
16051596
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1606-
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
16071597
<node concept="398BVA" id="73rNuZmLa1Z" role="3LF7KH">
16081598
<ref role="398BVh" node="7Vt15sLW_nb" resolve="mbeddr.ext" />
16091599
<node concept="2Ry0Ak" id="73rNuZmLa20" role="iGT6I">
@@ -1657,7 +1647,6 @@
16571647
<property role="TrG5h" value="test.ext.statemachine.nodes_tracing" />
16581648
<property role="3LESm3" value="ee6f777b-4776-4dc5-8ab5-cff0050a11eb" />
16591649
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1660-
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
16611650
<node concept="398BVA" id="pq_X7YaYwR" role="3LF7KH">
16621651
<ref role="398BVh" node="7Vt15sLW_nb" resolve="mbeddr.ext" />
16631652
<node concept="2Ry0Ak" id="pq_X7YaYAv" role="iGT6I">
@@ -1724,7 +1713,6 @@
17241713
<property role="TrG5h" value="test.ext.math.nodes_tracing" />
17251714
<property role="3LESm3" value="307598f2-bbfa-4d05-8e98-221d003ce000" />
17261715
<property role="aoJFB" value="eYcmk9QOlj/sources_and_tests" />
1727-
<property role="3vZFNd" value="3kCd1ud3JDD/compile_ext" />
17281716
<node concept="398BVA" id="5X2Sm8lVI_P" role="3LF7KH">
17291717
<ref role="398BVh" node="7Vt15sLW_nb" resolve="mbeddr.ext" />
17301718
<node concept="2Ry0Ak" id="5X2Sm8lVI_Q" role="iGT6I">
@@ -1813,7 +1801,11 @@
18131801
<node concept="22LTRM" id="7IMscoYPv3M" role="22LTRK">
18141802
<ref role="22LTRN" node="7IMscoYPuqC" resolve="test.ext.components.nodes_tracing" />
18151803
</node>
1816-
<node concept="24cAiW" id="76N1O$Kj6vH" role="24cAkG" />
1804+
<node concept="24cAiW" id="76N1O$Kj6vH" role="24cAkG">
1805+
<node concept="398BVA" id="5ZZlSojjgGQ" role="1RZ71A">
1806+
<ref role="398BVh" node="7Vt15sLW_nb" resolve="mbeddr.ext" />
1807+
</node>
1808+
</node>
18171809
</node>
18181810
</node>
18191811
</model>

‎code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/models/[email protected]

Lines changed: 55 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<persistence version="9" />
44
<languages>
55
<use id="8585453e-6bfb-4d80-98de-b16074f1d86c" name="jetbrains.mps.lang.test" version="6" />
6-
<use id="f61473f9-130f-42f6-b98d-6c438812c2f6" name="jetbrains.mps.baseLanguage.unitTest" version="1" />
76
<use id="028899e1-bfee-4db6-b470-ed0f9ee5f662" name="com.mbeddr.ext.components.embedded" version="0" />
87
<use id="783af01f-87a7-412c-be99-293a162652b5" name="com.mbeddr.core.embedded" version="1" />
98
<use id="54f2a59b-97bb-4c09-af92-928ebf9c5966" name="com.mbeddr.ext.compositecomponents" version="0" />
9+
<use id="0d04a6cc-773e-4069-b9b0-11884b2ff1c8" name="com.mbeddr.ext.units" version="1" />
1010
<devkit ref="24565007-e59f-42fc-ac10-da3836deec1c(com.mbeddr.components)" />
1111
</languages>
1212
<imports>
@@ -26,9 +26,6 @@
2626
<reference id="8333855927540250453" name="declaration" index="39XzEq" />
2727
</concept>
2828
<concept id="4531408400484511853" name="jetbrains.mps.lang.test.structure.ReportErrorStatementReference" flags="ng" index="2PYRI3" />
29-
<concept id="5097124989038916362" name="jetbrains.mps.lang.test.structure.TestInfo" flags="ng" index="2XOHcx">
30-
<property id="5097124989038916363" name="projectPath" index="2XOHcw" />
31-
</concept>
3229
<concept id="1216913645126" name="jetbrains.mps.lang.test.structure.NodesTestCase" flags="lg" index="1lH9Xt">
3330
<property id="2616911529524314943" name="accessMode" index="3DII0k" />
3431
<child id="1217501822150" name="nodesToCheck" index="1SKRRt" />
@@ -37,6 +34,9 @@
3734
<child id="1216989461394" name="nodeToCheck" index="1qenE9" />
3835
</concept>
3936
</language>
37+
<language id="0d04a6cc-773e-4069-b9b0-11884b2ff1c8" name="com.mbeddr.ext.units">
38+
<concept id="5348704582971040037" name="com.mbeddr.ext.units.structure.UnitConfigItem" flags="ng" index="2eh4Hv" />
39+
</language>
4040
<language id="028899e1-bfee-4db6-b470-ed0f9ee5f662" name="com.mbeddr.ext.components.embedded">
4141
<concept id="1265662339477539521" name="com.mbeddr.ext.components.embedded.structure.InterruptExitHandler" flags="ng" index="RHCfK">
4242
<child id="1265662339477539528" name="body" index="RHCfT" />
@@ -82,6 +82,7 @@
8282
<property id="8774011376396215812" name="linker" index="18_EFo" />
8383
<property id="3963667026125442601" name="gdb" index="3r8Kw1" />
8484
<property id="3963667026125442676" name="make" index="3r8Kxs" />
85+
<property id="1691534949151697076" name="linkerOptions" index="3I8uaA" />
8586
</concept>
8687
<concept id="5323740605968447019" name="com.mbeddr.core.buildconfig.structure.Platform" flags="ng" index="2AWWZO">
8788
<property id="5952395988556102274" name="supportsSharedLibraries" index="uKT8v" />
@@ -97,8 +98,17 @@
9798
</language>
9899
<language id="bd640b8f-4be4-42b6-8dc0-2c94d1ddf606" name="com.mbeddr.ext.components.gen_nomw">
99100
<concept id="2103658896110278831" name="com.mbeddr.ext.components.gen_nomw.structure.NoMwComponentsGenStrategy" flags="ng" index="3i3YCL">
101+
<property id="7883182368027992003" name="removeUnusedRequiredPorts" index="2$yeXr" />
102+
<property id="1553713790141527405" name="wireStatically" index="35zhco" />
100103
<property id="4768833643347725006" name="generateContracts" index="3Ewwow" />
104+
<reference id="1553713790141527407" name="instanceConfig" index="35zhcq" />
105+
</concept>
106+
</language>
107+
<language id="2693fc71-9b0e-4b05-ab13-f57227d675f2" name="com.mbeddr.core.util">
108+
<concept id="4459718605982051949" name="com.mbeddr.core.util.structure.ReportingConfiguration" flags="ng" index="2Q9Fgs">
109+
<child id="4459718605982051999" name="strategy" index="2Q9FjI" />
101110
</concept>
111+
<concept id="4459718605982051980" name="com.mbeddr.core.util.structure.PrintfReportingStrategy" flags="ng" index="2Q9FjX" />
102112
</language>
103113
<language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
104114
<concept id="4459718605982007337" name="com.mbeddr.core.base.structure.IConfigurationContainer" flags="ngI" index="2Q9xDo">
@@ -130,16 +140,24 @@
130140
<concept id="8934095934011938595" name="com.mbeddr.core.modules.structure.EmptyModuleContent" flags="ng" index="2NXPZ9" />
131141
<concept id="7892328519581704407" name="com.mbeddr.core.modules.structure.Argument" flags="ng" index="19RgSI" />
132142
</language>
143+
<language id="06d68b77-b699-4918-83b8-857e63787800" name="com.mbeddr.core.unittest">
144+
<concept id="8610007178384196427" name="com.mbeddr.core.unittest.structure.UnitTestConfigItem" flags="ng" index="12mU2y" />
145+
</language>
133146
<language id="54f2a59b-97bb-4c09-af92-928ebf9c5966" name="com.mbeddr.ext.compositecomponents">
134147
<concept id="7780999115923947731" name="com.mbeddr.ext.compositecomponents.structure.CompositeComponentInstanceConfig" flags="ng" index="5JiAF" />
135148
<concept id="7780999115923829680" name="com.mbeddr.ext.compositecomponents.structure.CompositeComponent" flags="ng" index="5JLF8" />
149+
<concept id="7540109328385923714" name="com.mbeddr.ext.compositecomponents.structure.CompositeComponentsConfigItem" flags="ng" index="1eFCfY" />
136150
</language>
137151
<language id="783af01f-87a7-412c-be99-293a162652b5" name="com.mbeddr.core.embedded">
138152
<concept id="9172009453269286222" name="com.mbeddr.core.embedded.structure.DefaultInterruptKind" flags="ng" index="3_UBHe" />
139153
<concept id="9172009453269230746" name="com.mbeddr.core.embedded.structure.InterruptConfigItem" flags="ng" index="3_UEaq">
140154
<child id="9172009453269286214" name="kind" index="3_UBH6" />
141155
</concept>
142156
<concept id="1017957699896642358" name="com.mbeddr.core.embedded.structure.InterruptDeclaration" flags="ng" index="1O_wwk" />
157+
<concept id="6847490852669234129" name="com.mbeddr.core.embedded.structure.RegisterConfigurationItem" flags="ng" index="3V4jtR">
158+
<child id="6847490852670616471" name="kind" index="3Vb1WL" />
159+
</concept>
160+
<concept id="6847490852670653132" name="com.mbeddr.core.embedded.structure.EmulatedRegisterKind" flags="ng" index="3VbeTE" />
143161
</language>
144162
<language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
145163
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
@@ -853,9 +871,6 @@
853871
</node>
854872
</node>
855873
</node>
856-
<node concept="2XOHcx" id="45k_U8HjFeP">
857-
<property role="2XOHcw" value="${mbeddr.github.core.home}/code/languages/com.mbeddr.ext/" />
858-
</node>
859874
<node concept="1lH9Xt" id="3F9kUGaOQp8">
860875
<property role="TrG5h" value="InterruptChecksInBuildConfiguration" />
861876
<property role="3DII0k" value="2hh8MJdVwqX/command" />
@@ -1068,5 +1083,38 @@
10681083
</node>
10691084
</node>
10701085
</node>
1086+
<node concept="2v9HqL" id="1nTCJdUh_C_">
1087+
<node concept="2AWWZL" id="1nTCJdUh_Ej" role="2AWWZH">
1088+
<property role="2AWWZJ" value="gcc" />
1089+
<property role="3r8Kw1" value="gdb" />
1090+
<property role="3r8Kxs" value="make" />
1091+
<property role="2AWWZI" value="-std=c99" />
1092+
<property role="1FkSt$" value="-g" />
1093+
<property role="3I8uaA" value="" />
1094+
<property role="UXd52" value="g++" />
1095+
<property role="UXd4T" value="-std=c++11" />
1096+
<property role="18_EFo" value="gcc" />
1097+
</node>
1098+
<node concept="2Q9Fgs" id="1nTCJdUh_El" role="2Q9xDr">
1099+
<node concept="2Q9FjX" id="1nTCJdUh_Em" role="2Q9FjI" />
1100+
</node>
1101+
<node concept="3i2$bm" id="1nTCJdUh_Et" role="2Q9xDr">
1102+
<node concept="3i3YCL" id="1nTCJdUh_E_" role="3i30U9">
1103+
<property role="3Ewwow" value="true" />
1104+
<property role="35zhco" value="true" />
1105+
<property role="2$yeXr" value="true" />
1106+
<ref role="35zhcq" to="yrk4:3F9kUGaOOYS" resolve="FlatDummyInstances1" />
1107+
</node>
1108+
</node>
1109+
<node concept="2eh4Hv" id="1nTCJdUn2Te" role="2Q9xDr" />
1110+
<node concept="1eFCfY" id="1nTCJdUn5s9" role="2Q9xDr" />
1111+
<node concept="3V4jtR" id="1nTCJdUn7YM" role="2Q9xDr">
1112+
<node concept="3VbeTE" id="1nTCJdUn7Z6" role="3Vb1WL" />
1113+
</node>
1114+
<node concept="3_UEaq" id="1nTCJdUng6j" role="2Q9xDr">
1115+
<node concept="3_UBHe" id="1nTCJdUng6F" role="3_UBH6" />
1116+
</node>
1117+
<node concept="12mU2y" id="5B69dDbeJFx" role="2Q9xDr" />
1118+
</node>
10711119
</model>
10721120

‎code/languages/com.mbeddr.ext/tests/test.ts.ext.components.embedded/tests.ts.ext.components.embedded.msd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<facet type="tests" />
1313
</facets>
1414
<dependencies>
15-
<dependency reexport="false">97d24244-51db-4e2e-97fc-7bd73b1f5f40(com.mbeddr.ext.components)</dependency>
1615
<dependency reexport="false">028899e1-bfee-4db6-b470-ed0f9ee5f662(com.mbeddr.ext.components.embedded)</dependency>
1716
</dependencies>
1817
<languageVersions>
@@ -37,6 +36,7 @@
3736
<language slang="l:36a565f1-3fa0-42d6-baac-f87e209c9789:com.mbeddr.ext.components.mock" version="0" />
3837
<language slang="l:41911c23-eb23-4ee6-872f-bc7f7ebce290:com.mbeddr.ext.components.test" version="0" />
3938
<language slang="l:54f2a59b-97bb-4c09-af92-928ebf9c5966:com.mbeddr.ext.compositecomponents" version="0" />
39+
<language slang="l:0d04a6cc-773e-4069-b9b0-11884b2ff1c8:com.mbeddr.ext.units" version="1" />
4040
<language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="3" />
4141
<language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
4242
<language slang="l:1c897ba5-9d43-4035-ac7f-0306495743ac:com.mbeddr.mpsutil.interpreter.test" version="0" />

‎code/languages/com.mbeddr.mpsutil/.mps/modules.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ecore.runtime/com.mbeddr.mpsutil.ecore.runtime.msd" folder="rest.ecore.impl" />
112112
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ecore.testing.runtime/com.mbeddr.mpsutil.ecore.testing.runtime.msd" folder="rest.ecore.tests.testUtils" />
113113
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ecore.ui.modelexporter/com.mbeddr.mpsutil.ecore.ui.msd" folder="rest.ecore.impl" />
114-
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd" folder="rest.ecore.impl" />
114+
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.ecore.stubs/com.mbeddr.mpsutil.ecore.stubs.msd" folder="rest.ecore.impl" />
115115
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.editingGuide.execution/com.mbeddr.mpsutil.editingGuide.execution.msd" folder="staging.editingGuide" />
116116
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.editingGuide.plugin/com.mbeddr.mpsutil.editingGuide.plugin.msd" folder="staging.editingGuide" />
117117
<modulePath path="$PROJECT_DIR$/solutions/com.mbeddr.mpsutil.editingGuide.runtime/com.mbeddr.mpsutil.editingGuide.runtime.msd" folder="staging.editingGuide" />

‎code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/com.mbeddr.mpsutil.ecore.stubs.msd renamed to ‎code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.stubs/com.mbeddr.mpsutil.ecore.stubs.msd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<models>
44
<modelRoot contentPath="${module}/lib" type="java_classes">
55
<sourceRoot location="guice.jar" />
6-
<sourceRoot location="javax.inject.jar" />
76
<sourceRoot location="org.eclipse.emf.common.jar" />
87
<sourceRoot location="org.eclipse.emf.ecore.jar" />
98
<sourceRoot location="org.eclipse.emf.ecore.xcore.jar" />
@@ -22,7 +21,6 @@
2221
<facet type="java" languageLevel="JAVA_8" compile="mps" classes="mps" ext="yes">
2322
<classes generated="true" path="${module}/classes_gen" />
2423
<library location="${module}/lib/guice.jar" />
25-
<library location="${module}/lib/javax.inject.jar" />
2624
<library location="${module}/lib/org.eclipse.emf.common.jar" />
2725
<library location="${module}/lib/org.eclipse.emf.ecore.jar" />
2826
<library location="${module}/lib/org.eclipse.emf.ecore.xcore.jar" />

‎code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecoretransformationutils.stubs/lib/.gitignore renamed to ‎code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.ecore.stubs/lib/.gitignore

File renamed without changes.

0 commit comments

Comments
 (0)