From b6aa2c0daeb02a1ee7e2c20d2546c2cb1e46c463 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sun, 22 Jan 2023 17:47:00 +0100 Subject: [PATCH 1/2] Releasing version 0.3.1 --- CHANGELOG.md | 3 ++- README.md | 2 +- docs/installation.md | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 845bc1db..b1e35da8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # CHANGELOG - + +### 0.3.1 * Added relationship deduction from `auto` return types which are template specializations (#82) * Fixed lambda names in class diagrams to be based on relative paths diff --git a/README.md b/README.md index 12209542..78e88983 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,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.0-blue)](https://github.com/bkryza/clang-uml/releases) +[![Version](https://img.shields.io/badge/version-0.3.1-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 YAML configuration files. The main idea behind the diff --git a/docs/installation.md b/docs/installation.md index 5f41f309..cfe2d000 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -29,12 +29,12 @@ sudo apt install clang-uml ```bash # Fedora 36 -wget https://github.com/bkryza/clang-uml/releases/download/0.3.0/clang-uml-0.3.0-1.fc36.x86_64.rpm -sudo dnf install ./clang-uml-0.3.0-1.fc36.x86_64.rpm +wget https://github.com/bkryza/clang-uml/releases/download/0.3.1/clang-uml-0.3.1-1.fc36.x86_64.rpm +sudo dnf install ./clang-uml-0.3.1-1.fc36.x86_64.rpm # Fedora 37 -wget https://github.com/bkryza/clang-uml/releases/download/0.3.0/clang-uml-0.3.0-1.fc37.x86_64.rpm -sudo dnf install ./clang-uml-0.3.0-1.fc37.x86_64.rpm +wget https://github.com/bkryza/clang-uml/releases/download/0.3.1/clang-uml-0.3.1-1.fc37.x86_64.rpm +sudo dnf install ./clang-uml-0.3.1-1.fc37.x86_64.rpm ``` #### Conda @@ -149,7 +149,7 @@ bin\clang-uml.exe --version ``` It should produce something like: ```bash -clang-uml 0.3.0 +clang-uml 0.3.1 Copyright (C) 2021-2023 Bartek Kryza Built against LLVM/Clang libraries version: 15.0.6 Using LLVM/Clang libraries version: clang version 15.0.6 (https://github.com/llvm/llvm-project.git 088f33605d8a61ff519c580a71b1dd57d16a03f8) From 62bbcf22ee879f2c68dfc3f649b381554ced59e8 Mon Sep 17 00:00:00 2001 From: Bartek Kryza Date: Sun, 22 Jan 2023 19:35:49 +0100 Subject: [PATCH 2/2] Updated packaging Makefile rules --- Makefile | 4 ++-- packaging/README.md | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 0548e318..88d266db 100644 --- a/Makefile +++ b/Makefile @@ -142,10 +142,10 @@ docs: fedora_36: mkdir -p packaging/_BUILD/fedora/36 git archive --format=tar.gz --prefix=clang-uml-$(PKG_VERSION)/ v$(GIT_VERSION) >packaging/_BUILD/fedora/36/clang-uml-$(PKG_VERSION).tar.gz - docker run --cpus="8" -v $(PWD):$(PWD) fedora:36 sh -c "dnf install -y make git && cd ${PWD} && make OS=fedora DIST=36 VERSION=${PKG_VERSION} COMMIT=${GIT_COMMIT} BRANCH=${GIT_BRANCH} -C packaging rpm" + docker run --cpuset-cpus=0-7 -v $(PWD):$(PWD) fedora:36 sh -c "dnf install -y make git && cd ${PWD} && make OS=fedora DIST=36 VERSION=${PKG_VERSION} COMMIT=${GIT_COMMIT} BRANCH=${GIT_BRANCH} -C packaging rpm" .PHONY: fedora_37 fedora_37: mkdir -p packaging/_BUILD/fedora/37 git archive --format=tar.gz --prefix=clang-uml-$(PKG_VERSION)/ v$(GIT_VERSION) >packaging/_BUILD/fedora/37/clang-uml-$(PKG_VERSION).tar.gz - docker run --cpus="8" -v $(PWD):$(PWD) fedora:37 sh -c "dnf install -y make git && cd ${PWD} && make OS=fedora DIST=37 VERSION=${PKG_VERSION} COMMIT=${GIT_COMMIT} BRANCH=${GIT_BRANCH} -C packaging rpm" + docker run --cpuset-cpus=0-7 -v $(PWD):$(PWD) fedora:37 sh -c "dnf install -y make git && cd ${PWD} && make OS=fedora DIST=37 VERSION=${PKG_VERSION} COMMIT=${GIT_COMMIT} BRANCH=${GIT_BRANCH} -C packaging rpm" diff --git a/packaging/README.md b/packaging/README.md index 438e7cc5..99a8056b 100644 --- a/packaging/README.md +++ b/packaging/README.md @@ -34,8 +34,8 @@ find packaging/_BUILD/fedora ## Anaconda ```bash -docker run --rm -v $PWD:$PWD continuumio/miniconda3 bash -conda install conda-build make +docker run --rm -v $PWD:$PWD -it continuumio/miniconda3 bash +conda install conda-build make anaconda-client cd packaging make CONDA_TOKEN= conda ``` @@ -46,6 +46,8 @@ First build release configuration using `cmake` and `msbuild` according to the [documentation](../docs/installation.md#visual-studio-native-build). ```bash -cd -cpack -C "Release" -G NSIS64 +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 ``` \ No newline at end of file