Skip to content

Commit

Permalink
Run migrations
Browse files Browse the repository at this point in the history
  • Loading branch information
sergej-koscejev committed Jul 13, 2024
1 parent 92823ff commit 5e37939
Show file tree
Hide file tree
Showing 73 changed files with 88 additions and 74 deletions.
3 changes: 1 addition & 2 deletions build/scripts/build_all_scripts.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<pathelement location="${artifacts.mps}/lib/ant/lib/ant-mps.jar" />
<fileset dir="${artifacts.mps}/lib">
<include name="util.jar" />
<include name="3rd-party-rt.jar" />
</fileset>
</path>

Expand Down Expand Up @@ -173,7 +172,6 @@
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk8.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.references.runtime.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.jar" />
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.regexp.runtime.jar" />
Expand Down Expand Up @@ -259,6 +257,7 @@
<jvmargs>
<arg value="-ea" />
<arg value="-Xmx1024m" />
<arg value="--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED" />
</jvmargs>
<macro name="mbeddr.formal.home" path="${mbeddr.formal.home}" />
<macro name="mps.home" path="${mps.home}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
<child id="2319506556913311101" name="anchors" index="2Vcluh" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
<language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
<language slang="l:479c7a8c-02f9-43b5-9139-d910cb22f298:jetbrains.mps.core.xml" version="0" />
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
</languageVersions>
<dependencyVersions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<entry key="jetbrains.mps.ide.mpsmigration.v_2019_3.DefaultFacetExplicitPersistence" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_2.SplitMPSCoreStub" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2021_3.ExtractMPSBootStubs" value="executed" />
<entry key="project.migrated.version" value="222" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.ExplicitJavaFacetSettings" value="executed" />
<entry key="jetbrains.mps.ide.mpsmigration.v_2022_3.SplitMPSCoreStub2" value="executed" />
<entry key="project.migrated.version" value="223" />
</component>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
1 change: 0 additions & 1 deletion code/languages/com.mbeddr.formal.safety/.mps/vcs.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$mbeddr.formal.home$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
</component>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@
<node concept="3cpWsn" id="4VhhwF2taB7" role="3cpWs9">
<property role="TrG5h" value="modelCheckerObject" />
<node concept="3uibUv" id="4VhhwF2taB5" role="1tU5fm">
<ref role="3uigEE" to="wyt6:~Object" />
<ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
</node>
<node concept="2OqwBi" id="4VhhwF2taB8" role="33vP2m">
<node concept="37vLTw" id="4VhhwF2taB9" role="2Oq$k0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand All @@ -19,7 +19,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="no">
<classes generated="true" path="${module}/generator/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,12 @@
<module reference="ae6d8005-36be-4cb6-945b-8c8cfc033c51(jetbrains.mps.ide.httpsupport.runtime)" version="0" />
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac5(jetbrains.mps.lang.behavior.api)" version="0" />
<module reference="d936855b-48da-4812-a8a0-2bfddd633ac4(jetbrains.mps.lang.behavior.runtime)" version="0" />
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="446c26eb-2b7b-4bf0-9b35-f83fa582753e(jetbrains.mps.lang.modelapi)" version="0" />
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
<module reference="7866978e-a0f0-4cc7-81bc-4d213d9375e1(jetbrains.mps.lang.smodel)" version="1" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
<module reference="9a4afe51-f114-4595-b5df-048ce3c596be(jetbrains.mps.runtime)" version="0" />
</dependencyVersions>
<mapping-priorities>
<mapping-priority-rule kind="strictly_before">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</modelRoot>
</models>
<facets>
<facet type="java">
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
</facet>
</facets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="8963411245960991886" name="de.itemis.mps.editor.diagram.layout.structure.LayoutMap" flags="ng" index="37mRI7">
<child id="8963411245960991904" name="entries" index="37mRID" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
<child id="2319506556913311101" name="anchors" index="2Vcluh" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
<child id="738815095926774816" name="portLayouts" index="1pap1a" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="8963411245960991886" name="de.itemis.mps.editor.diagram.layout.structure.LayoutMap" flags="ng" index="37mRI7">
<child id="8963411245960991904" name="entries" index="37mRID" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1642,6 +1642,22 @@
</node>
</node>
</node>
<node concept="3rtmxn" id="4on3blxbBkw" role="3bR31x">
<node concept="3LXTmp" id="4on3blxbBkx" role="3rtmxm">
<node concept="3qWCbU" id="4on3blxbBky" role="3LXTna">
<property role="3qWCbO" value="icons/**, resources/**" />
</node>
<node concept="398BVA" id="4on3blxbBkz" role="3LXTmr">
<ref role="398BVh" node="1FMyjUPkmcT" resolve="mbeddr.formal.safety.code" />
<node concept="2Ry0Ak" id="4on3blxbBk$" role="iGT6I">
<property role="2Ry0Am" value="tests" />
<node concept="2Ry0Ak" id="4on3blxbBk_" role="2Ry0An">
<property role="2Ry0Am" value="test.mbeddr.formal.safety.argument.modelquery" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1E1JtA" id="4ziKDEngCOU" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
<child id="2319506556913311101" name="anchors" index="2Vcluh" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
<child id="2319506556913311101" name="anchors" index="2Vcluh" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
<child id="2319506556913311101" name="anchors" index="2Vcluh" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
<child id="2319506556913311101" name="anchors" index="2Vcluh" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="2319506556913310852" name="de.itemis.mps.editor.diagram.layout.structure.Layout_Connection" flags="ng" index="2VclpC">
<child id="2319506556913311101" name="anchors" index="2Vcluh" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<property id="6720495385597071502" name="bounds_y" index="gqqTW" />
<property id="6720495385597071503" name="bounds_width" index="gqqTX" />
<property id="6720495385597071501" name="bounds_x" index="gqqTZ" />
<property id="4583510071007917016" name="transform" index="TgtnS" />
<property id="4583510071007917016" name="portTransform" index="TgtnS" />
</concept>
<concept id="8963411245960991886" name="de.itemis.mps.editor.diagram.layout.structure.LayoutMap" flags="ng" index="37mRI7">
<child id="8963411245960991904" name="entries" index="37mRID" />
Expand Down
Loading

0 comments on commit 5e37939

Please sign in to comment.