Skip to content

Commit

Permalink
Merge branch 'maintenance/mps20223' into bugfix/checking_handler
Browse files Browse the repository at this point in the history
  • Loading branch information
alexanderpann authored Sep 12, 2024
2 parents b709f69 + 26e1abb commit a4f6757
Show file tree
Hide file tree
Showing 22 changed files with 730 additions and 949 deletions.
199 changes: 16 additions & 183 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,190 +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/

# -----------------------------------------------------------
# debugger test code
code/languages/com.mbeddr.debugger/tests/test.debugger.cdt/testcode/a.*
code/languages/com.mbeddr.debugger/tests/test.debugger.cdt/testcode/*.exe
code/languages/com.mbeddr.debugger/tests/test.debugger.cdt/testcode/debuggableTest*
code/languages/com.mbeddr.debugger/tests/test.debugger.cdt/testcode/debuggableTest
code/languages/com.mbeddr.debugger/tests/test.debugger.cdt/testcode/

# 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 @@ -194,4 +28,3 @@ code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.ecoretransofmatio

/config/
/system/
markdown-navigator**
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ Semantic Versioning and the changes are simply documented in reverse chronologic

- 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

- When the attached cell can't be found (e.g. it is collapsed), the next suitable anchestor cell is now used to align the margin cell.

# August 2024

## com.mbeddr.platform
Expand Down
Loading

0 comments on commit a4f6757

Please sign in to comment.