Fix manual parsing of Windows source location paths (#217)

Fixed progress indicator characters on Windows (#218)

.clang-uml

@@ -1,6 +1,8 @@
 compilation_database_dir: debug
 output_directory: docs/diagrams
 comment_parser: clang
+add_compile_flags:
+  - -Wno-deprecated-declarations
 remove_compile_flags:
   - -Wno-class-memaccess
   - -Wno-dangling-reference

CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
+### 0.4.2
  * Fixed random typos and omissions in docs (#208)
  * Fixed handling of diagram hyperlinks with sources outside of project dir (#213)
  * Fixed test case t00014 on macos (#176)

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "clang-uml"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.4.1
+PROJECT_NUMBER         = 0.4.2
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

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.4.1-blue)](https://github.com/bkryza/clang-uml/releases)
+[![Version](https://img.shields.io/badge/version-0.4.2-blue)](https://github.com/bkryza/clang-uml/releases)
 [![Version](https://img.shields.io/badge/LLVM-12,13,14,15,16,17-orange)](https://github.com/bkryza/clang-uml/releases)
 [![Doxygen](https://img.shields.io/badge/Docs-Doxygen-gainsboro)](https://clang-uml.github.io)
 

cmake/LLVMSetup.cmake

@@ -75,6 +75,9 @@ else(LINK_LLVM_SHARED)
                     LLVMWindowsDriver
                     LLVMWindowsManifest)
         endif()
+        if(${LLVM_PACKAGE_VERSION} VERSION_GREATER_EQUAL "17.0")
+            list(APPEND LIBTOOLING_LIBS clangASTMatchers)
+        endif()
     endif(MSVC)
 endif(LINK_LLVM_SHARED)
 

docs/installation.md

@@ -23,7 +23,7 @@
 #### Ubuntu
 
 ```bash
-# Currently supported Ubuntu versions are Focal, Jammy and Lunar
+# Currently supported Ubuntu versions are Focal, Jammy, Lunar and Mantic
 sudo add-apt-repository ppa:bkryza/clang-uml
 sudo apt update
 sudo apt install clang-uml
@@ -32,17 +32,17 @@ sudo apt install clang-uml
 #### Fedora
 
 ```bash
-# Fedora 36
-wget https://github.com/bkryza/clang-uml/releases/download/0.4.1/clang-uml-0.4.1-1.fc36.x86_64.rpm
-sudo dnf install ./clang-uml-0.4.1-1.fc36.x86_64.rpm
-
 # Fedora 37
-wget https://github.com/bkryza/clang-uml/releases/download/0.4.1/clang-uml-0.4.1-1.fc37.x86_64.rpm
+wget https://github.com/bkryza/clang-uml/releases/download/0.4.2/clang-uml-0.4.2-1.fc37.x86_64.rpm
-sudo dnf install ./clang-uml-0.4.1-1.fc37.x86_64.rpm
+sudo dnf install ./clang-uml-0.4.2-1.fc37.x86_64.rpm
 
 # Fedora 38
-wget https://github.com/bkryza/clang-uml/releases/download/0.4.1/clang-uml-0.4.1-1.fc38.x86_64.rpm
+wget https://github.com/bkryza/clang-uml/releases/download/0.4.2/clang-uml-0.4.2-1.fc38.x86_64.rpm
-sudo dnf install ./clang-uml-0.4.1-1.fc38.x86_64.rpm
+sudo dnf install ./clang-uml-0.4.2-1.fc38.x86_64.rpm
+
+# Fedora 39
+wget https://github.com/bkryza/clang-uml/releases/download/0.4.2/clang-uml-0.4.2-1.fc39.x86_64.rpm
+sudo dnf install ./clang-uml-0.4.2-1.fc39.x86_64.rpm
 ```
 
 #### Conda
@@ -171,7 +171,7 @@ bin\clang-uml.exe --version
 ```
 It should produce something like:
 ```bash
-clang-uml 0.4.1
+clang-uml 0.4.2
 Copyright (C) 2021-2023 Bartek Kryza <bkryza@gmail.com>
 Linux x86_64 6.2.0-36-generic
 Built against LLVM/Clang libraries version: 17.0.3

packaging/Makefile

@@ -83,7 +83,7 @@ rpm:
 		echo "############################"
 		#rm -rf $(build_dir)
 		mkdir -p $(build_dir)
-		dnf install -y fedora-packager rpmdevtools gcc cmake git clang-devel clang-tools-extra ccache yaml-cpp llvm-devel wget yaml-cpp-devel
+		dnf install -y fedora-packager rpmdevtools gcc gdb cmake git clang-devel clang-tools-extra ccache yaml-cpp llvm-devel wget yaml-cpp-devel
 		rpmdev-setuptree
 		cp $(build_dir)/$(SOURCE_ARCHIVE_RPM) /root/rpmbuild/SOURCES/
 		cp fedora/clang-uml.spec /root/rpmbuild/SPECS/

packaging/README.md

@@ -10,6 +10,7 @@ cd packaging
 make DIST=focal deb
 make DIST=jammy deb
 make DIST=lunar deb
+make DIST=mantic deb
 
 cd _BUILD/ubuntu/focal
 dput ppa:bkryza/clang-uml *.changes
@@ -17,17 +18,20 @@ dput ppa:bkryza/clang-uml *.changes
 cd _BUILD/ubuntu/jammy
 dput ppa:bkryza/clang-uml *.changes
 
-cd _BUILD/ubuntu/kinetic
+cd _BUILD/ubuntu/lunar
 dput ppa:bkryza/clang-uml *.changes
 
+cd _BUILD/ubuntu/mantic
+dput ppa:bkryza/clang-uml *.changes
 ```
 
 ## Fedora
 
 ```bash
 cd clang-uml
-make fedora_36
+make fedora/37
-make fedora_37
+make fedora/38
+make fedora/39
 find packaging/_BUILD/fedora
 ```
 
@@ -37,6 +41,7 @@ find packaging/_BUILD/fedora
 docker run --rm -v $PWD:$PWD -it continuumio/miniconda3 bash
 conda install conda-build make anaconda-client
 cd packaging
+git config --global --add safe.directory /home/bartek/devel/clang-uml
 make CONDA_TOKEN=<TOKEN> conda
 ```
 

packaging/conda/meta.yaml.in

@@ -22,17 +22,17 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - conda-forge::pkg-config
-    - conda-forge::yaml-cpp 0.7.0
+    - conda-forge::yaml-cpp 0.8.0
-    - conda-forge::clangdev 15.0.6
+    - conda-forge::clangdev 17.0.6
-    - conda-forge::libclang 15.0.6
+    - conda-forge::libclang 17.0.6
-    - conda-forge::libclang-cpp 15.0.6
+    - conda-forge::libclang-cpp 17.0.6
     - conda-forge::cmake
     - conda-forge::git
     - conda-forge::make # [unix]
   run:
-    - conda-forge::yaml-cpp 0.7.0
+    - conda-forge::yaml-cpp 0.8.0
-    - conda-forge::libclang 15.0.6
+    - conda-forge::libclang 17.0.6
-    - conda-forge::libclang-cpp 15.0.6
+    - conda-forge::libclang-cpp 17.0.6
 
 test:
   commands:

packaging/debian/control.focal

@@ -2,7 +2,7 @@ Source: clang-uml
 Maintainer: Bartek Kryza <bkryza@gmail.com>
 Section: devel
 Priority: optional
-Build-Depends: debhelper, git, make, gcc-10, g++-10, cmake (>= 3.16), libyaml-cpp-dev, llvm-12, llvm-12-dev, clang-12, libclang-12-dev, libclang-cpp12-dev, bash-completion
+Build-Depends: debhelper, git, make, ccache, pkg-config, gcc-10, g++-10, gdb, cmake (>= 3.16), libyaml-cpp-dev, llvm-12, llvm-12-dev, clang-12, libclang-12-dev, libclang-cpp12-dev, bash-completion, libdw-dev, libunwind-dev
 Standards-Version: 4.3.0
 Vcs-Browser: https://github.com/bkryza/clang-uml
 Vcs-Git: https://github.com/bkryza/clang-uml.git

packaging/debian/control.jammy

@@ -2,7 +2,7 @@ Source: clang-uml
 Maintainer: Bartek Kryza <bkryza@gmail.com>
 Section: devel
 Priority: optional
-Build-Depends: debhelper, git, make, gcc-11, g++-11, cmake (>= 3.16), libyaml-cpp-dev, llvm-15, llvm-15-dev, clang-15, libclang-15-dev, libclang-cpp15-dev, bash-completion, dh-sequence-bash-completion
+Build-Depends: debhelper, git, make, ccache, pkg-config, gcc-11, g++-11, gdb, cmake (>= 3.16), libyaml-cpp-dev, llvm-15, llvm-15-dev, clang-15, libclang-15-dev, libclang-cpp15-dev, bash-completion, dh-sequence-bash-completion, libdw-dev, libunwind-dev
 Standards-Version: 4.3.0
 Vcs-Browser: https://github.com/bkryza/clang-uml
 Vcs-Git: https://github.com/bkryza/clang-uml.git

packaging/debian/control.lunar

@@ -2,7 +2,7 @@ Source: clang-uml
 Maintainer: Bartek Kryza <bkryza@gmail.com>
 Section: devel
 Priority: optional
-Build-Depends: debhelper, git, make, gcc, g++, cmake (>= 3.16), libyaml-cpp-dev, llvm-16, llvm-16-dev, clang-16, clang-tools-16, libclang-16-dev, libclang-cpp16-dev, libmlir-16-dev, mlir-16-tools, bash-completion, dh-sequence-bash-completion
+Build-Depends: debhelper, git, make, ccache, pkg-config, gcc-12, g++-12, gdb, cmake (>= 3.16), libyaml-cpp-dev, llvm-16, llvm-16-dev, clang-16, clang-tools-16, libclang-16-dev, libclang-cpp16-dev, libmlir-16-dev, mlir-16-tools, bash-completion, dh-sequence-bash-completion, libdw-dev, libunwind-dev
 Standards-Version: 4.3.0
 Vcs-Browser: https://github.com/bkryza/clang-uml
 Vcs-Git: https://github.com/bkryza/clang-uml.git

packaging/debian/control.mantic

@@ -0,0 +1,19 @@
+Source: clang-uml
+Maintainer: Bartek Kryza <bkryza@gmail.com>
+Section: devel
+Priority: optional
+Build-Depends: debhelper, git, make, ccache, pkg-config, gcc-13, g++-13, gdb, cmake (>= 3.16), libyaml-cpp-dev, llvm-16, llvm-16-dev, clang-16, clang-tools-16, libclang-16-dev, libclang-cpp16-dev, libmlir-16-dev, mlir-16-tools, bash-completion, dh-sequence-bash-completion, libdw-dev, libunwind-dev
+Standards-Version: 4.3.0
+Vcs-Browser: https://github.com/bkryza/clang-uml
+Vcs-Git: https://github.com/bkryza/clang-uml.git
+Homepage: https://github.com/bkryza/clang-uml
+
+
+Package: clang-uml
+Architecture: any
+Section: utils
+Depends: ${misc:Depends}, ${shlibs:Depends}, clang-16
+Pre-Depends: ${misc:Pre-Depends}
+Description: Automatic C++ UML diagram generator based on Clang.
+ .
+ This package provides the clang-uml binary.

packaging/debian/rules

@@ -13,8 +13,9 @@ override_dh_auto_configure:
 	                                         -DGIT_VERSION={{VERSION}} \
 	                                         -DBUILD_TESTS=OFF
 
+.PHONY: override_dh_strip
 override_dh_strip:
-	dh_strip --dbgsym-migration='clang-uml-dbg (<<{{VERSION}}-1~)'
+	dh_strip --automatic-dbgsym
 
 %:
 	dh $@ --with bash-completion

packaging/fedora/clang-uml.spec

@@ -15,6 +15,7 @@ BuildRequires: clang-tools-extra
 BuildRequires: ccache
 BuildRequires: yaml-cpp-devel
 BuildRequires: llvm-devel
+BuildRequires: gdb
 
 Requires: clang
 Requires: yaml-cpp

src/CMakeLists.txt

@@ -30,7 +30,9 @@ target_compile_options(clang-umllib PRIVATE
         $<$<CXX_COMPILER_ID:MSVC>:/MP /W1 /bigobj /wd4291 /wd4624 /wd4244>)
 target_compile_definitions(clang-umllib PRIVATE
         $<$<CXX_COMPILER_ID:MSVC>:
-        -DLLVM_FORCE_USE_OLD_TOOLCHAIN>)
+        -DLLVM_FORCE_USE_OLD_TOOLCHAIN
+        -DTERMCOLOR_USE_WINDOWS_API=1
+        -DTERMCOLOR_TARGET_WINDOWS=1>)
 
 #
 # Define the target executable clang-uml

src/common/clang_utils.cc

@@ -836,12 +836,23 @@ bool parse_source_location(const std::string &location_str, std::string &file,
     if (tokens.size() < 3)
         return false;
 
+    if (tokens.size() == 4) {
+        // Handle Windows paths
+        decltype(tokens) tmp_tokens{};
+        tmp_tokens.emplace_back(
+            fmt::format("{}:{}", tokens.at(0), tokens.at(1)));
+        tmp_tokens.emplace_back(tokens.at(2));
+        tmp_tokens.emplace_back(tokens.at(3));
+
+        tokens = std::move(tmp_tokens);
+    }
+
     file = tokens.at(0);
     try {
         line = std::stoi(tokens.at(1));
     }
     catch (std::invalid_argument &e) {
-        line = 0;
+        return false;
     }
 
     try {

src/common/generators/progress_indicator.cc

@@ -39,7 +39,11 @@ void progress_indicator::add_progress_bar(
         indicators::option::BarWidth{kBarWidth},
         indicators::option::ForegroundColor{color},
         indicators::option::ShowElapsedTime{true},
+#if _MSC_VER
+        indicators::option::Fill{"="}, indicators::option::Lead{">"},
+#else
         indicators::option::Fill{"█"}, indicators::option::Lead{"█"},
+#endif
         indicators::option::Remainder{"-"},
         indicators::option::PrefixText{
             fmt::format("{:<25}", util::abbreviate(name, kPrefixTextWidth))},
@@ -104,8 +108,12 @@ void progress_indicator::complete(const std::string &name)
 
     bar.set_progress(kCompleteProgressPercent);
 
-    bar.set_option(indicators::option::PostfixText{
+#if _MSC_VER
-        fmt::format("{}/{} ✔", p.progress, p.max)});
+    const auto postfix_text = fmt::format("{}/{} OK", p.progress, p.max);
+#else
+    const auto postfix_text = fmt::format("{}/{} ✔", p.progress, p.max);
+#endif
+    bar.set_option(indicators::option::PostfixText{postfix_text});
     bar.set_option(
         indicators::option::ForegroundColor{indicators::Color::green});
     bar.mark_as_completed();
@@ -118,9 +126,13 @@ void progress_indicator::fail(const std::string &name)
     auto &bar = progress_bars_[p.index];
     progress_bars_mutex_.unlock();
 
+#if _MSC_VER
+    const auto postfix_text = fmt::format("{}/{} FAILED", p.progress, p.max);
+#else
+    const auto postfix_text = fmt::format("{}/{} ✗", p.progress, p.max);
+#endif
     bar.set_option(indicators::option::ForegroundColor{indicators::Color::red});
-    bar.set_option(indicators::option::PostfixText{
+    bar.set_option(indicators::option::PostfixText{postfix_text});
-        fmt::format("{}/{} ✗", p.progress, p.max)});
     bar.mark_as_completed();
 }
 

src/common/visitor/translation_unit_visitor.cc

@@ -141,7 +141,7 @@ void translation_unit_visitor::set_source_location(
         file_path = fs::absolute(file_path);
     }
 
-    file_path = fs::canonical(file_path);
+    file_path = fs::weakly_canonical(file_path);
 
     file = file_path.string();
 

tests/test_config.cc

@@ -352,6 +352,8 @@ TEST_CASE("Test config relative paths handling", "[unit-test]")
     CHECK(def.get_relative_to()() == "/tmp");
 #ifdef _MSC_VER
     CHECK(def.root_directory().string() == "C:\\tmp");
+#elif __APPLE__
+    CHECK(def.root_directory().string() == "/private/tmp");
 #else
     CHECK(def.root_directory().string() == "/tmp");
 #endif

tests/test_util.cc

@@ -430,3 +430,47 @@ TEST_CASE("Test is_relative_to", "[unit-test]")
     CHECK(is_relative_to(child, base1));
     CHECK_FALSE(is_relative_to(child, base2));
 }
+
+TEST_CASE("Test parse_source_location", "[unit-test]")
+{
+    using namespace clanguml::common;
+
+    const std::string int_template_str{"ns1::ns2::class1<int>"};
+
+    std::string file;
+    unsigned line{};
+    unsigned column{};
+    bool result = false;
+
+    result = parse_source_location("/a/b/c/d/test.cpp:123", file, line, column);
+
+    CHECK_FALSE(result);
+
+    result = false, file = "", line = 0, column = 0;
+    result =
+        parse_source_location("/a/b/c/d/test.cpp:123:456", file, line, column);
+
+    CHECK(result);
+    CHECK(file == "/a/b/c/d/test.cpp");
+    CHECK(line == 123);
+    CHECK(column == 456);
+
+    result = false, file = "", line = 0, column = 0;
+
+    result = parse_source_location(
+        "E:\\test\\src\\main.cpp:123", file, line, column);
+
+    CHECK_FALSE(result);
+
+    result = false, file = "", line = 0, column = 0;
+
+    result = parse_source_location(
+        "E:\\test\\src\\main.cpp:123:456", file, line, column);
+
+    CHECK(result);
+    CHECK(file == "E:\\test\\src\\main.cpp");
+    CHECK(line == 123);
+    CHECK(column == 456);
+
+    result = false, file = "", line = 0, column = 0;
+}