Skip to content

Commit 6d036b5

Browse files
coolyacoolya
committed
2 parents 055e090 + 1f4f6a9 commit 6d036b5

File tree

25 files changed

+6186
-4596
lines changed

25 files changed

+6186
-4596
lines changed

‎build.gradle‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if (project.hasProperty("forceCI")) {
3232
ext.ciBuild = true
3333
} else {
3434
//on teamcity we are in a CI build
35-
if (project.hasProperty("teamcity")) {
35+
if (project.hasProperty("teamcity") && !project.hasProperty('mpsHomeDir')) {
3636
ext.ciBuild = true
3737
} else {
3838
ext.ciBuild = false
@@ -64,11 +64,15 @@ ext.dependencyRepositories = [
6464
// Dependency versions
6565

6666
ext.mpsMajor = '2018.1'
67-
ext.mpsMinor = '1'
67+
ext.mpsMinor = '4'
6868

6969

7070
ext.mpsVersion = mpsMinor.isEmpty() ? "$mpsMajor" : "${mpsMajor}.${mpsMinor}"
7171

72+
73+
def minor = '1'
74+
def major = '2018'
75+
7276
if (ciBuild) {
7377
version = GitBasedVersioning.getVersionWithCount(major, minor, System.env.BUILD_NUMBER.toInteger())
7478
println "##teamcity[buildNumber '${version}']"
@@ -113,12 +117,24 @@ repositories {
113117
}
114118
}
115119

116-
task resolveMps(type: Copy) {
117-
dependsOn configurations.mps
118-
from {
119-
configurations.mps.resolve().collect { zipTree(it) }
120+
ext.skipResolveMps = project.hasProperty('mpsHomeDir')
121+
ext.mpsHomeDir = rootProject.file(project.findProperty('mpsHomeDir') ?: "$buildDir/mps")
122+
123+
if (project.skipResolveMps) {
124+
task resolveMps {
125+
doLast {
126+
logger.info "MPS resolution skipped"
127+
logger.info "MPS home: " + mpsHomeDir.getAbsolutePath()
128+
}
129+
}
130+
} else {
131+
task resolveMps(type: Copy) {
132+
dependsOn configurations.mps
133+
from {
134+
configurations.mps.resolve().collect { zipTree(it) }
135+
}
136+
into mpsHomeDir
120137
}
121-
into "$buildDir/mps"
122138
}
123139

124140
// Ant support
@@ -138,7 +154,7 @@ ext.buildScriptClasspath = project.configurations.ant_lib.fileCollection({
138154
def artifactsDir = new File(rootDir, 'artifacts')
139155

140156

141-
ext.mps_home = '-Dmps.home=' + resolveMps.destinationDir.getAbsolutePath()
157+
ext.mps_home = '-Dmps.home=' + mpsHomeDir.getAbsolutePath()
142158
ext.build_dir = '-Dbuild.dir=' + file(rootProject.projectDir.absolutePath).getAbsolutePath()
143159
ext.artifacts_dir = '-Dartifacts.root=' + artifactsDir
144160
ext.pluginVersion = "-Dversion=" + version

‎code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps‎

Lines changed: 21 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@
259259
<child id="1137022507850" name="body" index="2VODD2" />
260260
</concept>
261261
<concept id="1070475354124" name="jetbrains.mps.baseLanguage.structure.ThisExpression" flags="nn" index="Xjq3P" />
262+
<concept id="1070475587102" name="jetbrains.mps.baseLanguage.structure.SuperConstructorInvocation" flags="nn" index="XkiVB" />
262263
<concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
263264
<property id="1070475926801" name="value" index="Xl_RC" />
264265
</concept>
@@ -2359,11 +2360,6 @@
23592360
<node concept="3uibUv" id="3d2YJYTUz5w" role="1zkMxy">
23602361
<ref role="3uigEE" to="exr9:~AbstractCellProvider" resolve="AbstractCellProvider" />
23612362
</node>
2362-
<node concept="312cEg" id="3d2YJYTUz5x" role="jymVt">
2363-
<property role="TrG5h" value="myNode" />
2364-
<node concept="3Tm6S6" id="3d2YJYTUz5y" role="1B3o_S" />
2365-
<node concept="3Tqbb2" id="3d2YJYTUz5z" role="1tU5fm" />
2366-
</node>
23672363
<node concept="312cEg" id="3d2YJYTUz5$" role="jymVt">
23682364
<property role="TrG5h" value="color" />
23692365
<node concept="3Tm6S6" id="3d2YJYTUz5_" role="1B3o_S" />
@@ -2375,17 +2371,10 @@
23752371
<node concept="3cqZAl" id="3d2YJYTUz5C" role="3clF45" />
23762372
<node concept="3Tm1VV" id="3d2YJYTUz5D" role="1B3o_S" />
23772373
<node concept="3clFbS" id="3d2YJYTUz5E" role="3clF47">
2378-
<node concept="3clFbF" id="3d2YJYTUz5F" role="3cqZAp">
2379-
<node concept="37vLTI" id="3d2YJYTUz5G" role="3clFbG">
2380-
<node concept="37vLTw" id="3d2YJYTUz5H" role="37vLTx">
2381-
<ref role="3cqZAo" node="3d2YJYTUz5L" resolve="node" />
2382-
</node>
2383-
<node concept="2OqwBi" id="3d2YJYTUz5I" role="37vLTJ">
2384-
<node concept="Xjq3P" id="3d2YJYTUz5J" role="2Oq$k0" />
2385-
<node concept="2OwXpG" id="3d2YJYTUz5K" role="2OqNvi">
2386-
<ref role="2Oxat5" node="3d2YJYTUz5x" resolve="myNode" />
2387-
</node>
2388-
</node>
2374+
<node concept="XkiVB" id="22ekhmLvzkE" role="3cqZAp">
2375+
<ref role="37wK5l" to="exr9:~AbstractCellProvider.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractCellProvider" />
2376+
<node concept="37vLTw" id="22ekhmLvznC" role="37wK5m">
2377+
<ref role="3cqZAo" node="3d2YJYTUz5L" resolve="node" />
23892378
</node>
23902379
</node>
23912380
</node>
@@ -2398,17 +2387,10 @@
23982387
<node concept="3cqZAl" id="3d2YJYTUz5O" role="3clF45" />
23992388
<node concept="3Tm1VV" id="3d2YJYTUz5P" role="1B3o_S" />
24002389
<node concept="3clFbS" id="3d2YJYTUz5Q" role="3clF47">
2401-
<node concept="3clFbF" id="3d2YJYTUz5R" role="3cqZAp">
2402-
<node concept="37vLTI" id="3d2YJYTUz5S" role="3clFbG">
2403-
<node concept="37vLTw" id="3d2YJYTUz5T" role="37vLTx">
2404-
<ref role="3cqZAo" node="3d2YJYTUz63" resolve="node" />
2405-
</node>
2406-
<node concept="2OqwBi" id="3d2YJYTUz5U" role="37vLTJ">
2407-
<node concept="Xjq3P" id="3d2YJYTUz5V" role="2Oq$k0" />
2408-
<node concept="2OwXpG" id="3d2YJYTUz5W" role="2OqNvi">
2409-
<ref role="2Oxat5" node="3d2YJYTUz5x" resolve="myNode" />
2410-
</node>
2411-
</node>
2390+
<node concept="XkiVB" id="22ekhmLvz8e" role="3cqZAp">
2391+
<ref role="37wK5l" to="exr9:~AbstractCellProvider.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractCellProvider" />
2392+
<node concept="37vLTw" id="22ekhmLvzcf" role="37wK5m">
2393+
<ref role="3cqZAo" node="3d2YJYTUz63" resolve="node" />
24122394
</node>
24132395
</node>
24142396
<node concept="3clFbF" id="3d2YJYTUz5X" role="3cqZAp">
@@ -2467,11 +2449,8 @@
24672449
<node concept="37vLTw" id="3d2YJYTUz6k" role="37wK5m">
24682450
<ref role="3cqZAo" node="3d2YJYTUz6a" resolve="context" />
24692451
</node>
2470-
<node concept="2OqwBi" id="3d2YJYTUz6l" role="37wK5m">
2471-
<node concept="2OwXpG" id="3d2YJYTUz6m" role="2OqNvi">
2472-
<ref role="2Oxat5" node="3d2YJYTUz5x" resolve="myNode" />
2473-
</node>
2474-
<node concept="Xjq3P" id="3d2YJYTUz6n" role="2Oq$k0" />
2452+
<node concept="1rXfSq" id="22ekhmLv_bj" role="37wK5m">
2453+
<ref role="37wK5l" to="exr9:~AbstractCellProvider.getSNode():org.jetbrains.mps.openapi.model.SNode" resolve="getSNode" />
24752454
</node>
24762455
<node concept="3clFb_" id="3d2YJYTUz6o" role="jymVt">
24772456
<property role="1EzhhJ" value="false" />
@@ -2750,11 +2729,6 @@
27502729
<node concept="3uibUv" id="3d2YJYTUz87" role="1zkMxy">
27512730
<ref role="3uigEE" to="exr9:~AbstractCellProvider" resolve="AbstractCellProvider" />
27522731
</node>
2753-
<node concept="312cEg" id="3d2YJYTUz88" role="jymVt">
2754-
<property role="TrG5h" value="myNode" />
2755-
<node concept="3Tm6S6" id="3d2YJYTUz89" role="1B3o_S" />
2756-
<node concept="3Tqbb2" id="3d2YJYTUz8a" role="1tU5fm" />
2757-
</node>
27582732
<node concept="312cEg" id="3d2YJYTUz8b" role="jymVt">
27592733
<property role="TrG5h" value="color" />
27602734
<node concept="3Tm6S6" id="3d2YJYTUz8c" role="1B3o_S" />
@@ -2766,17 +2740,10 @@
27662740
<node concept="3cqZAl" id="3d2YJYTUz8f" role="3clF45" />
27672741
<node concept="3Tm1VV" id="3d2YJYTUz8g" role="1B3o_S" />
27682742
<node concept="3clFbS" id="3d2YJYTUz8h" role="3clF47">
2769-
<node concept="3clFbF" id="3d2YJYTUz8i" role="3cqZAp">
2770-
<node concept="37vLTI" id="3d2YJYTUz8j" role="3clFbG">
2771-
<node concept="37vLTw" id="3d2YJYTUz8k" role="37vLTx">
2772-
<ref role="3cqZAo" node="3d2YJYTUz8o" resolve="node" />
2773-
</node>
2774-
<node concept="2OqwBi" id="3d2YJYTUz8l" role="37vLTJ">
2775-
<node concept="Xjq3P" id="3d2YJYTUz8m" role="2Oq$k0" />
2776-
<node concept="2OwXpG" id="3d2YJYTUz8n" role="2OqNvi">
2777-
<ref role="2Oxat5" node="3d2YJYTUz88" resolve="myNode" />
2778-
</node>
2779-
</node>
2743+
<node concept="XkiVB" id="22ekhmLv_VE" role="3cqZAp">
2744+
<ref role="37wK5l" to="exr9:~AbstractCellProvider.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractCellProvider" />
2745+
<node concept="37vLTw" id="22ekhmLv_Yw" role="37wK5m">
2746+
<ref role="3cqZAo" node="3d2YJYTUz8o" resolve="node" />
27802747
</node>
27812748
</node>
27822749
</node>
@@ -2789,17 +2756,10 @@
27892756
<node concept="3cqZAl" id="3d2YJYTUz8r" role="3clF45" />
27902757
<node concept="3Tm1VV" id="3d2YJYTUz8s" role="1B3o_S" />
27912758
<node concept="3clFbS" id="3d2YJYTUz8t" role="3clF47">
2792-
<node concept="3clFbF" id="3d2YJYTUz8u" role="3cqZAp">
2793-
<node concept="37vLTI" id="3d2YJYTUz8v" role="3clFbG">
2794-
<node concept="37vLTw" id="3d2YJYTUz8w" role="37vLTx">
2795-
<ref role="3cqZAo" node="3d2YJYTUz8E" resolve="node" />
2796-
</node>
2797-
<node concept="2OqwBi" id="3d2YJYTUz8x" role="37vLTJ">
2798-
<node concept="Xjq3P" id="3d2YJYTUz8y" role="2Oq$k0" />
2799-
<node concept="2OwXpG" id="3d2YJYTUz8z" role="2OqNvi">
2800-
<ref role="2Oxat5" node="3d2YJYTUz88" resolve="myNode" />
2801-
</node>
2802-
</node>
2759+
<node concept="XkiVB" id="22ekhmLvA3G" role="3cqZAp">
2760+
<ref role="37wK5l" to="exr9:~AbstractCellProvider.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractCellProvider" />
2761+
<node concept="37vLTw" id="22ekhmLvA7P" role="37wK5m">
2762+
<ref role="3cqZAo" node="3d2YJYTUz8E" resolve="node" />
28032763
</node>
28042764
</node>
28052765
<node concept="3clFbF" id="3d2YJYTUz8$" role="3cqZAp">
@@ -2858,11 +2818,8 @@
28582818
<node concept="37vLTw" id="3d2YJYTUz8V" role="37wK5m">
28592819
<ref role="3cqZAo" node="3d2YJYTUz8L" resolve="context" />
28602820
</node>
2861-
<node concept="2OqwBi" id="3d2YJYTUz8W" role="37wK5m">
2862-
<node concept="2OwXpG" id="3d2YJYTUz8X" role="2OqNvi">
2863-
<ref role="2Oxat5" node="3d2YJYTUz88" resolve="myNode" />
2864-
</node>
2865-
<node concept="Xjq3P" id="3d2YJYTUz8Y" role="2Oq$k0" />
2821+
<node concept="1rXfSq" id="22ekhmLvBU3" role="37wK5m">
2822+
<ref role="37wK5l" to="exr9:~AbstractCellProvider.getSNode():org.jetbrains.mps.openapi.model.SNode" resolve="getSNode" />
28662823
</node>
28672824
<node concept="3clFb_" id="3d2YJYTUz8Z" role="jymVt">
28682825
<property role="1EzhhJ" value="false" />

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3897,6 +3897,12 @@
38973897
<ref role="3bR37D" to="ffeo:7YI57w6K0iE" resolve="jetbrains.mps.lang.editor#1129914002149" />
38983898
</node>
38993899
</node>
3900+
<node concept="1SiIV0" id="44ByU5ZEzWz" role="3bR37C">
3901+
<node concept="3bR9La" id="44ByU5ZEzW$" role="1SiIV1">
3902+
<property role="3bR36h" value="false" />
3903+
<ref role="3bR37D" node="6$BmuzArLGs" resolve="de.itemis.mps.tooltips" />
3904+
</node>
3905+
</node>
39003906
</node>
39013907
<node concept="3rtmxn" id="3xFG3bj5Mmn" role="3bR31x">
39023908
<node concept="3LXTmp" id="3xFG3bj5Mmo" role="3rtmxm">

0 commit comments

Comments
 (0)