Skip to content

Commit

Permalink
Merge branch 'feature/plantuml_integration' of https://github.com/mbe…
Browse files Browse the repository at this point in the history 
…ddr/mbeddr.formal into feature/plantuml_integration
  • Loading branch information
@danielratiu
danielratiu committed Nov 19, 2024
2 parents a1a16b7 + e437633 commit 5a9a825
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 27 deletions.
53 changes: 46 additions & 7 deletions ...safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<concept id="8654221991637384182" name="jetbrains.mps.build.structure.BuildFileIncludesSelector" flags="ng" index="3qWCbU">
<property id="8654221991637384184" name="pattern" index="3qWCbO" />
</concept>
<concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ngI" index="1y1bJS">
<concept id="4701820937132344003" name="jetbrains.mps.build.structure.BuildLayout_Container" flags="ng" index="1y1bJS">
<child id="7389400916848037006" name="children" index="39821P" />
</concept>
<concept id="5610619299013057363" name="jetbrains.mps.build.structure.BuildLayout_ImportContent" flags="ng" index="3ygNvl">
Expand Down Expand Up @@ -144,7 +144,7 @@
<concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
<child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
</concept>
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
<concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
<property id="1169194664001" name="name" index="TrG5h" />
</concept>
<concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
Expand Down Expand Up @@ -230,6 +230,7 @@
<property id="4237758264760168561" name="bugfixNr" index="1lNJF1" />
<child id="6845119683729337285" name="progressY" index="27hAJg" />
<child id="6845119683729294884" name="progressColor" index="27hGoL" />
<child id="6845119683729280452" name="icon" index="27igRh" />
<child id="7962467864633062782" name="progressHeight" index="2gqIGF" />
<child id="922958177840117051" name="script" index="2gvbiD" />
<child id="6108265972537182997" name="aboutScreen" index="2EqU2s" />
Expand All @@ -243,6 +244,8 @@
<child id="781140262677914381" name="company" index="IuKBz" />
<child id="3497141547781549827" name="codename" index="2OjNyQ" />
<child id="1462305029084462472" name="buildDate" index="R$TG_" />
<child id="62678610895108195" name="svg_small" index="1hH5mY" />
<child id="62678610895108142" name="svg" index="1hH5nN" />
<child id="772379520210716142" name="welcomeLogo" index="3vi$VU" />
<child id="437343344536486297" name="help" index="1xUO3H" />
<child id="5894421362117323157" name="support" index="3$HL_E" />
Expand Down Expand Up @@ -345,7 +348,7 @@
<node concept="2Ry0Ak" id="51uLzzZ6tyC" role="iGT6I">
<property role="2Ry0Am" value=".." />
<node concept="2Ry0Ak" id="3Sfdbyg_LZt" role="2Ry0An">
<property role="2Ry0Am" value="MPS_2022_2_2" />
<property role="2Ry0Am" value="MPS_2023_2_2" />
</node>
</node>
</node>
Expand Down Expand Up @@ -16293,15 +16296,15 @@
<node concept="2kB4xC" id="wUJmWCxY0a" role="1l3spd">
<property role="TrG5h" value="build.date" />
<node concept="hHN3E" id="wUJmWCxY0b" role="aVJcv">
<property role="hHN3Y" value="20240104" />
<property role="hHN3Y" value="20241107" />
</node>
</node>
<node concept="2kB4xC" id="wUJmWCxY0c" role="1l3spd">
<property role="TrG5h" value="build.number" />
<node concept="aVJcg" id="wUJmWCxY0d" role="aVJcv">
<node concept="NbPM2" id="wUJmWCxY0e" role="aVJcq">
<node concept="3Mxwew" id="wUJmWCxY0f" role="3MwsjC">
<property role="3MwjfP" value="FASTEN-222.SNAPSHOT" />
<property role="3MwjfP" value="FASTEN-232.SNAPSHOT" />
</node>
</node>
</node>
Expand All @@ -16324,7 +16327,7 @@
<node concept="2Ry0Ak" id="7YjSMFl$i24" role="iGT6I">
<property role="2Ry0Am" value=".." />
<node concept="2Ry0Ak" id="3SfdbygrgG8" role="2Ry0An">
<property role="2Ry0Am" value="MPS_2022_2_2" />
<property role="2Ry0Am" value="MPS_2023_2_2" />
</node>
</node>
</node>
Expand Down Expand Up @@ -16424,7 +16427,7 @@
<node concept="aVJcg" id="wUJmWCxY0I" role="aVJcv">
<node concept="NbPM2" id="wUJmWCxY0J" role="aVJcq">
<node concept="3Mxwew" id="wUJmWCxY0K" role="3MwsjC">
<property role="3MwjfP" value="2024-01-04" />
<property role="3MwjfP" value="2024-11-07" />
</node>
</node>
</node>
Expand Down Expand Up @@ -16774,6 +16777,33 @@
<node concept="NbPM2" id="1TD_kqsGBKy" role="3ZAF11" />
<node concept="NbPM2" id="1TD_kqsGBKz" role="3ZAF12" />
</node>
<node concept="398BVA" id="7khq58x81AN" role="1hH5nN">
<ref role="398BVh" node="wUJmWCxY0q" resolve="rcp.resources" />
<node concept="2Ry0Ak" id="7khq58x81AO" role="iGT6I">
<property role="2Ry0Am" value="icons" />
<node concept="2Ry0Ak" id="7khq58x81AP" role="2Ry0An">
<property role="2Ry0Am" value="fasten32.svg" />
</node>
</node>
</node>
<node concept="398BVA" id="7khq58x81AQ" role="1hH5mY">
<ref role="398BVh" node="wUJmWCxY0q" resolve="rcp.resources" />
<node concept="2Ry0Ak" id="7khq58x81AR" role="iGT6I">
<property role="2Ry0Am" value="icons" />
<node concept="2Ry0Ak" id="7khq58x81AT" role="2Ry0An">
<property role="2Ry0Am" value="fasten16.svg" />
</node>
</node>
</node>
<node concept="398BVA" id="7khq58x81AK" role="27igRh">
<ref role="398BVh" node="wUJmWCxY0q" resolve="rcp.resources" />
<node concept="2Ry0Ak" id="7khq58x81AL" role="iGT6I">
<property role="2Ry0Am" value="icons" />
<node concept="2Ry0Ak" id="7khq58x81AM" role="2Ry0An">
<property role="2Ry0Am" value="fasten32.png" />
</node>
</node>
</node>
</node>
<node concept="2sgV4H" id="wUJmWCzf46" role="1l3spa">
<ref role="1l3spb" to="ffeo:3IKDaVZmzS6" resolve="mps" />
Expand Down Expand Up @@ -17162,6 +17192,9 @@
<node concept="3_I8Xc" id="5cnt3YQNQAI" role="39821P">
<ref role="3_I8Xa" to="al5i:6rBfBe1XyuT" resolve="com.mbeddr.mpsutil.contextactions" />
</node>
<node concept="3_I8Xc" id="7khq58xlv14" role="39821P">
<ref role="3_I8Xa" to="al5i:4SMNYR2Zl4L" resolve="com.mbeddr.mpsutil.actionsfilter" />
</node>
<node concept="28u9K_" id="5cnt3YQEHvb" role="39821P">
<property role="28hIV_" value="doc requires platform, plarform requires jung, plantuml" />
</node>
Expand Down Expand Up @@ -17207,6 +17240,12 @@
<node concept="3_I8Xc" id="3ZV5FZJFBbM" role="39821P">
<ref role="3_I8Xa" to="ffeo:6b4RkXS7XdG" resolve="mps-build" />
</node>
<node concept="3_I8Xc" id="7khq58xcrlD" role="39821P">
<ref role="3_I8Xa" to="90a9:2IcGFIaJVAA" resolve="MPS.Kotlin" />
</node>
<node concept="3_I8Xc" id="7khq58xgP5p" role="39821P">
<ref role="3_I8Xa" to="90a9:6bkzxtWPMLl" resolve="de.itemis.stubs.batik" />
</node>
<node concept="3_I8Xc" id="5ehf6dVy_Rd" role="39821P">
<ref role="3_I8Xa" to="ffeo:4wxeloVufXE" resolve="mps-git4idea" />
</node>
Expand Down
6 changes: 3 additions & 3 deletions gradle.lockfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.13.5=modelcheckBackend
com.fasterxml.jackson:jackson-bom:2.13.5=modelcheckBackend
com.fasterxml.woodstox:woodstox-core:6.4.0=modelcheckBackend
com.jetbrains.jdk:jbr_jcef:17.0.8.1-b1000.32=jbrLinux,jbrMac,jbrWin
com.jetbrains:mps:2023.2.1=mps
com.mbeddr:platform:2023.2.24906.0fb1edb=languageLibs
com.jetbrains:mps:2023.2.2=mps
com.mbeddr:platform:2023.2.24950.f1d53c3=languageLibs
com.xenomachina:kotlin-argparser:2.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
com.xenomachina:xenocom:0.0.7=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
de.itemis.mps.build-backends:execute-generators:1.15.1.98.8f853d3=generateBackend
Expand All @@ -29,5 +29,5 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=executeBackend,generateBackend,mo
org.jetbrains.kotlin:kotlin-stdlib:1.6.21=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
org.jetbrains.kotlin:kotlin-test:1.6.21=modelcheckBackend
org.jetbrains:annotations:13.0=executeBackend,generateBackend,modelcheckBackend,remigrateBackend
org.mpsqa:all-in-one:2023.2.752.8c191d0=languageLibs
org.mpsqa:all-in-one:2023.2.805.20cf17f=languageLibs
empty=
30 changes: 13 additions & 17 deletions rcp_resources/bin/fasten.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
:: JetBrains MPS startup script.
:: Generated by MPS
::----------------------------------------------------------------------
SET IDEA_PATHS_SELECTOR=MPS2022.2
SET PRODUCT=MPS
SET IDEA_PATHS_SELECTOR=MPS2023.2
SET PRODUCT=mps

:: ---------------------------------------------------------------------
:: Ensure IDE_HOME points to the directory where the IDE is installed.
:: ---------------------------------------------------------------------
SET IDE_BIN_DIR=%~dp0
FOR /F "delims=" %%i in ("%IDE_BIN_DIR%\..") DO SET IDE_HOME=%%~fi
FOR /F "delims=" %%i in ("%IDE_BIN_DIR%\..") DO SET "IDE_HOME=%%~fi"

IF "%IDE_BIN_DIR:~-8%" == "bin\win\" (
echo.
Expand All @@ -31,34 +31,30 @@ IF "%IDE_BIN_DIR:~-8%" == "bin\win\" (
SET JDK=
SET IDEA_VENDOR_NAME=JetBrains

IF EXIST "%MPS_JDK%" SET JDK=%MPS_JDK%
IF EXIST "%MPS_JDK%" SET "JDK=%MPS_JDK%"
IF EXIST "%JDK%" GOTO check

SET BITS=64
SET USER_JDK64_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2022.2\mps%BITS%.exe.jdk
SET USER_JDK64_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2023.2\mps%BITS%.exe.jdk
SET BITS=
SET USER_JDK_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2022.2\mps%BITS%.exe.jdk
SET USER_JDK_FILE=%APPDATA%\%IDEA_VENDOR_NAME%\MPS2023.2\mps%BITS%.exe.jdk
IF EXIST "%USER_JDK64_FILE%" (
SET /P JDK=<%USER_JDK64_FILE%
) ELSE (
IF EXIST "%USER_JDK_FILE%" SET /P JDK=<%USER_JDK_FILE%
)
IF NOT "%JDK%" == "" (
IF NOT EXIST "%JDK%" SET JDK="%IDE_HOME%\%JDK%"
IF NOT EXIST "%JDK%" SET "JDK=%IDE_HOME%\%JDK%"
IF EXIST "%JDK%" GOTO check
)

IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" (
IF EXIST "%IDE_HOME%\jbr" SET JDK=%IDE_HOME%\jbr
IF EXIST "%JDK%" GOTO check
)
IF EXIST "%IDE_HOME%\jbr-x86" SET JDK=%IDE_HOME%\jbr-x86
IF EXIST "%IDE_HOME%\jbr" SET "JDK=%IDE_HOME%\jbr"
IF EXIST "%JDK%" GOTO check

IF EXIST "%JDK_HOME%" SET JDK=%JDK_HOME%
IF EXIST "%JDK_HOME%" SET "JDK=%JDK_HOME%"
IF EXIST "%JDK%" GOTO check

IF EXIST "%JAVA_HOME%" SET JDK=%JAVA_HOME%
IF EXIST "%JAVA_HOME%" SET "JDK=%JAVA_HOME%"

:check
SET JAVA_EXE=%JDK%\bin\javaw.exe
Expand All @@ -69,7 +65,7 @@ IF NOT EXIST "%JAVA_EXE%" (
)

SET JRE=%JDK%
IF EXIST "%JRE%\jre" SET JRE=%JDK%\jre
IF EXIST "%JRE%\jre" SET "JRE=%JDK%\jre"

SET BITS=
FINDSTR /B /C:"OS_ARCH=\"x86_64\"" "%JRE%\release" > NUL
Expand Down Expand Up @@ -131,7 +127,7 @@ IF "%VM_OPTIONS_FILE%%USER_VM_OPTIONS_FILE%" == "" (


SET COMMON_JVM_ARGS="-XX:ErrorFile=%USERPROFILE%\java_error_in_%PRODUCT%_%%p.log" "-XX:HeapDumpPath=%USERPROFILE%\java_error_in_%PRODUCT%.hprof" -Didea.paths.selector=%IDEA_PATHS_SELECTOR% -Didea.vendor.name="%IDEA_VENDOR_NAME%" %IDE_PROPERTIES_PROPERTY%
SET IDE_JVM_ARGS=-Didea.platform.prefix=Idea -Didea.jre.check=true -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader
SET IDE_JVM_ARGS=-Didea.platform.prefix=Idea -Didea.jre.check=true -Dpty4j.preferred.native.folder="%IDE_HOME%/lib/pty4j" -Djna.boot.library.path="%IDE_HOME%/lib/jna" -Djava.system.class.loader=com.intellij.util.lang.PathClassLoader
SET ALL_JVM_ARGS=%ACC% %COMMON_JVM_ARGS% %IDE_JVM_ARGS%

SET CLASS_PATH=%IDE_HOME%\lib\*
Expand All @@ -147,7 +143,7 @@ start "" "%JAVA_EXE%" ^
%ALL_JVM_ARGS% ^
-Didea.main.class.name=%MAIN_CLASS% ^
-cp "%CLASS_PATH%" ^
--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/java.awt.dnd.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED --add-opens=java.desktop/java.awt.image=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/sun.awt.datatransfer=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-opens=jdk.jdi/com.sun.tools.jdi=ALL-UNNAMED --add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED ^
--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.nio.charset=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.nio.fs=ALL-UNNAMED --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED --add-opens=java.desktop/java.awt=ALL-UNNAMED --add-opens=java.desktop/java.awt.dnd.peer=ALL-UNNAMED --add-opens=java.desktop/java.awt.event=ALL-UNNAMED --add-opens=java.desktop/java.awt.image=ALL-UNNAMED --add-opens=java.desktop/java.awt.peer=ALL-UNNAMED --add-opens=java.desktop/javax.swing=ALL-UNNAMED --add-opens=java.desktop/javax.swing.plaf.basic=ALL-UNNAMED --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED --add-opens=java.desktop/sun.awt.datatransfer=ALL-UNNAMED --add-opens=java.desktop/sun.awt.image=ALL-UNNAMED --add-opens=java.desktop/sun.awt=ALL-UNNAMED --add-opens=java.desktop/sun.font=ALL-UNNAMED --add-opens=java.desktop/sun.java2d=ALL-UNNAMED --add-opens=java.desktop/sun.swing=ALL-UNNAMED --add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-opens=jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED --add-opens=jdk.jdi/com.sun.tools.jdi=ALL-UNNAMED --add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED ^
%MAIN_CLASS% ^
%*

Expand Down
1 change: 1 addition & 0 deletions rcp_resources/icons/fasten16.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions rcp_resources/icons/fasten32.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5a9a825

Please sign in to comment.