Skip to content

Commit b729d25

Browse files
author
Alexander Pann
authored
Merge pull request #1259 from IETS3/merge/mps20223
Enable migration checking
2 parents 6c41583 + 97c4b90 commit b729d25

File tree

20 files changed

+1876
-1627
lines changed

20 files changed

+1876
-1627
lines changed

‎build.gradle‎

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import de.itemis.mps.gradle.*
2+
import de.itemis.mps.gradle.tasks.MpsMigrate
3+
import de.itemis.mps.gradle.tasks.Remigrate
4+
import de.itemis.mps.gradle.downloadJBR.DownloadJbrForPlatform
25
import groovy.xml.XmlSlurper
36
import java.time.LocalDate
47
import java.time.format.DateTimeFormatter
@@ -9,14 +12,13 @@ buildscript {
912
repositories {
1013
maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
1114
}
12-
dependencies {
13-
classpath 'de.itemis.mps:mps-gradle-plugin:1.23.1.412.a54f29f'
14-
}
1515
}
1616

1717
plugins {
1818
id 'base'
1919
id 'maven-publish'
20+
id 'de.itemis.mps.gradle.common' version '1.29.+'
21+
id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
2022
id "com.github.breadmoirai.github-release" version "2.4.1"
2123
id "org.cyclonedx.bom" version "1.8.2"
2224
}
@@ -125,6 +127,7 @@ wrapper {
125127

126128
configurations {
127129
mps
130+
rerunMigrationsBackend
128131
languageLibs
129132
junitAnt
130133
pcollections // Synced to org.iets3.core.expr.base.collections.stubs/lib
@@ -133,6 +136,7 @@ configurations {
133136

134137
dependencies {
135138
mps "com.jetbrains:mps:$mpsVersion"
139+
rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.0.5.+")
136140
languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
137141
languageLibs "com.mbeddr:platform:$mbeddrVersionSelector"
138142
junitAnt 'org.apache.ant:ant-junit:1.10.6'
@@ -192,6 +196,8 @@ task resolveBigMath(type: Sync) {
192196

193197
task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageLibs, resolvePcollections, resolveBigMath])
194198

199+
ext.mpsHomeDir = resolveMps.destinationDir
200+
195201
// Default arguments for ant scripts
196202
def defaultScriptArgs = [
197203
'mps.home' : resolveMps.destinationDir,
@@ -274,14 +280,47 @@ task failOnTestError() {
274280
buildAndRunTests.configure { finalizedBy failOnTestError }
275281
check.dependsOn buildAndRunTests
276282

283+
tasks.register('migrate', MpsMigrate) {
284+
dependsOn(resolveMps, 'resolveMpsForModelcheck', 'downloadJbr', 'buildLanguages', 'buildAndRunTests')
285+
javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
286+
287+
haltOnPrecheckFailure = false
288+
haltOnDependencyError = true
289+
290+
mpsHome = mpsHomeDir
291+
292+
projectDirectories.from('code/languages/org.iets3.opensource')
293+
folderMacros['iets3.github.opensource.home'] = rootProject.layout.projectDirectory
294+
295+
pluginRoots.from(new File(mpsHomeDir, 'plugins'))
296+
297+
maxHeapSize = '4G'
298+
}
299+
300+
tasks.register('remigrate', Remigrate) {
301+
mustRunAfter('migrate')
302+
mustRunAfter('buildLanguages', 'buildAndRunTests')
303+
304+
dependsOn(resolveMps, 'resolveMpsForModelcheck','downloadJbr')
305+
306+
javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
307+
308+
mpsHome = mpsHomeDir
309+
projectDirectories.from('code/languages/org.iets3.opensource')
310+
folderMacros['iets3.github.opensource.home'] = rootProject.layout.projectDirectory
311+
312+
pluginRoots.from(new File(mpsHomeDir, 'plugins'))
313+
maxHeapSize = '4G'
314+
}
315+
277316
apply plugin: 'modelcheck'
278317

279318
File modelcheckresult = new File("$buildDir/TEST-checkProject.xml")
280319

281320
def pluginsList = []
282321

283322
modelcheck {
284-
projectLocation = new File("$projectDir/code")
323+
projectLocation = new File("$projectDir/code/languages/org.iets3.opensource")
285324
mpsLocation = new File("$buildDir/mps")
286325
plugins = pluginsList
287326
mpsConfig = configurations.mps
@@ -293,12 +332,13 @@ modelcheck {
293332
maxHeap = "4G"
294333
}
295334

296-
335+
/*
297336
afterEvaluate { project ->
298337
check.configure {
299338
dependsOn tasks.named('checkmodels')
300339
}
301340
}
341+
*/
302342

303343
checkmodels {
304344
dependsOn(resolveMps)

‎code/languages/org.iets3.opensource/.mps/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
</option>
1212
</component>
1313
<component name="VcsDirectoryMappings">
14-
<mapping directory="$iets3.github.opensource.home$" vcs="Git" />
14+
<mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
1515
</component>
1616
</project>

‎code/languages/org.iets3.opensource/languages/org.iets3.components.functional/org.iets3.components.functional.mpl‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,6 @@
7979
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
8080
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
8181
<language slang="l:7a5dda62-9140-4668-ab76-d5ed1746f2b2:jetbrains.mps.lang.typesystem" version="5" />
82-
<language slang="l:db8bd035-3f51-41d8-8fed-954c202d18be:org.iets3.analysis.base" version="0" />
83-
<language slang="l:f0fd486f-8577-43e9-b671-3d118449c6e7:org.iets3.components.core" version="10" />
84-
<language slang="l:583939be-ded0-4735-a055-a74f8477fc34:org.iets3.core.attributes" version="0" />
85-
<language slang="l:7b68d745-a7b8-48b9-bd9c-05c0f8725a35:org.iets3.core.base" version="0" />
86-
<language slang="l:cfaa4966-b7d5-4b69-b66a-309a6e1a7290:org.iets3.core.expr.base" version="22" />
87-
<language slang="l:2f7e2e35-6e74-4c43-9fa5-2465d68f5996:org.iets3.core.expr.collections" version="11" />
88-
<language slang="l:9464fa06-5ab9-409b-9274-64ab29588457:org.iets3.core.expr.lambda" version="6" />
89-
<language slang="l:f3eafff0-30d2-46d6-9150-f0f3b880ce27:org.iets3.core.expr.path" version="0" />
90-
<language slang="l:71934284-d7d1-45ee-a054-8c072591085f:org.iets3.core.expr.toplevel" version="6" />
9182
</languageVersions>
9283
<dependencyVersions>
9384
<module reference="3f233e7f-b8a6-46d2-a57f-795d56775243(Annotations)" version="0" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/behavior.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23730,15 +23730,15 @@
2373023730
<ref role="3cqZAo" node="7KDVkAEsa9N" resolve="rightTypeParameters" />
2373123731
</node>
2373223732
<node concept="liA8E" id="7KDVkAEshtb" role="2OqNvi">
23733-
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
23733+
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
2373423734
</node>
2373523735
</node>
2373623736
<node concept="2OqwBi" id="7KDVkAErYMZ" role="3uHU7B">
2373723737
<node concept="37vLTw" id="7KDVkAErWF9" role="2Oq$k0">
2373823738
<ref role="3cqZAo" node="7KDVkAErVEc" resolve="leftTypeParameters" />
2373923739
</node>
2374023740
<node concept="liA8E" id="7KDVkAEs2OT" role="2OqNvi">
23741-
<ref role="37wK5l" to="33ny:~List.size():int" resolve="size" />
23741+
<ref role="37wK5l" to="33ny:~List.size()" resolve="size" />
2374223742
</node>
2374323743
</node>
2374423744
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.base/models/editor.mps‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4415,22 +4415,22 @@
44154415
<node concept="2OqwBi" id="2udM7u8DyDz" role="2Oq$k0">
44164416
<node concept="1Q80Hy" id="2udM7u8Dyyp" role="2Oq$k0" />
44174417
<node concept="liA8E" id="2udM7u8DyTs" role="2OqNvi">
4418-
<ref role="37wK5l" to="f4zo:~EditorCell.getStyle():jetbrains.mps.openapi.editor.style.Style" resolve="getStyle" />
4418+
<ref role="37wK5l" to="f4zo:~EditorCell.getStyle()" resolve="getStyle" />
44194419
</node>
44204420
</node>
44214421
<node concept="liA8E" id="2udM7u8D$2q" role="2OqNvi">
4422-
<ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object):void" resolve="set" />
4422+
<ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object)" resolve="set" />
44234423
<node concept="10M0yZ" id="2udM7u8DtRl" role="37wK5m">
44244424
<ref role="3cqZAo" to="5ueo:~StyleAttributes.BACKGROUND_COLOR" resolve="BACKGROUND_COLOR" />
44254425
<ref role="1PxDUh" to="5ueo:~StyleAttributes" resolve="StyleAttributes" />
44264426
</node>
44274427
<node concept="2OqwBi" id="2udM7u8D$LR" role="37wK5m">
44284428
<node concept="2YIFZM" id="3Ib5UJg3U6x" role="2Oq$k0">
4429-
<ref role="37wK5l" to="hox0:~StyleRegistry.getInstance():jetbrains.mps.openapi.editor.style.StyleRegistry" resolve="getInstance" />
4429+
<ref role="37wK5l" to="hox0:~StyleRegistry.getInstance()" resolve="getInstance" />
44304430
<ref role="1Pybhc" to="hox0:~StyleRegistry" resolve="StyleRegistry" />
44314431
</node>
44324432
<node concept="liA8E" id="2udM7u8D_4p" role="2OqNvi">
4433-
<ref role="37wK5l" to="hox0:~StyleRegistry.getSimpleColor(java.awt.Color):java.awt.Color" resolve="getSimpleColor" />
4433+
<ref role="37wK5l" to="hox0:~StyleRegistry.getSimpleColor(java.awt.Color)" resolve="getSimpleColor" />
44344434
<node concept="10M0yZ" id="43wAXFpM$oS" role="37wK5m">
44354435
<ref role="1PxDUh" node="43wAXFpMhrw" resolve="CoverageEditorUtils" />
44364436
<ref role="3cqZAo" node="43wAXFpMyT7" resolve="NOT_COVERED_BG_COLOR" />
@@ -4511,22 +4511,22 @@
45114511
<node concept="2OqwBi" id="43wAXFoL5Qn" role="2Oq$k0">
45124512
<node concept="1Q80Hy" id="43wAXFoL5Qo" role="2Oq$k0" />
45134513
<node concept="liA8E" id="43wAXFoL5Qp" role="2OqNvi">
4514-
<ref role="37wK5l" to="f4zo:~EditorCell.getStyle():jetbrains.mps.openapi.editor.style.Style" resolve="getStyle" />
4514+
<ref role="37wK5l" to="f4zo:~EditorCell.getStyle()" resolve="getStyle" />
45154515
</node>
45164516
</node>
45174517
<node concept="liA8E" id="43wAXFoL5Qq" role="2OqNvi">
4518-
<ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object):void" resolve="set" />
4518+
<ref role="37wK5l" to="hox0:~Style.set(jetbrains.mps.openapi.editor.style.StyleAttribute,java.lang.Object)" resolve="set" />
45194519
<node concept="10M0yZ" id="43wAXFoL5Qr" role="37wK5m">
45204520
<ref role="3cqZAo" to="5ueo:~StyleAttributes.BACKGROUND_COLOR" resolve="BACKGROUND_COLOR" />
45214521
<ref role="1PxDUh" to="5ueo:~StyleAttributes" resolve="StyleAttributes" />
45224522
</node>
45234523
<node concept="2OqwBi" id="43wAXFoL5Qs" role="37wK5m">
45244524
<node concept="2YIFZM" id="43wAXFoL5Qt" role="2Oq$k0">
4525-
<ref role="37wK5l" to="hox0:~StyleRegistry.getInstance():jetbrains.mps.openapi.editor.style.StyleRegistry" resolve="getInstance" />
4525+
<ref role="37wK5l" to="hox0:~StyleRegistry.getInstance()" resolve="getInstance" />
45264526
<ref role="1Pybhc" to="hox0:~StyleRegistry" resolve="StyleRegistry" />
45274527
</node>
45284528
<node concept="liA8E" id="43wAXFoL5Qu" role="2OqNvi">
4529-
<ref role="37wK5l" to="hox0:~StyleRegistry.getSimpleColor(java.awt.Color):java.awt.Color" resolve="getSimpleColor" />
4529+
<ref role="37wK5l" to="hox0:~StyleRegistry.getSimpleColor(java.awt.Color)" resolve="getSimpleColor" />
45304530
<node concept="10M0yZ" id="43wAXFpM_sv" role="37wK5m">
45314531
<ref role="1PxDUh" node="43wAXFpMhrw" resolve="CoverageEditorUtils" />
45324532
<ref role="3cqZAo" node="43wAXFpMzmM" resolve="COVERED_AND_NOT_INCLUDED_BG_COLOR" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.lambda/models/plugin.mps‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2595,7 +2595,7 @@
25952595
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
25962596
</node>
25972597
<node concept="2qgKlT" id="XbOhLk5$Ln" role="2OqNvi">
2598-
<ref role="37wK5l" to="5s8v:XbOhLk5ek9" resolve="getLamda" />
2598+
<ref role="37wK5l" to="5s8v:XbOhLk5ek9" resolve="getLambda" />
25992599
</node>
26002600
</node>
26012601
<node concept="37vLTw" id="XbOhLk5rQE" role="37vLTJ">
@@ -2674,7 +2674,7 @@
26742674
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
26752675
</node>
26762676
<node concept="2qgKlT" id="XbOhLk5SI_" role="2OqNvi">
2677-
<ref role="37wK5l" to="5s8v:XbOhLk5ekn" resolve="putLamda" />
2677+
<ref role="37wK5l" to="5s8v:XbOhLk5ekn" resolve="putLambda" />
26782678
<node concept="37vLTw" id="XbOhLk5TWD" role="37wK5m">
26792679
<ref role="3cqZAo" node="3fi3fTlpKto" resolve="lambda" />
26802680
</node>
@@ -2700,7 +2700,7 @@
27002700
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
27012701
</node>
27022702
<node concept="2qgKlT" id="5s__jxCqyeA" role="2OqNvi">
2703-
<ref role="37wK5l" to="5s8v:5s__jxCqcBE" resolve="getLamdaArg" />
2703+
<ref role="37wK5l" to="5s8v:5s__jxCqcBE" resolve="getLambdaArg" />
27042704
</node>
27052705
</node>
27062706
</node>
@@ -2733,7 +2733,7 @@
27332733
<ref role="3cqZAo" node="3fi3fTlpKtC" resolve="le" />
27342734
</node>
27352735
<node concept="2qgKlT" id="5s__jxCqZgn" role="2OqNvi">
2736-
<ref role="37wK5l" to="5s8v:5s__jxCq8Sv" resolve="putLamdaArg" />
2736+
<ref role="37wK5l" to="5s8v:5s__jxCq8Sv" resolve="putLambdaArg" />
27372737
<node concept="37vLTw" id="5s__jxCr0ql" role="37wK5m">
27382738
<ref role="3cqZAo" node="5s__jxCqyez" resolve="lambdaArg" />
27392739
</node>
@@ -3313,7 +3313,7 @@
33133313
</node>
33143314
</node>
33153315
<node concept="2AHcQZ" id="3fi3fTmWUT9" role="2AJF6D">
3316-
<ref role="2AI5Lk" to="wyt6:~Override" />
3316+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
33173317
</node>
33183318
</node>
33193319
<node concept="2tJIrI" id="3fi3fTlpKwH" role="jymVt" />
@@ -3650,7 +3650,7 @@
36503650
</node>
36513651
</node>
36523652
<node concept="2AHcQZ" id="3fi3fTmWYbt" role="2AJF6D">
3653-
<ref role="2AI5Lk" to="wyt6:~Override" />
3653+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
36543654
</node>
36553655
</node>
36563656
<node concept="2tJIrI" id="5s__jxCoR7u" role="jymVt" />

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/org.iets3.core.expr.simpleTypes.actions.mps‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
<reference id="5455284157993910961" name="concept" index="2pJxaS" />
7676
<child id="5455284157993911099" name="values" index="2pJxcM" />
7777
</concept>
78+
<concept id="6985522012210254362" name="jetbrains.mps.lang.quotation.structure.NodeBuilderPropertyExpression" flags="nn" index="WxPPo">
79+
<child id="6985522012210254363" name="expression" index="WxPPp" />
80+
</concept>
7881
</language>
7982
<language id="aee9cad2-acd4-4608-aef2-0004f6a1cdbd" name="jetbrains.mps.lang.actions">
8083
<concept id="1158700664498" name="jetbrains.mps.lang.actions.structure.NodeFactories" flags="ng" index="37WguZ">
@@ -429,12 +432,14 @@
429432
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
430433
<node concept="2pJxcG" id="1ikTdkW7bH5" role="2pJxcM">
431434
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
432-
<node concept="2OqwBi" id="1ikTdkW6RBA" role="28ntcv">
433-
<node concept="Jnkvi" id="1ikTdkW6RBB" role="2Oq$k0">
434-
<ref role="1M0zk5" node="1ikTdkW6RBG" resolve="stringLiteral" />
435-
</node>
436-
<node concept="3TrcHB" id="1ikTdkW755V" role="2OqNvi">
437-
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
435+
<node concept="WxPPo" id="65GPZhBZf1o" role="28ntcv">
436+
<node concept="2OqwBi" id="1ikTdkW6RBA" role="WxPPp">
437+
<node concept="Jnkvi" id="1ikTdkW6RBB" role="2Oq$k0">
438+
<ref role="1M0zk5" node="1ikTdkW6RBG" resolve="stringLiteral" />
439+
</node>
440+
<node concept="3TrcHB" id="1ikTdkW755V" role="2OqNvi">
441+
<ref role="3TsBF5" to="5qo5:4rZeNQ6OYRb" resolve="value" />
442+
</node>
438443
</node>
439444
</node>
440445
</node>
@@ -471,9 +476,11 @@
471476
<ref role="2pJxaS" to="87nw:2dWzqxEBMSc" resolve="Word" />
472477
<node concept="2pJxcG" id="1ikTdkW73vp" role="2pJxcM">
473478
<ref role="2pJxcJ" to="87nw:2dWzqxEBMSe" resolve="escapedValue" />
474-
<node concept="2OqwBi" id="1ikTdkW6REe" role="28ntcv">
475-
<node concept="1r4N5L" id="1ikTdkW6REf" role="2Oq$k0" />
476-
<node concept="2Iv5rx" id="1ikTdkW6REg" role="2OqNvi" />
479+
<node concept="WxPPo" id="65GPZhBZf1p" role="28ntcv">
480+
<node concept="2OqwBi" id="1ikTdkW6REe" role="WxPPp">
481+
<node concept="1r4N5L" id="1ikTdkW6REf" role="2Oq$k0" />
482+
<node concept="2Iv5rx" id="1ikTdkW6REg" role="2OqNvi" />
483+
</node>
477484
</node>
478485
</node>
479486
</node>

‎code/languages/org.iets3.opensource/languages/org.iets3.core.expr.simpleTypes/models/plugin.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@
13781378
</node>
13791379
</node>
13801380
<node concept="2AHcQZ" id="1$atYL2NIrH" role="2AJF6D">
1381-
<ref role="2AI5Lk" to="wyt6:~Override" />
1381+
<ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
13821382
</node>
13831383
</node>
13841384
<node concept="3clFb_" id="5ye9uPrx1Ac" role="jymVt">

0 commit comments

Comments
 (0)