From 3154cfd737f87034e8f685cdb494ad2698ca4170 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sun, 11 Jun 2023 12:50:51 +0200 Subject: [PATCH 1/3] Releasing version 0.3.7 --- CHANGELOG.md | 1 + README.md | 2 +- tests/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56472c5d..6ea12794 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG +### 0.3.7 * Added regexp support to selected diagram filters (#51, #132) * Added method type diagram filter (#145) * Added default method grouping and sorting in class diagrams (#36) diff --git a/README.md b/README.md index 0a6ce1c8..50682f25 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Build status](https://github.com/bkryza/clang-uml/actions/workflows/build.yml/badge.svg)](https://github.com/bkryza/clang-uml/actions) [![Coverage](https://codecov.io/gh/bkryza/clang-uml/branch/master/graph/badge.svg)](https://codecov.io/gh/bkryza/clang-uml) -[![Version](https://img.shields.io/badge/version-0.3.6-blue)](https://github.com/bkryza/clang-uml/releases) +[![Version](https://img.shields.io/badge/version-0.3.7-blue)](https://github.com/bkryza/clang-uml/releases) [![Version](https://img.shields.io/badge/LLVM-12,13,14,15,16-orange)](https://github.com/bkryza/clang-uml/releases) `clang-uml` is an automatic C++ to UML class, sequence, package and include diagram generator, driven by diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a2f8b649..df5607c6 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,7 +5,7 @@ file(GLOB_RECURSE TEST_CONFIG_YMLS test_config_data/*.yml test_compilation_database_data/*.yml test_compilation_database_data/*.json) -set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059) +set(TEST_CASES_REQUIRING_CXX20 t00056 t00058 t00059 t00065) set(CLANG_UML_TEST_LIBRARIES clang-umllib From fbb16859f3b177921101842eb64b6544654d5734 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sun, 11 Jun 2023 17:14:00 +0200 Subject: [PATCH 2/3] Added Windows installer build script --- packaging/README.md | 7 +++---- packaging/make_installer.ps1 | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 packaging/make_installer.ps1 diff --git a/packaging/README.md b/packaging/README.md index 99a8056b..f102f3a9 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -46,8 +46,7 @@ First build release configuration using `cmake` and `msbuild` according to the [documentation](../docs/installation.md#visual-studio-native-build). ```bash -cmake -S clang-uml -B .\clang-uml-build-pkg\ -DCMAKE_PREFIX_PATH="C:\clang-uml" -Thost=x64 -cd .\clang-uml-build-pkg\ -msbuild .\clang-uml.vcxproj -maxcpucount /p:Configuration=RelWithDebInfo -cpack -C "RelWithDebInfo" -G NSIS64 +cd packaging +.\make_installer.ps1 +ls .\_BUILD\windows\clang-uml-0.3.7-win64.exe ``` \ No newline at end of file diff --git a/packaging/make_installer.ps1 b/packaging/make_installer.ps1 new file mode 100644 index 00000000..2ceb97a0 --- /dev/null +++ b/packaging/make_installer.ps1 @@ -0,0 +1,18 @@ +# This script assumes that all clang-uml dependencies are instaled in C:\clang-uml + +param ($Prefix="C:\clang-uml", $BuildType="Release") + +mkdir _BUILD + +cmake -S .. -B .\_BUILD\windows\ -DCMAKE_PREFIX_PATH="$Prefix" -Thost=x64 + +cd .\_BUILD\windows\src + +msbuild .\clang-uml.vcxproj -maxcpucount /p:Configuration=Release + +cd .. + +cpack -C "Release" -G NSIS64 + +cd .. +cd .. \ No newline at end of file From f963c102573de23e7394b988dfe44bfb79c0858e Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sun, 11 Jun 2023 17:27:07 +0200 Subject: [PATCH 3/3] Updated conda packaging --- packaging/conda/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/conda/build.sh b/packaging/conda/build.sh index 898635d2..fdfc1158 100644 --- a/packaging/conda/build.sh +++ b/packaging/conda/build.sh @@ -10,7 +10,7 @@ cmake -DCMAKE_BUILD_TYPE=Release \ -DGIT_VERSION=${GIT_VERSION} \ -DCODE_COVERAGE=OFF \ -DBUILD_TESTS=OFF \ - -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" \ + -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow -Wno-dangling-reference" \ -DLLVM_CONFIG_PATH=${BUILD_PREFIX}/bin/llvm-config \ -DCONDA_BUILD_PREFIX=${BUILD_PREFIX} \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \