Skip to content

Commit

Permalink
Merge pull request #859 from IETS3/merge/mps20222
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20222 into maintenance/mps20223
  • Loading branch information
@arimer
arimer authored Mar 19, 2024
2 parents 57e2f82 + 08b90cb commit 5a4af76
Show file tree
Hide file tree
Showing 35 changed files with 1,798 additions and 965 deletions.
5 changes: 4 additions & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,11 @@ if (project.hasProperty('iets3OpenSourceVersion')) {
currentBranch = GitBasedVersioning.gitBranch

def buildNumber = System.env.BUILD_NUMBER.toInteger()
if (currentBranch.startsWith("maintenance/") || currentBranch.startsWith("datev/")) {
if (currentBranch.startsWith("maintenance-")) {
version = "$major.$minor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
} else if (currentBranch.startsWith("datev-loon-staging-") || currentBranch.startsWith("datev-steuer-staging-")){
// branch name will be part of the version
version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber)
} else {
version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber) + "-SNAPSHOT"
}
Expand Down
40 changes: 30 additions & 10 deletions code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/editor.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<imports>
<import index="l80j" ref="r:9e71c0de-f9ab-4b67-96cc-7d9c857513f6(org.iets3.analysis.base.structure)" />
<import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
</imports>
<registry>
<language id="18bc6592-03a6-4e29-a83a-7ff23bde13ba" name="jetbrains.mps.lang.editor">
Expand Down Expand Up @@ -275,17 +276,36 @@
<node concept="3ZlJ5R" id="WieAE6Vwpv" role="VblUZ">
<node concept="3clFbS" id="WieAE6Vwpw" role="2VODD2">
<node concept="3cpWs6" id="1LoQHJHx1Sh" role="3cqZAp">
<node concept="2ShNRf" id="WieAE6Vwqq" role="3cqZAk">
<node concept="1pGfFk" id="WieAE6Vz$8" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="WieAE6Vz_i" role="37wK5m">
<property role="3cmrfH" value="240" />
</node>
<node concept="3cmrfG" id="WieAE6VzB_" role="37wK5m">
<property role="3cmrfH" value="250" />
<node concept="2ShNRf" id="2GzLOsT9A24" role="3cqZAk">
<node concept="1pGfFk" id="2GzLOsT9POZ" role="2ShVmc">
<ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
<node concept="2ShNRf" id="WieAE6Vwqq" role="37wK5m">
<node concept="1pGfFk" id="WieAE6Vz$8" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="WieAE6Vz_i" role="37wK5m">
<property role="3cmrfH" value="240" />
</node>
<node concept="3cmrfG" id="WieAE6VzB_" role="37wK5m">
<property role="3cmrfH" value="250" />
</node>
<node concept="3cmrfG" id="WieAE6VzGw" role="37wK5m">
<property role="3cmrfH" value="250" />
</node>
</node>
</node>
<node concept="3cmrfG" id="WieAE6VzGw" role="37wK5m">
<property role="3cmrfH" value="250" />
<node concept="2ShNRf" id="2GzLOsT9PYQ" role="37wK5m">
<node concept="1pGfFk" id="2GzLOsT9Qtf" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2GzLOsT9Qz9" role="37wK5m">
<property role="3cmrfH" value="10" />
</node>
<node concept="3cmrfG" id="2GzLOsT9QEk" role="37wK5m">
<property role="3cmrfH" value="0" />
</node>
<node concept="3cmrfG" id="2GzLOsT9QPt" role="37wK5m">
<property role="3cmrfH" value="0" />
</node>
</node>
</node>
</node>
</node>
Expand Down
38 changes: 29 additions & 9 deletions code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/behavior.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<import index="zn9m" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.util(MPS.IDEA/)" />
<import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
<import index="mhfm" ref="3f233e7f-b8a6-46d2-a57f-795d56775243/java:org.jetbrains.annotations(Annotations/)" />
<import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
<import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" implicit="true" />
<import index="19m5" ref="r:854255a4-0f76-4555-8c94-d91e2ad4eb02(org.iets3.core.expr.statemachines.structure)" implicit="true" />
</imports>
Expand Down Expand Up @@ -2753,21 +2754,40 @@
<property role="TrG5h" value="characteristicColor" />
<node concept="3Tm1VV" id="6$fTUGAuTlS" role="1B3o_S" />
<node concept="3uibUv" id="6$fTUGAuTlT" role="3clF45">
<ref role="3uigEE" to="z60i:~Color" resolve="Color" />
<ref role="3uigEE" to="lzb2:~JBColor" resolve="JBColor" />
</node>
<node concept="3clFbS" id="6$fTUGAuTlU" role="3clF47">
<node concept="3clFbF" id="6$fTUGAuYX9" role="3cqZAp">
<node concept="2ShNRf" id="7Atos1xLApp" role="3clFbG">
<node concept="1pGfFk" id="7Atos1xLApo" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="7Atos1xLApO" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="7Atos1xLA$B" role="37wK5m">
<property role="3cmrfH" value="210" />
<ref role="37wK5l" to="lzb2:~JBColor.&lt;init&gt;(java.awt.Color,java.awt.Color)" resolve="JBColor" />
<node concept="2ShNRf" id="2GzLOsT9SNg" role="37wK5m">
<node concept="1pGfFk" id="2GzLOsT9TG8" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="7Atos1xLApO" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="7Atos1xLA$B" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="7Atos1xLAEm" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
</node>
</node>
<node concept="3cmrfG" id="7Atos1xLAEm" role="37wK5m">
<property role="3cmrfH" value="210" />
<node concept="2ShNRf" id="2GzLOsT9TO7" role="37wK5m">
<node concept="1pGfFk" id="2GzLOsT9UEU" role="2ShVmc">
<ref role="37wK5l" to="z60i:~Color.&lt;init&gt;(int,int,int)" resolve="Color" />
<node concept="3cmrfG" id="2GzLOsT9UGs" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="2GzLOsT9UJN" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
<node concept="3cmrfG" id="2GzLOsT9UNn" role="37wK5m">
<property role="3cmrfH" value="210" />
</node>
</node>
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit 5a4af76

Please sign in to comment.