Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V0.4.2 #216

Merged
merged 2 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
20 changes: 10 additions & 10 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
sudo dnf install ./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.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
sudo dnf install ./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.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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packaging/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
11 changes: 8 additions & 3 deletions packaging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,28 @@ 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

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
```

Expand All @@ -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
```

Expand Down
14 changes: 7 additions & 7 deletions packaging/conda/meta.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ requirements:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- conda-forge::pkg-config
- conda-forge::yaml-cpp 0.7.0
- conda-forge::clangdev 15.0.6
- conda-forge::libclang 15.0.6
- conda-forge::libclang-cpp 15.0.6
- conda-forge::yaml-cpp 0.8.0
- conda-forge::clangdev 17.0.6
- conda-forge::libclang 17.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::libclang 15.0.6
- conda-forge::libclang-cpp 15.0.6
- conda-forge::yaml-cpp 0.8.0
- conda-forge::libclang 17.0.6
- conda-forge::libclang-cpp 17.0.6

test:
commands:
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/control.focal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/control.jammy
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packaging/debian/control.lunar
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions packaging/debian/control.mantic
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 2 additions & 1 deletion packaging/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion packaging/fedora/clang-uml.spec
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ BuildRequires: clang-tools-extra
BuildRequires: ccache
BuildRequires: yaml-cpp-devel
BuildRequires: llvm-devel
BuildRequires: gdb

Requires: clang
Requires: yaml-cpp
Expand Down Expand Up @@ -70,4 +71,4 @@ fi

%changelog
* Sun Jan 01 2023 Bartek Kryza <bkryza@gmail.com>
- Initial version of the package for Fedora
- Initial version of the package for Fedora