Skip to content

Commit 198dfa2

Browse files
authored
Merge pull request #4 from coolya/mps/2018/2
update for MPS 2018.2
2 parents 0c4aced + 97bf112 commit 198dfa2

File tree

13 files changed

+31
-30
lines changed

13 files changed

+31
-30
lines changed

.mps/migration.xml

+1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
<project version="4">
33
<component name="MigrationProperties">
44
<entry key="jetbrains.mps.ide.mpsmigration.v172.JUnitLibsRepackaging" value="executed" />
5+
<entry key="jetbrains.mps.ide.mpsmigration.v182.ReapplyPatternMigration" value="executed" />
56
</component>
67
</project>

RELEASE_NOTES.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### New in 0.2
2+
* Support for MPS 2018.2
3+
14
### New in 0.1
25
* Initial release
36

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ext.dependencyRepositories = [
3333
'https://projects.itemis.de/nexus/content/repositories/mbeddr_snapshots'
3434
]
3535

36-
def version = "0.1"
36+
def version = "0.2"
3737

3838
repositories {
3939
for (repoUrl in project.dependencyRepositories) {
@@ -57,7 +57,7 @@ File scriptFile(String relativePath) {
5757
new File("$rootDir/build/generated/$relativePath")
5858
}
5959

60-
def mpsBuild = "2017.3.5"
60+
def mpsBuild = "2018.2.5"
6161

6262
// configs
6363
configurations {
@@ -68,7 +68,7 @@ configurations {
6868

6969
dependencies {
7070
mps "com.jetbrains:mps:$mpsBuild"
71-
mpsExtensions "de.itemis.mps:extensions:0.1+"
71+
mpsExtensions "de.itemis.mps:extensions:2018.2.+"
7272
ant_lib "org.apache.ant:ant-junit:1.10.1"
7373
}
7474

build/generated/build-meta.xml

+5-6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<property name="mps.mps.build.counter" value="${import.mps.mps.mps.build.counter}" />
2121
<property name="mpsBootstrapCore.version" value="${import.mps.mpsBootstrapCore.version}" />
2222
<property name="de.itemis.mps.extensions.versionNumber" value="${import.de.itemis.mps.extensions.de.itemis.mps.extensions.versionNumber}" />
23+
<property name="mps.generator.skipUnmodifiedModels" value="false" />
2324

2425
<path id="path.mps.ant.path">
2526
<pathelement location="${mps_home}/lib/ant/lib/ant-mps.jar" />
@@ -45,13 +46,12 @@
4546

4647
<target name="generate" depends="declare-mps-tasks, fetchDependencies">
4748
<echo message="generating" />
48-
<generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true">
49-
<library file="${artifacts.de.itemis.mps.extensions}/de.slisson.mps.all/languages/de.slisson.mps.all/de.slisson.mps.all.build.jar" />
49+
<generate strictMode="true" parallelMode="true" parallelThreads="8" useInplaceTransform="false" hideWarnings="false" createStaticRefs="true" fork="true" skipUnmodifiedModels="${mps.generator.skipUnmodifiedModels}">
50+
<library file="${artifacts.de.itemis.mps.extensions}/de.slisson.mps.all/languages/de.slisson.mps.all/de.itemis.mps.extensions.build.jar" />
5051
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.blTypes.jar" />
5152
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.classifiers.jar" />
5253
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.closures.jar" />
5354
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.collections.jar" />
54-
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.extensionMethods.jar" />
5555
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jar" />
5656
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.javadoc.jar" />
5757
<library file="${artifacts.mps}/languages/baseLanguage/jetbrains.mps.baseLanguage.jdk7.jar" />
@@ -68,20 +68,19 @@
6868
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.core.jar" />
6969
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.dataFlow.jar" />
7070
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.editor.jar" />
71-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.extension.jar" />
7271
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.findUsages.jar" />
7372
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.generationContext.jar" />
7473
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.generator.jar" />
7574
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.intentions.jar" />
7675
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.jar" />
7776
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.migration.runtime.jar" />
77+
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.modelapi.jar" />
7878
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.pattern.jar" />
7979
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.plugin.jar" />
8080
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.project.jar" />
8181
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.quotation.jar" />
8282
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.refactoring.jar" />
8383
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.resources.jar" />
84-
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.jar" />
8584
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.scopes.runtime.jar" />
8685
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.script.jar" />
8786
<library file="${artifacts.mps}/languages/languageDesign/jetbrains.mps.lang.sharedConcepts.jar" />
@@ -142,7 +141,7 @@
142141
<path location="${home}/solutions/de.itemis.mps.generartor.editors.build/source_gen" />
143142
</src>
144143
<classpath>
145-
<fileset file="${artifacts.de.itemis.mps.extensions}/de.slisson.mps.all/languages/de.slisson.mps.all/de.slisson.mps.all.build.jar" />
144+
<fileset file="${artifacts.de.itemis.mps.extensions}/de.slisson.mps.all/languages/de.slisson.mps.all/de.itemis.mps.extensions.build.jar" />
146145
</classpath>
147146
</javac>
148147
</target>

dependencies.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
},
88
"mps": {
99
"com.jetbrains:mps": {
10-
"locked": "2017.3.5",
11-
"requested": "2017.3.5"
10+
"locked": "2018.2.5",
11+
"requested": "2018.2.5"
1212
}
1313
},
1414
"mpsExtensions": {
1515
"de.itemis.mps:extensions": {
16-
"locked": "0.1.82.b8a59d8",
17-
"requested": "0.1+"
16+
"locked": "2018.2.379.7ad274d",
17+
"requested": "2018.2.+"
1818
}
1919
}
2020
}

languages/de.itemis.mps.generator.editors/de.itemis.mps.generator.editors.mpl

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<languageVersions>
1515
<language slang="l:a0ab8c10-c118-4755-ba27-3853435cf524:de.itemis.mps.tooltips" version="0" />
1616
<language slang="l:b8bb702e-43ed-4090-a902-d180d3e5f292:de.slisson.mps.conditionalEditor" version="0" />
17-
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
17+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
1818
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
1919
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
2020
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
@@ -35,13 +35,14 @@
3535
<language slang="l:b401a680-8325-4110-8fd3-84331ff25bef:jetbrains.mps.lang.generator" version="0" />
3636
<language slang="l:d7706f63-9be2-479c-a3da-ae92af1e64d5:jetbrains.mps.lang.generator.generationContext" version="0" />
3737
<language slang="l:d7a92d38-f7db-40d0-8431-763b0c3c9f20:jetbrains.mps.lang.intentions" version="0" />
38+
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
3839
<language slang="l:d4615e3b-d671-4ba9-af01-2b78369b0ba7:jetbrains.mps.lang.pattern" version="1" />
3940
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
4041
<language slang="l:3ecd7c84-cde3-45de-886c-135ecc69b742:jetbrains.mps.lang.refactoring" version="0" />
4142
<language slang="l:982eb8df-2c96-4bd7-9963-11712ea622e5:jetbrains.mps.lang.resources" version="2" />
4243
<language slang="l:0eddeefa-c2d6-4437-bc2c-de50fd4ce470:jetbrains.mps.lang.script" version="0" />
4344
<language slang="l:13744753-c81f-424a-9c1b-cf8943bf4e86:jetbrains.mps.lang.sharedConcepts" version="0" />
44-
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
45+
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
4546
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
4647
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
4748
<language slang="l:b83431fe-5c8f-40bc-8a36-65e25f4dd253:jetbrains.mps.lang.textGen" version="1" />
@@ -60,8 +61,6 @@
6061
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
6162
<module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
6263
<module reference="b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)" version="0" />
63-
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
64-
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
6564
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
6665
</dependencyVersions>
6766
<extendedLanguages>

mps-generator-editors.iml

-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@
88
</content>
99
<orderEntry type="inheritedJdk" />
1010
<orderEntry type="sourceFolder" forTests="false" />
11-
<orderEntry type="library" name="groovy-2.4.14" level="application" />
1211
</component>
1312
</module>

solutions/de.itemis.mps.generartor.editors.build/de.itemis.mps.generartor.editors.build.msd

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</models>
88
<sourcePath />
99
<dependencies>
10-
<dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)</dependency>
10+
<dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)</dependency>
1111
<dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
1212
</dependencies>
1313
<languageVersions>
@@ -20,8 +20,8 @@
2020
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
2121
</languageVersions>
2222
<dependencyVersions>
23+
<module reference="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" version="0" />
2324
<module reference="26daab36-d3ae-44a6-947f-483b321828c7(de.itemis.mps.generartor.editors.build)" version="0" />
24-
<module reference="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)" version="0" />
2525
<module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
2626
</dependencyVersions>
2727
</solution>

solutions/de.itemis.mps.generartor.editors.build/models/all.mps

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
99
</languages>
1010
<imports>
11-
<import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.slisson.mps.all.build)" />
11+
<import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.itemis.mps.extensions.build)" />
1212
<import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
1313
</imports>
1414
<registry>

solutions/de.itemis.mps.generator.editors.plugin/de.itemis.mps.generator.editors.plugin.msd

+3-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<dependency reexport="false">1efe7888-a4e7-4af3-9dab-f5bcc36b0199(de.itemis.mps.generator.editors)</dependency>
1717
</dependencies>
1818
<languageVersions>
19-
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="5" />
19+
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="6" />
2020
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
2121
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
2222
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="0" />
@@ -26,10 +26,11 @@
2626
<language slang="l:fe9d76d7-5809-45c9-ae28-a40915b4d6ff:jetbrains.mps.lang.checkedName" version="0" />
2727
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
2828
<language slang="l:18bc6592-03a6-4e29-a83a-7ff23bde13ba:jetbrains.mps.lang.editor" version="11" />
29+
<language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
2930
<language slang="l:28f9e497-3b42-4291-aeba-0a1039153ab1:jetbrains.mps.lang.plugin" version="2" />
3031
<language slang="l:ef7bf5ac-d06c-4342-b11d-e42104eb9343:jetbrains.mps.lang.plugin.standalone" version="0" />
3132
<language slang="l:3a13115c-633c-4c5c-bbcc-75c4219e9555:jetbrains.mps.lang.quotation" version="0" />
32-
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="8" />
33+
<language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="11" />
3334
<language slang="l:c72da2b9-7cce-4447-8389-f407dc1158b7:jetbrains.mps.lang.structure" version="6" />
3435
<language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
3536
<language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
@@ -50,8 +51,6 @@
5051
<module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
5152
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
5253
<module reference="b401a680-8325-4110-8fd3-84331ff25bef(jetbrains.mps.lang.generator)" version="0" />
53-
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
54-
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
5554
<module reference="9ded098b-ad6a-4657-bfd9-48636cfe8bc3(jetbrains.mps.lang.traceable)" version="0" />
5655
</dependencyVersions>
5756
</solution>

solutions/de.itemis.mps.generators.editors.build.meta/de.itemis.mps.generators.editors.build.meta.msd

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<sourcePath />
99
<dependencies>
1010
<dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
11-
<dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)</dependency>
11+
<dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)</dependency>
1212
<dependency reexport="false">26daab36-d3ae-44a6-947f-483b321828c7(de.itemis.mps.generartor.editors.build)</dependency>
1313
</dependencies>
1414
<languageVersions>
@@ -17,9 +17,9 @@
1717
<language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="1" />
1818
</languageVersions>
1919
<dependencyVersions>
20+
<module reference="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)" version="0" />
2021
<module reference="26daab36-d3ae-44a6-947f-483b321828c7(de.itemis.mps.generartor.editors.build)" version="0" />
2122
<module reference="de1e3d01-b9cb-4696-8ff0-b414f18cdbe9(de.itemis.mps.generators.editors.build.meta)" version="0" />
22-
<module reference="f1fb7b1c-ce0d-423c-9369-4a661d600029(de.slisson.mps.all.build)" version="0" />
2323
<module reference="422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)" version="0" />
2424
</dependencyVersions>
2525
</solution>

solutions/de.itemis.mps.generators.editors.build.meta/models/all/.model

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<model ref="r:29e3785c-bfe3-4352-ae01-94f88fec9f9a(de.itemis.mps.generators.editors.build.meta.all)" content="header">
33
<persistence version="9" />
4+
<attribute name="content" value="header" />
45
<languages>
56
<use id="0cf935df-4699-4e9c-a132-fa109541cba3" name="jetbrains.mps.build.mps" version="5" />
67
<use id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build" version="0" />
78
</languages>
89
<imports>
910
<import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
10-
<import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.slisson.mps.all.build)" />
11+
<import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.itemis.mps.extensions.build)" />
1112
<import index="639z" ref="r:a650770d-512c-4713-b54a-50c3961c80ca(de.itemis.mps.generartor.editors.build.all)" />
1213
</imports>
1314
</model>

solutions/de.itemis.mps.generators.editors.build.meta/models/all/allScripts.mpsr

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<persistence version="9" />
44
<imports>
55
<import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" implicit="true" />
6-
<import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.slisson.mps.all.build)" implicit="true" />
6+
<import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.itemis.mps.extensions.build)" implicit="true" />
77
</imports>
88
<registry>
99
<language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
@@ -144,7 +144,7 @@
144144
<node concept="1SiIV0" id="fPAH2mY_mB" role="3bR37C">
145145
<node concept="3bR9La" id="fPAH2mY_mC" role="1SiIV1">
146146
<property role="3bR36h" value="false" />
147-
<ref role="3bR37D" to="90a9:PE3B26VOkn" resolve="de.slisson.mps.all.build" />
147+
<ref role="3bR37D" to="90a9:PE3B26VOkn" resolve="de.itemis.mps.extensions.build" />
148148
</node>
149149
</node>
150150
<node concept="1SiIV0" id="fPAH2mY_mD" role="3bR37C">

0 commit comments

Comments
 (0)