diff --git a/CHANGELOG.md b/CHANGELOG.md index d4bd2422af..6079a994c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,8 +9,28 @@ Semantic Versioning and the changes are simply documented in reverse chronologic * Breaking change: debugger and spawner were not maintained and were removed. +## com.mbeddr.mpsutil.interpreter + +### Feature + +- Added user defineable call back function when trace node is added to the trace tree + +## com.mbeddr.mpsutil.conceptdiagram + +### Fixed + +- The `auto-layout on init` flag is now working correctly. + +## com.mbeddr.mpsutil.actionsfilter + +### Fixed + +- The preference component now shows the actively loaded profile correctly. + ## com.mbeddr.mpsutil.checkinHandler +### Feature + - A new kind of Checkin handlers (background handler) now support the interface `CommitCheck` which allows more options like running the code after the commit or in the background. ## com.mbeddr.mpsutil.margincell diff --git a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps index 7f99cd0a01..2a11635a25 100644 --- a/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps +++ b/code/languages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps @@ -98,6 +98,9 @@ + + + @@ -1097,132 +1100,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -13648,269 +13525,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -20356,6 +19970,15 @@ + + + + + + + + + @@ -21098,24 +20721,6 @@ - - - - - - - - - - - - - - - - - - @@ -21184,6 +20789,12 @@ + + + + + + @@ -21620,6 +21231,12 @@ + + + + + + @@ -21714,5 +21331,544 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps index a650d44335..f8a705a2bd 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.conceptdiagram/languageModels/editor.mps @@ -356,7 +356,6 @@ - @@ -1858,7 +1857,6 @@ - diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps index e1197d9479..7e40f4dcf8 100644 --- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps +++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.interpreter/runtime/models/com/mbeddr/mpsutil/interpreter/rt.mps @@ -55,7 +55,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -270,7 +270,7 @@ - + @@ -339,6 +339,14 @@ + + + + + + + + @@ -428,7 +436,7 @@ - + @@ -651,7 +659,6 @@ - @@ -664,6 +671,7 @@ + @@ -9211,7 +9219,6 @@ - @@ -9299,6 +9306,7 @@ + @@ -15443,7 +15451,17 @@ - + + + + + + + + + + + @@ -15469,6 +15487,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16184,6 +16246,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -16250,104 +16332,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps index 2e357b86d3..fc30295bb7 100644 --- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps +++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.actionsfilter.runtime/models/com/mbeddr/mpsutil/actionsfilter/runtime.mps @@ -1,7 +1,6 @@ - @@ -77,7 +76,7 @@ - + @@ -234,7 +233,7 @@ - + @@ -264,7 +263,7 @@ - + @@ -348,7 +347,7 @@ - + @@ -5476,17 +5475,28 @@ - - - - - + + + + + + + + + + + + + + + + @@ -9457,7 +9467,6 @@ - @@ -9466,6 +9475,7 @@ + @@ -9943,7 +9953,6 @@ - @@ -9956,6 +9965,7 @@ + @@ -9968,10 +9978,10 @@ - + @@ -11476,7 +11486,6 @@ - @@ -11487,10 +11496,10 @@ + - @@ -11498,10 +11507,10 @@ + - @@ -11513,39 +11522,40 @@ + - + - + - + @@ -13078,7 +13088,6 @@ - @@ -13091,6 +13100,7 @@ + @@ -13252,7 +13262,6 @@ - @@ -13265,6 +13274,7 @@ + @@ -13277,7 +13287,6 @@ - @@ -13285,6 +13294,7 @@ + @@ -13675,10 +13685,10 @@ - + @@ -14202,35 +14212,35 @@ - + - + - + diff --git a/subprojects/com.mbeddr/platform/build.gradle b/subprojects/com.mbeddr/platform/build.gradle index 867d95509b..3e65046979 100755 --- a/subprojects/com.mbeddr/platform/build.gradle +++ b/subprojects/com.mbeddr/platform/build.gradle @@ -82,16 +82,22 @@ task install_nativelibs_loader(type: Copy, dependsOn: resolve_extensions) { tasks.getByPath(':com.mbeddr:install').dependsOn install_nativelibs_loader */ -task build_platform(type: BuildLanguages, dependsOn: copy_allScripts) { - script scriptFile('com.mbeddr.platform/build.xml') +task build_actionsfilter(type: BuildLanguages, dependsOn: [copy_allScripts]) { + script scriptFile('com.mbeddr.platform/actionsfilter.xml') // see comment in build_allScripts, above, for reasons we need to explicitly state task output // to address NO-SOURCE failure for package_mbeddrPlatform + outputs.dir(new File(artifactsDir, 'com.mbeddr.mpsutil.actionsfilter/')) + outputs.upToDateWhen { false } +} + +task build_platform(type: BuildLanguages, dependsOn: [copy_allScripts, build_actionsfilter]) { + script scriptFile('com.mbeddr.platform/build.xml') outputs.dir(new File(artifactsDir, 'com.mbeddr.platform/')) outputs.upToDateWhen { false } } -task install_actionsfilter(type: Copy, dependsOn: build_platform) { - from "$rootDir/artifacts/com.mbeddr.platform/" +task install_actionsfilter(type: Copy, dependsOn: build_actionsfilter) { + from "$rootDir/artifacts/com.mbeddr.mpsutil.actionsfilter/" include "com.mbeddr.mpsutil.actionsfilter/" into "$mpsPluginsDir" }