diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index fbac9cb89d..9144ddd53f 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -10,18 +10,51 @@ on:
branches: [ main ]
workflow_dispatch:
+# Cancel a stale run when a new push lands on the same branch/PR instead of
+# letting redundant runs pile up and burn CI minutes.
+concurrency:
+ group: ${{ github.workflow }}-${{ github.ref }}
+ cancel-in-progress: true
+
+permissions:
+ contents: read
+
jobs:
build:
runs-on: ubuntu-latest
+ # Guards against a hang (e.g. the indexing deadlock class of bug this repo
+ # already hit once) running until GitHub's default 6-hour cap instead of
+ # failing fast.
+ timeout-minutes: 30
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v5
- name: Set up JDK 17
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v5
with:
+ distribution: temurin
java-version: 17
+ cache: gradle
+ - name: Install C++ build tools
+ run: sudo apt-get update && sudo apt-get install -y g++ make xvfb
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- - name: Build with Gradle
- run: ./gradlew buildLanguages
+ - name: Build and test with Gradle
+ # testTsTests boots a real (headed) MPS/IntelliJ-platform instance even for
+ # headless-looking typesystem checks, so it needs a display -- Ubuntu runners
+ # have none, hence xvfb-run. --continue runs every independent task (e.g.
+ # both testTsTests and testExTests) even after one fails, so a single CI
+ # run reports every failure instead of stopping at the first one.
+ run: xvfb-run --auto-servernum ./gradlew build --continue
+ - name: Upload test reports
+ if: always()
+ uses: actions/upload-artifact@v5
+ with:
+ name: test-reports
+ path: |
+ tests/test.ex.com.mbeddr.cpp/source_gen/**/build/test-results/**
+ build/**/TEST-*.xml
+ build/**/test-results/**
+ build/reports/tests/unified/**
+ if-no-files-found: ignore
diff --git a/.github/workflows/publish-maven.yml b/.github/workflows/publish-maven.yml
index 1c1ac9b3f5..d5c6718ac2 100644
--- a/.github/workflows/publish-maven.yml
+++ b/.github/workflows/publish-maven.yml
@@ -9,21 +9,31 @@ on:
- main
workflow_dispatch:
+permissions:
+ contents: read
+ packages: write
+
jobs:
build:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v5
- name: Set up JDK 17
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v5
with:
+ distribution: temurin
java-version: 17
+ - name: Install C++ build tools
+ run: sudo apt-get update && sudo apt-get install -y g++ make xvfb
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Publish with Gradle
+ # publish depends on build, which now runs the full test suite (see
+ # build.gradle) -- testTsTests boots a real (headed) MPS/IntelliJ-platform
+ # instance, so it needs a display, same as the "Java CI with Gradle" workflow.
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
- ./gradlew publish
+ xvfb-run --auto-servernum ./gradlew publish
diff --git a/.gitignore b/.gitignore
index d85081d7c4..5f1c729a31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,4 +71,9 @@ TESTS-*.xml
# Localized configuration
# -----------------------------------------------------------
.mpsconfig
-.ideaconfig
\ No newline at end of file
+.ideaconfig
+
+# -----------------------------------------------------------
+# Downloaded CI logs/test reports
+# -----------------------------------------------------------
+/logs/
\ No newline at end of file
diff --git a/.mps/modules.xml b/.mps/modules.xml
index 408685787b..f0864a9928 100644
--- a/.mps/modules.xml
+++ b/.mps/modules.xml
@@ -15,6 +15,8 @@
+
+
diff --git a/build.gradle b/build.gradle
index f0828feacf..5ee23e8330 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,10 @@ import de.itemis.mps.gradle.*
import java.time.LocalDate
import java.time.format.DateTimeFormatter
import java.time.format.FormatStyle
+import groovy.xml.XmlSlurper
+import groovy.xml.XmlParser
+import java.util.concurrent.Callable
+import java.util.concurrent.Executors
//will pull the groovy classes/types from nexus to the classpath
buildscript {
@@ -11,7 +15,7 @@ buildscript {
maven { url = 'https://artifacts.itemis.cloud/repository/maven-mps/' }
}
dependencies {
- classpath 'de.itemis.mps:mps-gradle-plugin:1.30.+'
+ classpath 'de.itemis.mps:mps-gradle-plugin:1.30.2.1.649c88d'
}
}
@@ -19,6 +23,11 @@ plugins {
id 'base'
id 'maven-publish'
id "com.github.breadmoirai.github-release" version "2.5.2"
+ id 'download-jbr' version '1.29.3.1.19b70ba'
+}
+
+downloadJbr {
+ jbrVersion = '17.0.11-b1207.30'
}
def incrementalBuild = !project.hasProperty("disableIncrementalBuild")
@@ -29,20 +38,30 @@ configurations {
mps
languageLibs
junitAnt
+ junitAntTaskdefs
+ jna
}
dependencies {
- mps "com.jetbrains:mps:2022.3.+"
- languageLibs "com.mbeddr:mbeddr:2022.3.+"
+ mps "com.jetbrains:mps:2022.3.3"
+ languageLibs "com.mbeddr:mbeddr:2022.3.26500.b633ef3"
junitAnt 'org.apache.ant:ant-junit:1.10.17'
-}
-
-repositories {
- maven {
- url = "https://artifacts.itemis.cloud/repository/maven-mps/"
- }
-
- mavenCentral()
+ // The "com.jetbrains:mps" artifact's bundled lib/jna// directories are
+ // missing lib/jna.jar itself (the actual JNA classes + all-platform native
+ // libraries as classpath resources, e.g. com/sun/jna/darwin-aarch64/...) --
+ // a real gap in that artifact vs. a full MPS installation. Without it, any
+ // code touching native UI (e.g. macOS's native scrollbar styling) fails with
+ // NoClassDefFoundError/UnsatisfiedLinkError when run outside a real MPS app.
+ jna 'net.java.dev.jna:jna:5.13.0'
+ // Separate from junitAnt (which also feeds the global default ant-script classpath below) so
+ // registering the / ant tasks doesn't pollute every ant-script invocation.
+ junitAntTaskdefs 'junit:junit:4.12'
+ junitAntTaskdefs('org.apache.ant:ant-junit:1.10.17') {
+ transitive = false
+ }
+ junitAntTaskdefs('org.apache.ant:ant-junit4:1.10.17') {
+ transitive = false
+ }
}
task resolveMps(type: Copy) {
@@ -65,7 +84,6 @@ def mbeddrCppVersion = project.findProperty("mbeddrCppVersion") ?: '0.1'
// Default arguments for ant scripts
def defaultScriptArgs = [
'mps.home' : resolveMps.destinationDir,
- 'mbeddr.github.cpp.home' : projectDir,
'build.dir' : layout.buildDirectory.get().asFile,
'mps.generator.skipUnmodifiedModels': incrementalBuild,
'version' : mbeddrCppVersion,
@@ -76,9 +94,23 @@ def defaultScriptClasspath = project.configurations.junitAnt.asFileTree
// enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults
ext["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs.collect { "-D$it.key=$it.value".toString() }
ext["itemis.mps.gradle.ant.defaultScriptClasspath"] = defaultScriptClasspath
+ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.named('downloadJbr').get().javaExecutable
+
+// MPS's own generation cache (source_gen.caches/, next to each module's sources) tracks
+// what's "unmodified" independently of Gradle's build/ dir, so `clean` alone doesn't
+// invalidate it -- a `clean build` run can then have MPS skip regenerating build scripts
+// it thinks are unchanged, silently leaving files like cppBuild.xml missing for downstream
+// tasks. Whenever `clean` is part of this invocation, force a full (non-incremental)
+// generation so results are always consistent with the just-wiped build/ dir.
+gradle.taskGraph.whenReady { graph ->
+ if (graph.allTasks.any { it.name == 'clean' }) {
+ defaultScriptArgs['mps.generator.skipUnmodifiedModels'] = false
+ ext["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs.collect { "-D$it.key=$it.value".toString() }
+ }
+}
-task buildAllScripts(type: BuildLanguages, dependsOn: [resolveMps, resolveAllLanguageLibs]) {
+task buildAllScripts(type: BuildLanguages, dependsOn: [resolveMps, resolveAllLanguageLibs, tasks.named('downloadJbr')]) {
script = "scripts/allScripts.xml"
}
@@ -92,6 +124,273 @@ task packageLanguages(type: Zip, dependsOn: buildLanguages) {
include 'com.mbeddr.cpp/**'
}
+ant.taskdef(name: 'junit', classname: 'org.apache.tools.ant.taskdefs.optional.junit.JUnitTask',
+ classpath: configurations.junitAntTaskdefs.asPath)
+ant.taskdef(name: 'junitreport', classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
+ classpath: configurations.junitAntTaskdefs.asPath)
+
+// test.ts.com.mbeddr.cpp: JUnit-style typesystem/language tests, run via the MPS ant "check" target
+task generateTsTests(type: RunAntScript, dependsOn: buildAllScripts) {
+ script = "${layout.buildDirectory.get().asFile}/cppTsTestsBuild.xml"
+ targets = ['generate']
+}
+
+task testTsTests(type: TestLanguages, dependsOn: [generateTsTests, buildLanguages]) {
+ script = "${layout.buildDirectory.get().asFile}/cppTsTestsBuild.xml"
+ targets = ['check']
+ doFirst {
+ delete fileTree(dir: layout.buildDirectory.get().asFile, includes: ['**/TEST-*.xml'])
+ // The task MPS's build language generates never sets
+ // -Djava.awt.headless=true (harmless to add, so add it), and more
+ // importantly its classpath (a single "mps.class.path.jar" whose
+ // manifest lists the "com.jetbrains:mps" artifact's own jars) is missing
+ // lib/jna.jar -- that artifact ships lib/jna// directories but not
+ // the actual JNA classes+all-platform-natives jar a full MPS install has.
+ // Without it, any code touching native UI (e.g. macOS's native scrollbar
+ // styling) fails with NoClassDefFoundError/UnsatisfiedLinkError outside
+ // a real MPS app. Patch in a real, public JNA jar (see the "jna"
+ // configuration) that bundles proper natives for every platform.
+ def marker = 'jna-classpath-patch'
+ def scriptFile = file(script)
+ def content = scriptFile.text
+ if (!content.contains(marker)) {
+ def jnaJar = configurations.jna.singleFile.absolutePath
+ // Scope the classpath replacement to the ... body
+ // specifically, rather than a plain whole-file replaceFirst -- otherwise
+ // an unrelated appearing earlier in the file
+ // (e.g. in a taskdef or another target) would be silently patched instead,
+ // and "patched != content" alone couldn't tell the difference.
+ def junitOpen = (content =~ /]*>/)
+ if (!junitOpen.find()) {
+ throw new GradleException("Could not find a tag to patch in ${scriptFile}")
+ }
+ def bodyStart = junitOpen.end()
+ def bodyEnd = content.indexOf('', bodyStart)
+ if (bodyEnd < 0) {
+ throw new GradleException("Could not find a matching tag to patch in ${scriptFile}")
+ }
+ def jvmargs = '\n ' +
+ '\n ' +
+ // The build just packaged the test/preferences modules into jars
+ // moments earlier; IntelliJ's native file watcher then races to
+ // watch files inside those still-settling archives and hits
+ // ClosedChannelException. Disabling it is the standard fix for
+ // headless IntelliJ-platform test runs.
+ '\n '
+ def body = content.substring(bodyStart, bodyEnd)
+ def patchedBody = body.replaceFirst(//,
+ '')
+ if (patchedBody == body) {
+ throw new GradleException("Could not find a tag inside to patch in ${scriptFile}")
+ }
+ scriptFile.text = content.substring(0, bodyStart) + jvmargs + patchedBody + content.substring(bodyEnd)
+ }
+ }
+ doLast {
+ // Don't rely on TestLanguages/the ant script's own exit code -- the ant
+ // step does not halt on failure, so a broken test run can still
+ // report BUILD SUCCESSFUL. Read the JUnit report(s) ourselves and fail
+ // the Gradle build if anything reported a failure or error.
+ def reports = fileTree(dir: layout.buildDirectory.get().asFile, includes: ['**/TEST-*.xml']).files
+ if (reports.isEmpty()) {
+ throw new GradleException("No JUnit test reports found under ${layout.buildDirectory.get().asFile} -- did testTsTests actually run any tests?")
+ }
+ def problems = []
+ reports.each { report ->
+ def testsuite = new XmlSlurper().parse(report)
+ def failures = (testsuite.@failures.text() ?: '0') as int
+ def errors = (testsuite.@errors.text() ?: '0') as int
+ def tests = (testsuite.@tests.text() ?: '0') as int
+ if (failures > 0 || errors > 0) {
+ problems << "${report.name}: ${tests} test(s), ${failures} failure(s), ${errors} error(s)"
+ }
+ }
+ if (problems) {
+ throw new GradleException("test.ts.com.mbeddr.cpp JUnit reports contain failures:\n" + problems.join('\n'))
+ }
+ }
+}
+
+// test.ex.com.mbeddr.cpp: test modules that generate real C++, compiled and run as native binaries
+task generateExTests(type: RunAntScript, dependsOn: [buildAllScripts, buildLanguages]) {
+ script = "${layout.buildDirectory.get().asFile}/cppExTestsBuild.xml"
+ targets = ['generate']
+}
+
+task testExTests(dependsOn: generateExTests) {
+ description = 'Compile and run the C++ binaries generated by test.ex.com.mbeddr.cpp'
+ doLast {
+ def sourceGenDir = file("${projectDir}/tests/test.ex.com.mbeddr.cpp/source_gen")
+ def makefiles = fileTree(dir: sourceGenDir, includes: ['**/Makefile']).files
+ if (makefiles.isEmpty()) {
+ throw new GradleException("No generated Makefiles found under ${sourceGenDir} -- did generateExTests run?")
+ }
+ // Match against the path *relative to sourceGenDir*, split into segments --
+ // matching the absolute path (as before) would misclassify every module for
+ // a checkout under any ancestor directory containing a "lib" segment (e.g.
+ // "/opt/lib/mbeddr.cpp"); matching relative-path substrings with separators
+ // on both sides would still miss "lib" as the first or last segment.
+ def isLibDir = { File dir -> sourceGenDir.toPath().relativize(dir.toPath()).any { it.toString() == 'lib' } }
+ def libDirs = makefiles.findAll { isLibDir(it.parentFile) }.collect { it.parentFile }
+ def otherDirs = makefiles.findAll { !isLibDir(it.parentFile) }.collect { it.parentFile }
+
+ // These modules are independent of each other (only otherDirs depend on
+ // libDirs, not on each other), so build/run them concurrently instead of
+ // one at a time. Capped at availableProcessors -- and each individual
+ // `make` no longer gets its own "-j N" -- so we don't oversubscribe the
+ // machine by fanning out N-wide processes N-wide again inside each one.
+ // Output from concurrent processes interleaves in the log; that's an
+ // accepted trade-off for the wall-clock win.
+ def pool = Executors.newFixedThreadPool(Runtime.runtime.availableProcessors())
+ def runMake = { File dir ->
+ logger.lifecycle("make in ${dir}")
+ def proc = new ProcessBuilder('make')
+ .directory(dir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ proc.waitFor() == 0
+ }
+ try {
+ // Compile every directory even if one fails to build -- a broken module
+ // shouldn't hide the pass/fail status of every other module. Libraries
+ // build first (test modules depend on them), so a failed library build
+ // still skips only the test modules that actually need it.
+ def failedLibDirs = libDirs.collect { dir -> pool.submit({ -> runMake(dir) ? null : dir } as Callable) }
+ *.get().findAll { it != null }
+
+ // Each task returns its own result instead of writing into a list shared
+ // across threads -- java.util.ArrayList isn't safe for concurrent
+ // mutation, and a race here would mean silently losing a real failure.
+ def moduleResults = failedLibDirs ? [] : otherDirs.collect { dir ->
+ pool.submit({ ->
+ if (!runMake(dir)) {
+ return [compileFailed: dir, runFailures: []]
+ }
+ // The generated Makefile picks its own platform/flavor subdirectory
+ // (e.g. build/linux/release on CI, where $CI switches the default
+ // flavor, vs build/macosx/debug locally) -- find whatever "bin" dir
+ // it actually produced instead of assuming one.
+ def buildOutputDir = new File(dir, 'build')
+ def binDirs = []
+ if (buildOutputDir.isDirectory()) {
+ buildOutputDir.eachFileRecurse { f -> if (f.isDirectory() && f.name == 'bin') binDirs << f }
+ }
+ if (binDirs.isEmpty()) {
+ logger.lifecycle("No binary directory under ${dir}, skipping run")
+ return [compileFailed: null, runFailures: []]
+ }
+ def failures = []
+ binDirs.each { binDir ->
+ binDir.listFiles({ f -> f.isFile() && f.canExecute() } as FileFilter)?.each { bin ->
+ logger.lifecycle("Running ${bin}")
+ def runProc = new ProcessBuilder(bin.absolutePath)
+ .directory(dir)
+ .redirectOutput(ProcessBuilder.Redirect.INHERIT)
+ .redirectError(ProcessBuilder.Redirect.INHERIT)
+ .start()
+ if (runProc.waitFor() != 0) {
+ failures << bin.absolutePath
+ }
+ }
+ }
+ return [compileFailed: null, runFailures: failures]
+ } as Callable)
+ }*.get()
+ def compileFailures = moduleResults.findAll { it.compileFailed != null }.collect { it.compileFailed }
+ def runFailures = moduleResults.collectMany { it.runFailures }
+
+ if (failedLibDirs || compileFailures || runFailures) {
+ def problems = []
+ if (failedLibDirs) problems << "Library build(s) failed: ${failedLibDirs.join(', ')}"
+ if (compileFailures) problems << "Test module build(s) failed: ${compileFailures.join(', ')}"
+ if (runFailures) problems << "Test binaries failed: ${runFailures.join(', ')}"
+ throw new GradleException(problems.join('\n'))
+ }
+ } finally {
+ pool.shutdown()
+ }
+ }
+}
+
+// test.ex binaries already emit a per-module JUnit-format TEST-*.xml next to
+// themselves (tests/test.ex.com.mbeddr.cpp/source_gen/**/build/test-results/) --
+// mbeddr's C++ test runtime writes those on its own, regardless of Gradle/ant.
+// test.ts produces one combined TEST-*.xml under build/ (the ant report).
+// Merge both into a single JUnit report (raw XML + HTML) so there's one place to
+// look regardless of which suite something failed in. finalizedBy (not
+// dependsOn) on both test tasks so the report is still produced when a test
+// task fails -- that's the whole point of collecting results after --continue.
+task testReport {
+ description = 'Merge the test.ts and test.ex JUnit reports into one unified report'
+ doLast {
+ def stagingDir = layout.buildDirectory.dir('test-results/all').get().asFile
+ delete(stagingDir)
+ stagingDir.mkdirs()
+
+ // Unlike test.ex (one XML file per module, each with its own suite name --
+ // ant's report groups by that name, so modules show up as separate rows),
+ // test.ts's ant run packs all tests from many different model
+ // classes into ONE file under one generic suite name
+ // ("jetbrains.mps.testbench.junit.suites.AntModuleTestSuite0"). Grouped as-is,
+ // every test.ts failure/error would show up under that one meaningless name
+ // instead of the actual model it came from. Split it into one synthetic
+ // testsuite per distinct testcase "classname" (already fully qualified,
+ // e.g. "test.ts.com.mbeddr.cpp.identifiernames.IIdentifierNamedConceptKeywords_Test")
+ // so the report groups test.ts results the same way it groups test.ex ones.
+ // Recursive to match testTsTests' own check above -- ant's report
+ // location isn't guaranteed to stay at the top level of the build dir.
+ fileTree(dir: layout.buildDirectory.get().asFile, includes: ['**/TEST-*.xml']).each { report ->
+ def xml = new XmlParser().parse(report)
+ xml.testcase.groupBy { it.@classname }.each { classname, cases ->
+ def failures = cases.count { !it.failure.isEmpty() }
+ def errors = cases.count { !it.error.isEmpty() }
+ def skipped = cases.count { !it.skipped.isEmpty() }
+ def sb = new StringBuilder()
+ sb << '\n'
+ sb << "\n"
+ cases.each { tc -> sb << groovy.xml.XmlUtil.serialize(tc).replaceAll(/(?s)^<\?xml.*?\?>\s*/, '') }
+ sb << '\n'
+ new File(stagingDir, "ts-${classname}.xml").text = sb.toString()
+ }
+ }
+ fileTree(dir: file("${projectDir}/tests/test.ex.com.mbeddr.cpp/source_gen"), includes: ['**/build/test-results/TEST-*.xml']).each { report ->
+ // mbeddr's C++ test runtime names its testsuite after the C++ scope
+ // (e.g. "test.ex.com.mbeddr.cpp.attributes.ClassAttributes::main").
+ // Ant's HTML report turns that name straight into a filename, and a
+ // literal ":" there makes actions/upload-artifact reject the whole
+ // artifact upload on CI (colons aren't valid in a Windows path).
+ // Replace "::" with "." before staging -- the name is still unique
+ // and readable, just filesystem-safe.
+ def xml = new XmlParser().parse(report)
+ xml.@name = xml.@name.toString().replace('::', '.')
+ def target = new File(stagingDir, "ex-${report.parentFile.parentFile.parentFile.name}-${report.name}")
+ groovy.xml.XmlUtil.serialize(xml, new FileWriter(target))
+ }
+
+ if (!stagingDir.listFiles()) {
+ logger.warn("testReport: no JUnit XML reports found to merge under ${stagingDir}")
+ return
+ }
+
+ def aggregateDir = layout.buildDirectory.dir('test-results/unified').get().asFile
+ def htmlDir = layout.buildDirectory.dir('reports/tests/unified').get().asFile
+ aggregateDir.mkdirs()
+ htmlDir.mkdirs()
+ ant.junitreport(todir: aggregateDir) {
+ fileset(dir: stagingDir, includes: '*.xml')
+ report(format: 'frames', todir: htmlDir)
+ }
+ logger.lifecycle("Unified test report: file://${new File(htmlDir, 'index.html')}")
+ }
+}
+testTsTests.finalizedBy testReport
+testExTests.finalizedBy testReport
+
+task testLanguages(dependsOn: [testTsTests, testExTests]) {
+ description = 'Run the test.ts and test.ex test suites for com.mbeddr.cpp'
+}
+
task setup {
dependsOn resolveAllLanguageLibs
description = 'Set up MPS project libraries. Libraries are read in from projectlibraries.properties file.'
@@ -115,7 +414,12 @@ publishing {
repositories {
maven {
name = "GitHubPackages"
- url = uri("https://maven.pkg.github.com/DSLFoundry/mbeddr.cpp")
+ // GITHUB_REPOSITORY (owner/repo) is set automatically by GitHub Actions
+ // for every workflow run, so this resolves to whichever repo the workflow
+ // is actually running in -- a fork publishes to its own package registry,
+ // and the same file works unmodified once merged upstream. Falls back to
+ // upstream for a plain local `./gradlew publish` run outside CI.
+ url = uri("https://maven.pkg.github.com/${System.getenv("GITHUB_REPOSITORY") ?: "DSLFoundry/mbeddr.cpp"}")
credentials {
username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_ACTOR")
password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN")
@@ -139,8 +443,9 @@ publishing {
}
build.dependsOn buildLanguages
+tasks.named("check") { dependsOn testLanguages }
tasks.named("githubRelease") { dependsOn(tasks.named("build"))}
defaultTasks 'buildLanguages'
-publish.dependsOn build
\ No newline at end of file
+publish.dependsOn build
diff --git a/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl b/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
index c69f38322a..796b391839 100644
--- a/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
+++ b/languages/com.mbeddr.cpp.base/com.mbeddr.cpp.base.mpl
@@ -1,7 +1,7 @@
-
+
@@ -22,11 +22,9 @@
b341759a-c721-4072-90cf-328bb2724684(com.mbeddr.cpp.expressions)
c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)
ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)
- cc7da2f6-419f-4133-a811-31fcd3295a85(jetbrains.mps.debugger.api.api)
20c6e580-bdc5-4067-8049-d7e3265a86de(jetbrains.mps.typesystemEngine)
984f0332-8a86-4f5c-9184-03eae96b5d16(com.mbeddr.core.expressions.runtime)
3bf5377a-e904-4ded-9754-5a516023bfaa(com.mbeddr.core.pointers)
- 8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)
diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps
index 1f7d76b8d8..0db9650172 100644
--- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps
+++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.behavior.mps
@@ -4,13 +4,6 @@
-
-
-
-
-
-
-
@@ -29,10 +22,6 @@
-
-
-
-
diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps
index b51a610cbf..c6de4c67ae 100644
--- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps
+++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.editor.mps
@@ -4,11 +4,7 @@
-
-
-
-
@@ -22,8 +18,6 @@
-
-
diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.structure.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.structure.mps
index 8d66532809..0af80ef143 100644
--- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.structure.mps
+++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.structure.mps
@@ -3,14 +3,12 @@
-
-
diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.textGen.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.textGen.mps
index a5e27942c8..7914277f45 100644
--- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.textGen.mps
+++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.textGen.mps
@@ -15,7 +15,6 @@
-
diff --git a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.typesystem.mps b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.typesystem.mps
index dcb4bac98d..f9536864d6 100644
--- a/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.typesystem.mps
+++ b/languages/com.mbeddr.cpp.base/models/com.mbeddr.cpp.base.typesystem.mps
@@ -15,22 +15,15 @@
-
-
-
-
-
-
-
+
-
@@ -170,6 +163,11 @@
+
+
+
+
+
@@ -6994,26 +6992,70 @@
-
-
-