Skip to content

Commit 6271c5a

Browse files
author
Alexander Pann
committed
refactor: move extension point to avoid some unnecessary dependencies
1 parent 103aab3 commit 6271c5a

File tree

40 files changed

+5814
-5801
lines changed

40 files changed

+5814
-5801
lines changed

build/scripts/build-allScripts.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<copy todir="${build.layout}/lib">
9797
<fileset dir="${iets3.lang.opensource}/solutions/org.iets3.opensource.build.gentests.rt/lib" />
9898
</copy>
99-
<echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.versionNumber=${de.itemis.mps.extensions.versionNumber}${line.separator}com.mbeddr.mpsutil.actionsfilter.major.version=${com.mbeddr.mpsutil.actionsfilter.major.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.minor.version=${com.mbeddr.mpsutil.actionsfilter.minor.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.build=${com.mbeddr.mpsutil.actionsfilter.build}${line.separator}com.mbeddr.mpsutil.actionsfilter.mbeddr.version=${com.mbeddr.mpsutil.actionsfilter.mbeddr.version}</echo>
99+
<echo file="${build.layout}/build.properties">mps.build.number=${mps.build.number}${line.separator}mps.date=${mps.date}${line.separator}mps.build.vcs.number=${mps.build.vcs.number}${line.separator}mps.teamcity.buildConfName=${mps.teamcity.buildConfName}${line.separator}mps.idea.platform.build.number=${mps.idea.platform.build.number}${line.separator}mps.mps.build.counter=${mps.mps.build.counter}${line.separator}mps.runtimeBuild=${mps.runtimeBuild}${line.separator}mpsBootstrapCore.version.major=${mpsBootstrapCore.version.major}${line.separator}mpsBootstrapCore.version.minor=${mpsBootstrapCore.version.minor}${line.separator}mpsBootstrapCore.version.bugfixNr=${mpsBootstrapCore.version.bugfixNr}${line.separator}mpsBootstrapCore.version.eap=${mpsBootstrapCore.version.eap}${line.separator}mpsBootstrapCore.version=${mpsBootstrapCore.version}${line.separator}com.mbeddr.platform.major.version=${com.mbeddr.platform.major.version}${line.separator}com.mbeddr.platform.minor.version=${com.mbeddr.platform.minor.version}${line.separator}com.mbeddr.platform.build=${com.mbeddr.platform.build}${line.separator}com.mbeddr.platform.mbeddr.version=${com.mbeddr.platform.mbeddr.version}${line.separator}de.itemis.mps.extensions.version=${de.itemis.mps.extensions.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.major.version=${com.mbeddr.mpsutil.actionsfilter.major.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.minor.version=${com.mbeddr.mpsutil.actionsfilter.minor.version}${line.separator}com.mbeddr.mpsutil.actionsfilter.build=${com.mbeddr.mpsutil.actionsfilter.build}${line.separator}com.mbeddr.mpsutil.actionsfilter.mbeddr.version=${com.mbeddr.mpsutil.actionsfilter.mbeddr.version}</echo>
100100
</target>
101101

102102
<target name="buildDependents" />

code/languages/org.iets3.opensource/languages/org.iets3.analysis.base/models/intentions.mps

Lines changed: 81 additions & 83 deletions
Large diffs are not rendered by default.

code/languages/org.iets3.opensource/languages/org.iets3.components.core/models/intentions.mps

Lines changed: 97 additions & 99 deletions
Large diffs are not rendered by default.

code/languages/org.iets3.opensource/languages/org.iets3.components.functional/models/intentions.mps

Lines changed: 113 additions & 115 deletions
Large diffs are not rendered by default.

code/languages/org.iets3.opensource/languages/org.iets3.components.hardware/models/intentions.mps

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<import index="49km" ref="r:6399195b-f53f-4d2f-9194-153d6bba843f(org.iets3.components.hardware.structure)" />
1212
<import index="ja1d" ref="r:6ffe7ec9-6a50-4ee6-b7a4-0f23ccf5129d(org.iets3.components.hardware.plugin)" />
1313
<import index="oq0c" ref="r:6c6155f0-4bbe-4af5-8c26-244d570e21e4(org.iets3.core.expr.base.plugin)" />
14+
<import index="juu2" ref="r:197c9a7f-bef3-4d38-a48a-51524151fecf(org.iets3.core.base.plugin)" />
1415
<import index="c17a" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.language(MPS.OpenAPI/)" implicit="true" />
1516
</imports>
1617
<registry>
@@ -68,9 +69,6 @@
6869
<child id="1081773367580" name="leftExpression" index="3uHU7B" />
6970
</concept>
7071
</language>
71-
<language id="63e0e566-5131-447e-90e3-12ea330e1a00" name="com.mbeddr.mpsutil.blutil">
72-
<concept id="6451706574537082687" name="com.mbeddr.mpsutil.blutil.structure.ShortStaticMethodCall" flags="ng" index="NRdvd" />
73-
</language>
7472
<language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
7573
<concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
7674
<concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -159,17 +157,17 @@
159157
<node concept="3clFbS" id="9W$Ahjc0Yl" role="2VODD2">
160158
<node concept="3clFbF" id="1VPSbnQhq62" role="3cqZAp">
161159
<node concept="2OqwBi" id="1VPSbnQhqp7" role="3clFbG">
162-
<node concept="NRdvd" id="1VPSbnQlN4O" role="2Oq$k0">
163-
<ref role="1Pybhc" to="oq0c:1VPSbnQgjmM" resolve="IntentionCustomizationConfigHelper" />
164-
<ref role="37wK5l" to="oq0c:1VPSbnQgvmx" resolve="getCustomization" />
160+
<node concept="2YIFZM" id="1VPSbnRdli9" role="2Oq$k0">
161+
<ref role="37wK5l" to="juu2:1VPSbnQgvmx" resolve="getCustomization" />
162+
<ref role="1Pybhc" to="juu2:1VPSbnQgjmM" resolve="IntentionCustomizationConfigHelper" />
165163
<node concept="2tJFMh" id="1VPSbnQlN4P" role="37wK5m">
166164
<node concept="ZC_QK" id="1VPSbnQv_yD" role="2tJFKM">
167165
<ref role="2aWVGs" node="9W$Ahjc0Yj" resolve="ReplaceBusKindWithBusType" />
168166
</node>
169167
</node>
170168
</node>
171169
<node concept="liA8E" id="1VPSbnQhq$Y" role="2OqNvi">
172-
<ref role="37wK5l" to="oq0c:~IntentionExecutable.getDescription(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getDescription" />
170+
<ref role="37wK5l" to="juu2:~IntentionExecutable.getDescription(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="getDescription" />
173171
<node concept="2Sf5sV" id="1VPSbnQhqB1" role="37wK5m" />
174172
<node concept="1XNTG" id="1VPSbnQhr3d" role="37wK5m" />
175173
<node concept="1bVj0M" id="1VPSbnQhrex" role="37wK5m">
@@ -196,17 +194,17 @@
196194
<node concept="3clFbS" id="9W$Ahjc0Yn" role="2VODD2">
197195
<node concept="3clFbF" id="1VPSbnQs1Nv" role="3cqZAp">
198196
<node concept="2OqwBi" id="1VPSbnQrMRy" role="3clFbG">
199-
<node concept="NRdvd" id="1VPSbnQrMzn" role="2Oq$k0">
200-
<ref role="1Pybhc" to="oq0c:1VPSbnQgjmM" resolve="IntentionCustomizationConfigHelper" />
201-
<ref role="37wK5l" to="oq0c:1VPSbnQgvmx" resolve="getCustomization" />
197+
<node concept="2YIFZM" id="1VPSbnRdlia" role="2Oq$k0">
198+
<ref role="37wK5l" to="juu2:1VPSbnQgvmx" resolve="getCustomization" />
199+
<ref role="1Pybhc" to="juu2:1VPSbnQgjmM" resolve="IntentionCustomizationConfigHelper" />
202200
<node concept="2tJFMh" id="1VPSbnQrMzo" role="37wK5m">
203201
<node concept="ZC_QK" id="1VPSbnQvA0E" role="2tJFKM">
204202
<ref role="2aWVGs" node="9W$Ahjc0Yj" resolve="ReplaceBusKindWithBusType" />
205203
</node>
206204
</node>
207205
</node>
208206
<node concept="liA8E" id="1VPSbnQrN8a" role="2OqNvi">
209-
<ref role="37wK5l" to="oq0c:~IntentionExecutable.execute(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="execute" />
207+
<ref role="37wK5l" to="juu2:~IntentionExecutable.execute(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="execute" />
210208
<node concept="2Sf5sV" id="1VPSbnQrNcl" role="37wK5m" />
211209
<node concept="1XNTG" id="1VPSbnQrNs4" role="37wK5m" />
212210
<node concept="1bVj0M" id="1VPSbnQrO9U" role="37wK5m">
@@ -309,17 +307,17 @@
309307
<node concept="3clFbS" id="1VPSbnQoUDr" role="2VODD2">
310308
<node concept="3clFbF" id="1VPSbnQoEND" role="3cqZAp">
311309
<node concept="2OqwBi" id="1VPSbnQoFhl" role="3clFbG">
312-
<node concept="NRdvd" id="1VPSbnQoENF" role="2Oq$k0">
313-
<ref role="1Pybhc" to="oq0c:1VPSbnQgjmM" resolve="IntentionCustomizationConfigHelper" />
314-
<ref role="37wK5l" to="oq0c:1VPSbnQgvmx" resolve="getCustomization" />
310+
<node concept="2YIFZM" id="1VPSbnRdlib" role="2Oq$k0">
311+
<ref role="37wK5l" to="juu2:1VPSbnQgvmx" resolve="getCustomization" />
312+
<ref role="1Pybhc" to="juu2:1VPSbnQgjmM" resolve="IntentionCustomizationConfigHelper" />
315313
<node concept="2tJFMh" id="1VPSbnQoENG" role="37wK5m">
316314
<node concept="ZC_QK" id="1VPSbnQv_Rd" role="2tJFKM">
317315
<ref role="2aWVGs" node="9W$Ahjc0Yj" resolve="ReplaceBusKindWithBusType" />
318316
</node>
319317
</node>
320318
</node>
321319
<node concept="liA8E" id="1VPSbnQoFRu" role="2OqNvi">
322-
<ref role="37wK5l" to="oq0c:~IntentionExecutable.isApplicable(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="isApplicable" />
320+
<ref role="37wK5l" to="juu2:~IntentionExecutable.isApplicable(org.jetbrains.mps.openapi.model.SNode,jetbrains.mps.openapi.editor.EditorContext)" resolve="isApplicable" />
323321
<node concept="2Sf5sV" id="1VPSbnQoGeh" role="37wK5m" />
324322
<node concept="1XNTG" id="1VPSbnQoGDc" role="37wK5m" />
325323
<node concept="1bVj0M" id="1VPSbnQoGQZ" role="37wK5m">
@@ -340,17 +338,17 @@
340338
<node concept="3clFbS" id="1VPSbnQCA6q" role="2VODD2">
341339
<node concept="3clFbF" id="1VPSbnQCA6r" role="3cqZAp">
342340
<node concept="2OqwBi" id="1VPSbnQCA6s" role="3clFbG">
343-
<node concept="NRdvd" id="1VPSbnQCA6t" role="2Oq$k0">
344-
<ref role="1Pybhc" to="oq0c:1VPSbnQgjmM" resolve="IntentionCustomizationConfigHelper" />
345-
<ref role="37wK5l" to="oq0c:1VPSbnQgvmx" resolve="getCustomization" />
341+
<node concept="2YIFZM" id="1VPSbnRdlic" role="2Oq$k0">
342+
<ref role="37wK5l" to="juu2:1VPSbnQgvmx" resolve="getCustomization" />
343+
<ref role="1Pybhc" to="juu2:1VPSbnQgjmM" resolve="IntentionCustomizationConfigHelper" />
346344
<node concept="2tJFMh" id="1VPSbnQD0t3" role="37wK5m">
347345
<node concept="ZC_QK" id="1VPSbnQD0t4" role="2tJFKM">
348346
<ref role="2aWVGs" node="9W$Ahjc0Yj" resolve="ReplaceBusKindWithBusType" />
349347
</node>
350348
</node>
351349
</node>
352350
<node concept="liA8E" id="1VPSbnQCA6w" role="2OqNvi">
353-
<ref role="37wK5l" to="oq0c:1VPSbnQich9" resolve="getChildFilter" />
351+
<ref role="37wK5l" to="juu2:1VPSbnQich9" resolve="getChildFilter" />
354352
<node concept="2Sf5sV" id="1VPSbnQCA6x" role="37wK5m" />
355353
<node concept="zTJq_" id="1VPSbnQCA6y" role="37wK5m" />
356354
<node concept="1XNTG" id="1VPSbnQCA6z" role="37wK5m" />

0 commit comments

Comments
 (0)