Skip to content

Commit

Permalink
Merge branch 'maintenance/mps20223' into merge/mps20222
Browse files Browse the repository at this point in the history
  • Loading branch information
arimer committed Sep 18, 2024
2 parents 7a3e074 + fac10bb commit 2343aec
Show file tree
Hide file tree
Showing 1,270 changed files with 13,644 additions and 514,612 deletions.
191 changes: 16 additions & 175 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,182 +1,24 @@
# -----------------------------------------------------------
# General

/build/
/artifacts/
/scripts/
/.gradle/
/MPS/
/tmp/

.idea/
**/.mps/workspace.xml

classes_gen/
doc_gen/
source_gen/
source_gen.caches/
test_gen/
test_gen.caches/

distros/*
MPS/*
mps-distrib/*
artifacts/*

.ant_targets
.DS_Store
.metadata
.svn
*.synctex.gz
*.aux
*.log
*.*.synctex.gz
*.*.aux
*.*.log
*.class

.idea
workspace.xml


junitvmwatcher*.properties
build.properties
TEST-*.xml
junit*.properties

classes_gen
doc_gen
source_gen
source_gen.caches
result_gen
jimple_gen

# -----------------------------------------------------------
# Type Size Config
code/languages/com.mbeddr.build/_spreferences
code/languages/com.mbeddr.mpsutil/_spreferences

# -----------------------------------------------------------
# * build
build/**/build
build/allInOne
build/jbrDownload

# -----------------------------------------------------------
# * diagrams
code/languages/com.mbeddr.core/diagrams/*.dot
code/languages/com.mbeddr.core/diagrams/*.gv
code/languages/com.mbeddr.core/diagrams/*.png
code/languages/com.mbeddr.ext/diagrams/*.dot
code/languages/com.mbeddr.ext/diagrams/*.gv
code/languages/com.mbeddr.ext/diagrams/*.png

# -----------------------------------------------------------
# * lib - here we seem to need the generated sources.
code/languages/*/lib/*/classes_gen
code/languages/*/lib/*/source_gen.caches



# -----------------------------------------------------------
# * tests
test_gen
test_gen.caches
analyses_results




# -----------------------------------------------------------
# * project settings
code/languages/*/*.iws
code/languages/*/build.properties
code/languages/*/TEST*.xml

# -----------------------------------------------------------
# applications
code/applications/*/*.iws
code/applications/*/build.properties

#-----------------------------------------------------------
# tests
code/languages/*/solutions/*/test_gen.caches/
code/languages/*/solutions/*/test_gen/


# -----------------------------------------------------------
# documents
deliverables/*/*.aux
deliverables/*/*.bbl
deliverables/*/*.blg
deliverables/*/*.dvi
deliverables/*/*.log
deliverables/*/*.out
deliverables/*/*.toc

documentation/*/*.aux
documentation/*/*.bbl
documentation/*/*.blg
documentation/*/*.dvi
documentation/*/*.log
documentation/*/*.out
documentation/*/*.toc
documentation/*/*.synctex.gz

documentation/userguide/*.pdf
documentation/build


# ----------------------------------------------------
# result files from the NuSMV unit tests
code/languages/com.mbeddr.ext/result.txt
code/languages/com.mbeddr.ext/result.xml

# ----------------------------------------------------
# result files from the cbmc unit tests
source_gentest.analyses.cbmc.testcode_nightly_nightly.html

# -----------------------------------------------------------
# tools
tools/zgrviewer/zgrviewerformps/target/*
tools/zgrviewer/zvtm-core-formps/target/*

# -----------------------------------------------------------
# compiled java classes within the ant-task eclipse workspace
ant-task-workspace/*/bin/

# other test resources
code/languages/com.mbeddr.mpsutil/tests/test.com.mbeddr.mpsutil.iconchar/icons/

#Some local script (not to be shared)
code/languages/offline.sh

# -----------------------------------------------------------
# CBMC analyses results temporary files
code/*/xmlCBMCRawOutput/*

/build/**/*.xml
/build/com.mbeddr.allScripts/build.xml

# -----------------------------------------------------------
# tutorial build

build/com.mbeddr.tutorial/null/*.puml
applications/tutorial/solutions/mbeddr.tutorial.main/temp/

# -----------------------------------------------------------
# IntelliJ debugging info
*.iml

# Generated visualizations
*.puml
_vis/*.png
code/applications/tutorial/solutions/com.mbeddr.tutorial.documentation/_vis
tools/ant/ant-task-workspace/MakeTestsTask/out/artifacts
tools/ant/ant-task-workspace/TeamcityMakeTests/bin/com
code/plugins/sl-all/build-tests.xml
code/plugins/sl-all/build.xml
tmp

# -----------------------------------------------------------
# gradle files
gradle.properties
**/.gradle/*
**/scripts/*
**/MPS/*
**/build/repo/
**/build/distributions
**/build/classes
antlib.xml
**/code/languages/myDependencies
**/.settings/org.eclipse.buildship.core.prefs
**/.project
# ecore transformation tools
code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmation.sandbox

# -----------------------------------------------------------
# Visual Studio Code settings
Expand All @@ -186,4 +28,3 @@ code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmatio

/config/
/system/
markdown-navigator**
41 changes: 40 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ 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.checkinHandler

- 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

### Fixed
Expand All @@ -17,6 +21,23 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

# August 2024

## com.mbeddr.platform

### Added

- A new language `com.mbeddr.mpsutil.checkinHandler` was added that can be used to execute pre-commit handlers which can approve or reject commits or execute arbitrary code before the checkin happens.

### Removed

- The tests build script (`com.mbeddr.platform.tests.ts.build`) is no longer part of the `com.mbeddr.platform` build
solution.

## com.mbeddr.rcp, com.mbeddr.allInOne

### Removed

- RCP, installer, and all-in-one distribution was removed.

## com.mbeddr.mpsutil.traceExplorer

### Added
Expand All @@ -29,6 +50,13 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

# July 2024

## com.mbeddr.analyses

### Removed

- The complete com.mbeddr.analyses project (integration with static checkers for C) was removed as it was unmaintained
and apparently no longer used.

## com.mbeddr.mpsutil.comparator

### Added
Expand All @@ -37,6 +65,12 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

# June 2024

## com.mbeddr.mpsutil

### Deprecated

- The language `com.mbeddr.mpsutil.favourites` was deprecated in favor of the builtin MPS bookmark manager. See: https://www.jetbrains.com/help/mps/navigating-through-the-source-code.html#use_bookmarks

## com.mbeddr.mpsutil.conceptdiagram

### Fixed
Expand Down Expand Up @@ -135,7 +169,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic
### Removed

- The deprecated language `com.mbeddr.mpsutil.coverage.emma` was removed. As a replacement, the
JaCoCo code coverage integration from [mbeddr/mps-qa](https://github.com/mbeddr/mps-qa) can be used ([more information](https://github.com/mbeddr/mps-qa/tree/master/code/languages/org.mpsqa.testing)).
JaCoCo code coverage integration from [mbeddr/mps-qa](https://github.com/mbeddr/mps-qa) can be used ([more information](https://github.com/mbeddr/mps-qa/tree/master/code/languages/org.mpsqa.testing)).

### Added

Expand All @@ -159,6 +193,10 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

- Enhanced TraceExplorer to hide toolbar buttons.

### Removed

- The language com.mbeddr.mpsutil.lantest was removed since it isn't fully working anymore.

## com.mbeddr.core.base

### Changed
Expand Down Expand Up @@ -188,6 +226,7 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

- Enhanced TraceExplorer to allow custom filters on trace nodes, choose filters by menu and stores and can restore a manually unfolded trees.
- The language will no longer attempt to generate screenshots when run from an `MpsEnvironment` (i.e. the `<generate>` Ant task) but will instead output a warning. Use [mps-gradle-plugin](https://github.com/mbeddr/mps-gradle-plugin), [mps-build-backends](https://github.com/mbeddr/mps-build-backends), MPS tests, or other means to run the MPS make process in an IDEA environment.
- plantuml was upgraded to v1.2023.12.

### Fixed

Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ For more details please visit the [mbeddr landing page](https://github.com/mbedd

### Maven Dependencies

To use mbeddr or the mbeddr platform in your own project, you one of the following dependencies in your maven or gradle build script. The latest support MPS version is 2022.2.2:
To use mbeddr or the mbeddr platform in your own project, you one of the following dependencies in your maven or gradle build script. The latest support MPS version is 2022.3.1:

[![mbeddr](https://img.shields.io/badge/Github%20pages-mbeddr-success)](https://github.com/orgs/mbeddr/packages?tab=packages&q=com.mbeddr.mbeddr)
[![mbeddr platform](https://img.shields.io/badge/Github%20pages-mbeddr.platform-success)](https://github.com/orgs/mbeddr/packages?tab=packages&q=com.mbeddr.platform)
Expand All @@ -37,7 +37,8 @@ To use mbeddr or the mbeddr platform in your own project, you one of the followi

| MPS version | nexus status |
| --------------- | --------------- |
| 2022.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) |
| 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) |
| 2022.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) |
| 2021.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) |
| 2021.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) |
| 2021.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/mbeddr/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fmbeddr) |
Expand All @@ -52,7 +53,8 @@ To use mbeddr or the mbeddr platform in your own project, you one of the followi

| MPS version | nexus status |
| --------------- | --------------- |
| 2022.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) |
| 2022.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/latest)](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) |
| 2022.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2022.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) |
| 2021.3 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.3')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) |
| 2021.2 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.2')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) |
| 2021.1 | [![artifacts.itemis.cloud](https://img.shields.io/badge/dynamic/xml?url=https://artifacts.itemis.cloud/repository/maven-mps/com/mbeddr/platform/maven-metadata.xml&label=artifacts.itemis.cloud&color=success&query=.//versioning/versions/version[starts-with(text(),'2021.1')][last()])](https://artifacts.itemis.cloud/#browse/browse:maven-mps:com%2Fmbeddr%2Fplatform) |
Expand Down
3 changes: 0 additions & 3 deletions about.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ http://plantuml.com/
Sat4J
http://www.sat4j.org/

SLF4J
http://www.slf4j.org/

Microsoft Corporation
https://github.com/Z3Prover/

Expand Down
Loading

0 comments on commit 2343aec

Please sign in to comment.