Skip to content

Commit fb82fbd

Browse files
mfsoliveiramfsoliveira
authored
Merge pull request #1261 from IETS3/refactor/ActivateMigrationChecking
activate migration checking
2 parents eadf788 + e5f442e commit fb82fbd

File tree

10 files changed

+1837
-1607
lines changed

10 files changed

+1837
-1607
lines changed

‎build.gradle‎

Lines changed: 43 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,17 @@
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
58
import java.time.format.FormatStyle
69

7-
//will pull the groovy classes/types from nexus to the classpath
8-
buildscript {
9-
repositories {
10-
maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
11-
}
12-
dependencies {
13-
classpath 'de.itemis.mps:mps-gradle-plugin:1.29.1.1.d7f2744'
14-
}
15-
}
16-
1710
plugins {
1811
id 'base'
1912
id 'maven-publish'
13+
id 'de.itemis.mps.gradle.common' version '1.29.+'
14+
id 'de.itemis.mps.gradle.launcher' version '2.5.2.+'
2015
id "com.github.breadmoirai.github-release" version "2.4.1"
2116
id "org.cyclonedx.bom" version "1.8.2"
2217
}
@@ -25,6 +20,7 @@ repositories {
2520
maven {
2621
url 'https://artifacts.itemis.cloud/repository/maven-mps/'
2722
}
23+
2824
mavenCentral()
2925
}
3026

@@ -105,6 +101,7 @@ ext.artifactsDir = new File(buildDir, 'artifacts')
105101

106102
configurations {
107103
mps
104+
rerunMigrationsBackend
108105
languageLibs
109106
junitAnt
110107
pcollections // Synced to org.iets3.core.expr.base.collections.stubs/lib
@@ -113,6 +110,7 @@ configurations {
113110

114111
dependencies {
115112
mps "com.jetbrains:mps:$mpsVersion"
113+
rerunMigrationsBackend("de.itemis.mps.build-backends:remigrate:0.0.5.+")
116114
languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
117115
languageLibs "com.mbeddr:platform:$mbeddrVersion"
118116
junitAnt 'org.apache.ant:ant-junit:1.10.15'
@@ -172,6 +170,8 @@ task resolveBigMath(type: Sync) {
172170

173171
task resolveDependencies(dependsOn: ['downloadJbr', resolveMps, resolveLanguageLibs, resolvePcollections, resolveBigMath])
174172

173+
ext.mpsHomeDir = resolveMps.destinationDir
174+
175175
// Default arguments for ant scripts
176176
def defaultScriptArgs = [
177177
'mps.home' : resolveMps.destinationDir,
@@ -255,6 +255,39 @@ task failOnTestError() {
255255
buildAndRunTests.configure { finalizedBy failOnTestError }
256256
check.dependsOn buildAndRunTests
257257

258+
tasks.register('migrate', MpsMigrate) {
259+
dependsOn(resolveMps, 'resolveMpsForModelcheck', 'downloadJbr', 'buildLanguages', 'buildAndRunTests')
260+
javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
261+
262+
haltOnPrecheckFailure = false
263+
haltOnDependencyError = true
264+
265+
mpsHome = mpsHomeDir
266+
267+
projectDirectories.from('code/languages/org.iets3.opensource')
268+
folderMacros['iets3.github.opensource.home'] = rootProject.layout.projectDirectory
269+
270+
pluginRoots.from(new File(mpsHomeDir, 'plugins'))
271+
272+
maxHeapSize = '4G'
273+
}
274+
275+
tasks.register('remigrate', Remigrate) {
276+
mustRunAfter('migrate')
277+
mustRunAfter('buildLanguages', 'buildAndRunTests')
278+
279+
dependsOn(resolveMps, 'resolveMpsForModelcheck','downloadJbr')
280+
281+
javaLauncher = tasks.named('downloadJbr', DownloadJbrForPlatform).flatMap { it.javaLauncher }
282+
283+
mpsHome = mpsHomeDir
284+
projectDirectories.from('code/languages/org.iets3.opensource')
285+
folderMacros['iets3.github.opensource.home'] = rootProject.layout.projectDirectory
286+
287+
pluginRoots.from(new File(mpsHomeDir, 'plugins'))
288+
maxHeapSize = '4G'
289+
}
290+
258291
apply plugin: 'modelcheck'
259292

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

‎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="1IVt4400eGC" 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="1IVt4400eGD" 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.opensource.build.gentests/generator/template/[email protected]‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@
362362
<child id="1235573175711" name="elementType" index="2HTBi0" />
363363
<child id="1235573187520" name="singletonValue" index="2HTEbv" />
364364
</concept>
365-
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
366365
<concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
367366
<concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
368367
<concept id="1201792049884" name="jetbrains.mps.baseLanguage.collections.structure.TranslateOperation" flags="nn" index="3goQfb" />
@@ -2812,17 +2811,17 @@
28122811
<node concept="3clFbF" id="5I1s5NvyvqV" role="3cqZAp">
28132812
<node concept="2OqwBi" id="5I1s5NvyvUh" role="3clFbG">
28142813
<node concept="37vLTw" id="5I1s5NvyvqU" role="2Oq$k0">
2815-
<ref role="3cqZAo" node="5I1s5NvyuVx" resolve="it" />
2814+
<ref role="3cqZAo" node="1IVt4400jbq" resolve="it" />
28162815
</node>
28172816
<node concept="3TrEf2" id="3a3EL8S74N7" role="2OqNvi">
28182817
<ref role="3Tt5mk" to="as3y:5I1s5NvuWcp" resolve="plugin" />
28192818
</node>
28202819
</node>
28212820
</node>
28222821
</node>
2823-
<node concept="Rh6nW" id="5I1s5NvyuVx" role="1bW2Oz">
2822+
<node concept="gl6BB" id="1IVt4400jbq" role="1bW2Oz">
28242823
<property role="TrG5h" value="it" />
2825-
<node concept="2jxLKc" id="5I1s5NvyuVy" role="1tU5fm" />
2824+
<node concept="2jxLKc" id="1IVt4400jbr" role="1tU5fm" />
28262825
</node>
28272826
</node>
28282827
</node>
@@ -2960,7 +2959,7 @@
29602959
</node>
29612960
<node concept="2OqwBi" id="3vNUe1zfYUL" role="3uHU7B">
29622961
<node concept="37vLTw" id="3vNUe1zfYhA" role="2Oq$k0">
2963-
<ref role="3cqZAo" node="3vNUe1zfXzC" resolve="it" />
2962+
<ref role="3cqZAo" node="1IVt4400jbs" resolve="it" />
29642963
</node>
29652964
<node concept="2Xjw5R" id="3vNUe1zfZC8" role="2OqNvi">
29662965
<node concept="1xMEDy" id="3vNUe1zfZCa" role="1xVPHs">
@@ -2973,9 +2972,9 @@
29732972
</node>
29742973
</node>
29752974
</node>
2976-
<node concept="Rh6nW" id="3vNUe1zfXzC" role="1bW2Oz">
2975+
<node concept="gl6BB" id="1IVt4400jbs" role="1bW2Oz">
29772976
<property role="TrG5h" value="it" />
2978-
<node concept="2jxLKc" id="3vNUe1zfXzD" role="1tU5fm" />
2977+
<node concept="2jxLKc" id="1IVt4400jbt" role="1tU5fm" />
29792978
</node>
29802979
</node>
29812980
</node>
@@ -3135,7 +3134,7 @@
31353134
<node concept="3clFbC" id="3vNUe1zg4S2" role="3clFbG">
31363135
<node concept="2OqwBi" id="3vNUe1zg3qu" role="3uHU7B">
31373136
<node concept="37vLTw" id="3vNUe1zg3qv" role="2Oq$k0">
3138-
<ref role="3cqZAo" node="3vNUe1zg3qz" resolve="it" />
3137+
<ref role="3cqZAo" node="1IVt4400jbu" resolve="it" />
31393138
</node>
31403139
<node concept="2Xjw5R" id="3vNUe1zg3qw" role="2OqNvi">
31413140
<node concept="1xMEDy" id="3vNUe1zg3qx" role="1xVPHs">
@@ -3151,9 +3150,9 @@
31513150
</node>
31523151
</node>
31533152
</node>
3154-
<node concept="Rh6nW" id="3vNUe1zg3qz" role="1bW2Oz">
3153+
<node concept="gl6BB" id="1IVt4400jbu" role="1bW2Oz">
31553154
<property role="TrG5h" value="it" />
3156-
<node concept="2jxLKc" id="3vNUe1zg3q$" role="1tU5fm" />
3155+
<node concept="2jxLKc" id="1IVt4400jbv" role="1tU5fm" />
31573156
</node>
31583157
</node>
31593158
</node>

‎code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.math.interpreter/org.iets3.core.expr.math.interpreter.msd‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@
1111
<facets>
1212
<facet type="java" compile="mps" classes="mps" ext="yes">
1313
<classes generated="true" path="${module}/classes_gen" />
14+
<library location="${module}/lib/big-math.jar" />
1415
</facet>
1516
</facets>
16-
<stubModelEntries>
17-
<stubModelEntry path="${module}/lib/big-math.jar" />
18-
</stubModelEntries>
1917
<dependencies>
2018
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
2119
<dependency reexport="false">6b277d9a-d52d-416f-a209-1919bd737f50(org.iets3.core.expr.simpleTypes)</dependency>

0 commit comments

Comments
 (0)