Skip to content

Commit

Permalink
fixes error messages and build macro usage #1144
Browse files Browse the repository at this point in the history
  • Loading branch information
@mgronover
mgronover committed Jan 15, 2025
1 parent 93c3658 commit 4831754
Show file tree
Hide file tree
Showing 6 changed files with 229 additions and 21 deletions.
66 changes: 65 additions & 1 deletion ...ource/languages/org.iets3.opensource.build.gentests/generator/template/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2626,7 +2626,71 @@
</node>
</node>
</node>
<node concept="2VaTY3" id="3pzPpUGighk" role="2VaTZU" />
<node concept="2Vbh7Z" id="5eJiSDhB6Sw" role="2VaTZU">
<node concept="2pNNFK" id="5eJiSDhB6Sx" role="2Vbh7K">
<property role="2pNNFO" value="mkdir" />
<node concept="2pNUuL" id="5eJiSDhB6Sy" role="2pNNFR">
<property role="2pNUuO" value="dir" />
<node concept="2pMdtt" id="5eJiSDhB6Sz" role="2pMdts">
<property role="2pMdty" value="name" />
<node concept="17Uvod" id="5eJiSDhB6S$" role="lGtFl">
<property role="2qtEX9" value="text" />
<property role="P4ACc" value="479c7a8c-02f9-43b5-9139-d910cb22f298/6666499814681541919/6666499814681541920" />
<node concept="3zFVjK" id="5eJiSDhB6S_" role="3zH0cK">
<node concept="3clFbS" id="5eJiSDhB6SA" role="2VODD2">
<node concept="3clFbF" id="5eJiSDhBaqY" role="3cqZAp">
<node concept="3cpWs3" id="5eJiSDhBc0u" role="3clFbG">
<node concept="Xl_RD" id="5eJiSDhBc0y" role="3uHU7w">
<property role="Xl_RC" value="}" />
</node>
<node concept="3cpWs3" id="5eJiSDhBbGM" role="3uHU7B">
<node concept="Xl_RD" id="5eJiSDhBaqX" role="3uHU7B">
<property role="Xl_RC" value="${" />
</node>
<node concept="2OqwBi" id="5eJiSDhGFzF" role="3uHU7w">
<node concept="2OqwBi" id="5eJiSDhGEPZ" role="2Oq$k0">
<node concept="2OqwBi" id="5eJiSDhB6SD" role="2Oq$k0">
<node concept="30H73N" id="5eJiSDhB6SE" role="2Oq$k0" />
<node concept="3TrEf2" id="5eJiSDhB6SF" role="2OqNvi">
<ref role="3Tt5mk" to="dc1n:5eJiSDhv9db" resolve="outputPath" />
</node>
</node>
<node concept="3TrEf2" id="5eJiSDhGETQ" role="2OqNvi">
<ref role="3Tt5mk" to="dc1n:5eJiSDhG$we" resolve="ref" />
</node>
</node>
<node concept="3TrcHB" id="5eJiSDhGFPE" role="2OqNvi">
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1W57fq" id="5eJiSDhB6SH" role="lGtFl">
<node concept="3IZrLx" id="5eJiSDhB6SI" role="3IZSJc">
<node concept="3clFbS" id="5eJiSDhB6SJ" role="2VODD2">
<node concept="3clFbF" id="5eJiSDhB6SK" role="3cqZAp">
<node concept="2OqwBi" id="5eJiSDhB6SL" role="3clFbG">
<node concept="2OqwBi" id="5eJiSDhB6SM" role="2Oq$k0">
<node concept="30H73N" id="5eJiSDhB6SN" role="2Oq$k0" />
<node concept="3TrEf2" id="5eJiSDhB6SO" role="2OqNvi">
<ref role="3Tt5mk" to="dc1n:5eJiSDhv9db" resolve="outputPath" />
</node>
</node>
<node concept="3x8VRR" id="5eJiSDhB6SP" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2VaTY3" id="5eJiSDhB5oI" role="2VaTZU" />
<node concept="2Vbh7Z" id="3BExUgsKUkr" role="2VaTZU">
<node concept="2pNNFK" id="3BExUgsKUuU" role="2Vbh7K">
<property role="2pNNFO" value="runMPS" />
Expand Down
60 changes: 60 additions & 0 deletions ...ages/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
<concept id="1186403694788" name="jetbrains.mps.lang.editor.structure.ColorStyleClassItem" flags="ln" index="VaVBg">
<property id="1186403713874" name="color" index="Vb096" />
</concept>
<concept id="1186403751766" name="jetbrains.mps.lang.editor.structure.FontStyleStyleClassItem" flags="ln" index="Vb9p2">
<property id="1186403771423" name="style" index="Vbekb" />
</concept>
<concept id="1186404549998" name="jetbrains.mps.lang.editor.structure.ForegroundColorStyleClassItem" flags="ln" index="VechU" />
<concept id="1186414536763" name="jetbrains.mps.lang.editor.structure.BooleanStyleSheetItem" flags="ln" index="VOi$J">
<property id="1186414551515" name="flag" index="VOm3f" />
Expand Down Expand Up @@ -116,6 +119,8 @@
</language>
<language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
<concept id="1179409122411" name="jetbrains.mps.lang.smodel.structure.Node_ConceptMethodCall" flags="nn" index="2qgKlT" />
<concept id="7453996997717780434" name="jetbrains.mps.lang.smodel.structure.Node_GetSConceptOperation" flags="nn" index="2yIwOk" />
<concept id="6870613620390542976" name="jetbrains.mps.lang.smodel.structure.ConceptAliasOperation" flags="ng" index="3n3YKJ" />
<concept id="1172008320231" name="jetbrains.mps.lang.smodel.structure.Node_IsNotNullOperation" flags="nn" index="3x8VRR" />
<concept id="1138056143562" name="jetbrains.mps.lang.smodel.structure.SLinkAccess" flags="nn" index="3TrEf2">
<reference id="1138056516764" name="link" index="3Tt5mk" />
Expand Down Expand Up @@ -241,6 +246,45 @@
<ref role="1NtTu8" to="dc1n:38ougpFqnKp" resolve="jvmArgs" />
</node>
</node>
<node concept="3EZMnI" id="5eJiSDhv9HE" role="3EZMnx">
<node concept="VPM3Z" id="5eJiSDhv9HG" role="3F10Kt" />
<node concept="3XFhqQ" id="5eJiSDhv9HK" role="3EZMnx" />
<node concept="1HlG4h" id="5eJiSDhMotP" role="3EZMnx">
<ref role="1k5W1q" to="o2va:16Vg0jOctJb" resolve="projectPartKeyword" />
<node concept="1HfYo3" id="5eJiSDhMotR" role="1HlULh">
<node concept="3TQlhw" id="5eJiSDhMotT" role="1Hhtcw">
<node concept="3clFbS" id="5eJiSDhMotV" role="2VODD2">
<node concept="3clFbF" id="5eJiSDhMoxi" role="3cqZAp">
<node concept="3cpWs3" id="5eJiSDhMuP6" role="3clFbG">
<node concept="Xl_RD" id="5eJiSDhMuPa" role="3uHU7w">
<property role="Xl_RC" value=":" />
</node>
<node concept="2OqwBi" id="5eJiSDhMscQ" role="3uHU7B">
<node concept="2OqwBi" id="5eJiSDhMqYU" role="2Oq$k0">
<node concept="2OqwBi" id="5eJiSDhMp1K" role="2Oq$k0">
<node concept="pncrf" id="5eJiSDhMoxh" role="2Oq$k0" />
<node concept="3TrEf2" id="5eJiSDhMpmM" role="2OqNvi">
<ref role="3Tt5mk" to="dc1n:5eJiSDhv9db" resolve="outputPath" />
</node>
</node>
<node concept="2yIwOk" id="5eJiSDhMrvC" role="2OqNvi" />
</node>
<node concept="3n3YKJ" id="5eJiSDhMtkY" role="2OqNvi" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="Vb9p2" id="73qhMqXhjV" role="3F10Kt">
<property role="Vbekb" value="g1_k_vY/BOLD" />
</node>
</node>
<node concept="3F1sOY" id="5eJiSDhwFsx" role="3EZMnx">
<ref role="1NtTu8" to="dc1n:5eJiSDhv9db" resolve="outputPath" />
</node>
<node concept="2iRfu4" id="5eJiSDhv9HJ" role="2iSdaV" />
</node>
<node concept="3EZMnI" id="5VsGoLBlZMB" role="3EZMnx">
<node concept="3XFhqQ" id="5VsGoLBlZMC" role="3EZMnx" />
<node concept="3F0ifn" id="5VsGoLBlZMD" role="3EZMnx">
Expand Down Expand Up @@ -350,5 +394,21 @@
</node>
</node>
</node>
<node concept="24kQdi" id="5eJiSDhGV5e">
<ref role="1XX52x" to="dc1n:5eJiSDhG$wd" resolve="BuildMacroRef" />
<node concept="3EZMnI" id="5eJiSDhGV5g" role="2wV5jI">
<node concept="1iCGBv" id="5eJiSDhGV5k" role="3EZMnx">
<ref role="1NtTu8" to="dc1n:5eJiSDhG$we" resolve="ref" />
<ref role="1k5W1q" to="o2va:hwW5xkg" resolve="keyword" />
<node concept="1sVBvm" id="5eJiSDhGV5m" role="1sWHZn">
<node concept="3F0A7n" id="5eJiSDhH8yv" role="2wV5jI">
<property role="1Intyy" value="true" />
<ref role="1NtTu8" to="tpck:h0TrG11" resolve="name" />
</node>
</node>
</node>
<node concept="l2Vlx" id="5eJiSDhGV5j" role="2iSdaV" />
</node>
</node>
</model>

18 changes: 18 additions & 0 deletions ...s/org.iets3.opensource/languages/org.iets3.opensource.build.gentests/models/structure.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,30 @@
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" to="3ior:6qcrfIJFdKY" resolve="BuildSourcePath" />
</node>
<node concept="1TJgyj" id="5eJiSDhv9db" role="1TKVEi">
<property role="IQ2ns" value="6030121483517072203" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="outputPath" />
<ref role="20lvS9" node="5eJiSDhG$wd" resolve="BuildMacroRef" />
</node>
<node concept="1TJgyj" id="38ougpFqnKp" role="1TKVEi">
<property role="IQ2ns" value="3609768169816292377" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="jvmArgs" />
<ref role="20lvS9" to="3ior:3NagsOfThPf" resolve="BuildString" />
</node>
</node>
<node concept="1TIwiD" id="5eJiSDhG$wd">
<property role="EcuMT" value="6030121483520591885" />
<property role="TrG5h" value="BuildMacroRef" />
<property role="34LRSv" value="output directory" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
<node concept="1TJgyj" id="5eJiSDhG$we" role="1TKVEi">
<property role="IQ2ns" value="6030121483520591886" />
<property role="20kJfa" value="ref" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" to="3ior:6qcrfIJFt02" resolve="BuildFolderMacro" />
</node>
</node>
</model>

26 changes: 14 additions & 12 deletions ...ensource/solutions/org.iets3.opensource.build/models/org/iets3/opensource/build/build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@
</imports>
<registry>
<language id="9d000fbd-bdca-4a46-b39b-c5ba9e79b38c" name="org.iets3.opensource.build.gentests">
<concept id="6030121483520591885" name="org.iets3.opensource.build.gentests.structure.BuildMacroRef" flags="ng" index="27ge7">
<reference id="6030121483520591886" name="ref" index="27ge4" />
</concept>
<concept id="4604852045247358203" name="org.iets3.opensource.build.gentests.structure.RunKernelFGeneratedTests" flags="ng" index="2vP9LM">
<reference id="4604852045247358204" name="testModules" index="2vP9LP" />
</concept>
<concept id="8961448726281507188" name="org.iets3.opensource.build.gentests.structure.CustomRunnerAspect" flags="ng" index="1YJUtn">
<child id="6030121483517072203" name="outputPath" index="2OXz1" />
<child id="3609768169816292377" name="jvmArgs" index="1psgkv" />
<child id="8961448726281511691" name="path" index="1YJTkC" />
</concept>
Expand Down Expand Up @@ -15301,6 +15305,9 @@
</node>
</node>
</node>
<node concept="27ge7" id="5eJiSDhM50y" role="2OXz1">
<ref role="27ge4" node="5eJiSDhwOUy" resolve="iets3.interpreterExecutor.genPath" />
</node>
</node>
<node concept="10PD9b" id="2U5AnekTBPu" role="10PD9s" />
<node concept="2sgV4H" id="2U5AnekTBPz" role="1l3spa">
Expand Down Expand Up @@ -15380,13 +15387,13 @@
</node>
</node>
</node>
<node concept="398rNT" id="7C9J_PY1CSN" role="1l3spd">
<node concept="398rNT" id="5eJiSDhwOUy" role="1l3spd">
<property role="TrG5h" value="iets3.interpreterExecutor.genPath" />
<node concept="398BVA" id="7C9J_PY1Imm" role="398pKh">
<node concept="398BVA" id="5eJiSDhwOUz" role="398pKh">
<ref role="398BVh" node="7OQaAJRI74t" resolve="iets3.github.opensource.home" />
<node concept="2Ry0Ak" id="7C9J_PY1Imp" role="iGT6I">
<node concept="2Ry0Ak" id="5eJiSDhwOU$" role="iGT6I">
<property role="2Ry0Am" value="build" />
<node concept="2Ry0Ak" id="7C9J_PY1Ims" role="2Ry0An">
<node concept="2Ry0Ak" id="5eJiSDhwOU_" role="2Ry0An">
<property role="2Ry0Am" value="generatedXMLs" />
</node>
</node>
Expand Down Expand Up @@ -15505,14 +15512,9 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="4MenVKn1A0p" role="3bR37C">
<node concept="3bR9La" id="4MenVKn1A0q" role="1SiIV1">
<ref role="3bR37D" to="ffeo:4Hc8TwAmyoE" resolve="jetbrains.mps.tool.builder" />
</node>
</node>
<node concept="1SiIV0" id="4MenVKn1A0r" role="3bR37C">
<node concept="3bR9La" id="4MenVKn1A0s" role="1SiIV1">
<ref role="3bR37D" to="ffeo:HHlBn9$wJ2" resolve="org.jdom" />
<node concept="1SiIV0" id="5eJiSDhOfKj" role="3bR37C">
<node concept="3bR9La" id="5eJiSDhOfKk" role="1SiIV1">
<ref role="3bR37D" node="3ZBI8Aw30tK" resolve="org.iets3.opensource.build.gentests" />
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit 4831754

Please sign in to comment.