From 66cc92da8242c4a54f986d7b6b6532da3b222d34 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Thu, 2 Mar 2023 20:18:18 +0100 Subject: [PATCH 1/4] Updated changelog for 0.3.2 --- CHANGELOG.md | 1 + README.md | 2 +- packaging/debian/control.jammy | 4 ++-- packaging/debian/rules | 2 +- src/CMakeLists.txt | 13 +++++++++---- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1731e69e..dcd3cda4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG +### 0.3.2 * Added initial support for C++20 concept rendering (#96) * Added support for plain C11 translation units (#97) * Added 'row' and 'column' layout hints for aligning elements (#90) diff --git a/README.md b/README.md index d19c1935..6257cd11 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.1-blue)](https://github.com/bkryza/clang-uml/releases) +[![Version](https://img.shields.io/badge/version-0.3.2-blue)](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/packaging/debian/control.jammy b/packaging/debian/control.jammy index 71e085fe..226be3df 100644 --- a/packaging/debian/control.jammy +++ b/packaging/debian/control.jammy @@ -2,7 +2,7 @@ Source: clang-uml Maintainer: Bartek Kryza Section: devel Priority: optional -Build-Depends: debhelper, make, gcc-12, g++-12, cmake (>= 3.16), libyaml-cpp-dev, llvm-14, llvm-14-dev, clang-14, libclang-14-dev, libclang-cpp14-dev +Build-Depends: debhelper, make, gcc-12, g++-12, cmake (>= 3.16), libyaml-cpp-dev, llvm-15, llvm-15-dev, clang-15, libclang-15-dev, libclang-cpp15-dev Standards-Version: 4.3.0 Vcs-Browser: https://github.com/bkryza/clang-uml Vcs-Git: https://github.com/bkryza/clang-uml.git @@ -12,7 +12,7 @@ Homepage: https://github.com/bkryza/clang-uml Package: clang-uml Architecture: any Section: utils -Depends: ${misc:Depends}, ${shlibs:Depends}, clang-14 +Depends: ${misc:Depends}, ${shlibs:Depends}, clang-15 Pre-Depends: ${misc:Pre-Depends} Description: Automatic C++ UML diagram generator based on Clang. . diff --git a/packaging/debian/rules b/packaging/debian/rules index d56f75bd..d85289c6 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -14,7 +14,7 @@ override_dh_auto_configure: -DBUILD_TESTS=OFF override_dh_strip: - dh_strip --dbgsym-migration='clang-uml-dbg (<<0.3.0-1~)' + dh_strip --dbgsym-migration='clang-uml-dbg (<<{{VERSION}}-1~)' %: dh $@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4e0d83af..9e285315 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -59,10 +59,15 @@ target_link_libraries(clang-uml include(GNUInstallDirs) install(TARGETS clang-uml DESTINATION ${CMAKE_INSTALL_BINDIR}) -install(FILES LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) -install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) -install(FILES AUTHORS.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) -install(FILES CHANGELOG.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) + +install(FILES ${PROJECT_SOURCE_DIR}/LICENSE.md + DESTINATION ${CMAKE_INSTALL_DOCDIR}) +install(FILES ${PROJECT_SOURCE_DIR}/README.md + DESTINATION ${CMAKE_INSTALL_DOCDIR}) +install(FILES ${PROJECT_SOURCE_DIR}/AUTHORS.md + DESTINATION ${CMAKE_INSTALL_DOCDIR}) +install(FILES ${PROJECT_SOURCE_DIR}/CHANGELOG.md + DESTINATION ${CMAKE_INSTALL_DOCDIR}) # # Setup installer From 1a4e6018285066fa524008d04a6cc198b3b06ef5 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Thu, 2 Mar 2023 21:47:50 +0100 Subject: [PATCH 2/4] Fixed git version extraction --- cmake/GitVersion.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/GitVersion.cmake b/cmake/GitVersion.cmake index 690c695b..367732b7 100644 --- a/cmake/GitVersion.cmake +++ b/cmake/GitVersion.cmake @@ -6,11 +6,12 @@ function(setup_git_version) execute_process( COMMAND ${GIT_EXECUTABLE} describe --tags --always --abbrev=7 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - OUTPUT_VARIABLE GIT_VERSION + OUTPUT_VARIABLE GIT_VERSION_FROM_TAG RESULT_VARIABLE GIT_ERROR_CODE OUTPUT_STRIP_TRAILING_WHITESPACE ) endif(GIT_EXECUTABLE) + set(GIT_VERSION ${GIT_VERSION_FROM_TAG} PARENT_SCOPE) endif(NOT DEFINED GIT_VERSION) if(NOT DEFINED GIT_VERSION) From 8a4e6894fb16a3535aacc924286f70bac62bad77 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Thu, 2 Mar 2023 22:05:22 +0100 Subject: [PATCH 3/4] Fixed git version extraction --- cmake/GitVersion.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/GitVersion.cmake b/cmake/GitVersion.cmake index 367732b7..98f4b027 100644 --- a/cmake/GitVersion.cmake +++ b/cmake/GitVersion.cmake @@ -6,16 +6,15 @@ function(setup_git_version) execute_process( COMMAND ${GIT_EXECUTABLE} describe --tags --always --abbrev=7 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - OUTPUT_VARIABLE GIT_VERSION_FROM_TAG + OUTPUT_VARIABLE GIT_VERSION RESULT_VARIABLE GIT_ERROR_CODE OUTPUT_STRIP_TRAILING_WHITESPACE ) endif(GIT_EXECUTABLE) - set(GIT_VERSION ${GIT_VERSION_FROM_TAG} PARENT_SCOPE) endif(NOT DEFINED GIT_VERSION) if(NOT DEFINED GIT_VERSION) - set(GIT_VERSION "0.0.0-unknown" PARENT_SCOPE) + set(GIT_VERSION "0.0.0-unknown") endif(NOT DEFINED GIT_VERSION) string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.(.+)" @@ -23,4 +22,6 @@ function(setup_git_version) set(GIT_VERSION_MAJOR ${CMAKE_MATCH_1} PARENT_SCOPE) set(GIT_VERSION_MINOR ${CMAKE_MATCH_2} PARENT_SCOPE) set(GIT_VERSION_PATCH ${CMAKE_MATCH_3} PARENT_SCOPE) + set(GIT_VERSION ${GIT_VERSION} PARENT_SCOPE) + endfunction() \ No newline at end of file From 812eada63aa7c28b1bb96efe438642fb1fc9c47c Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Thu, 2 Mar 2023 22:25:47 +0100 Subject: [PATCH 4/4] Fixed RPM spec for out of source builds --- packaging/fedora/clang-uml.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packaging/fedora/clang-uml.spec b/packaging/fedora/clang-uml.spec index 339cc6bb..413d06b5 100644 --- a/packaging/fedora/clang-uml.spec +++ b/packaging/fedora/clang-uml.spec @@ -35,18 +35,18 @@ generated in PlantUML format. %setup -q -n clang-uml-%{version} %build -cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" \ - -DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \ - -DCMAKE_INSTALL_PREFIX=%{_exec_prefix} \ - -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - -DGIT_VERSION=%{version} \ - -DBUILD_TESTS=OFF +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_CXX_FLAGS="-Wno-nonnull -Wno-stringop-overflow" \ + -DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \ + -DCMAKE_INSTALL_PREFIX=%{_exec_prefix} \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ + -DGIT_VERSION=%{version} \ + -DBUILD_TESTS=OFF -make %{_smp_mflags} clang-uml +%cmake_build %install -%make_install +%cmake_install rm -f %{buildroot}/%{_infodir}/dir %post