Skip to content

Commit fada7c2

Browse files
authored
Merge pull request #84 from bkryza/fix-relative-to-paths
Fix relative to paths
2 parents 9a527ee + da30adc commit fada7c2

File tree

203 files changed

+3700
-3164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+3700
-3164
lines changed

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# CHANGELOG
2-
2+
3+
* Added relationship deduction from `auto` return types which are template
4+
specializations (#82)
5+
* Fixed lambda names in class diagrams to be based on relative paths
6+
with respect to `relative_to` config option (#78)
7+
* Fixed relative paths in config files to be relative to the parent of
8+
the configuration file by default (#69)
39
* Added command line option (--dump-config) to print effective config (#77)
410
* Added support for building with Microsoft Visual Studio
511

docs/configuration_file.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* [Top level options](#top-level-options)
66
* [Diagram options](#diagram-options)
77
* [Example complete config](#example-complete-config)
8+
* [Paths](#paths)
89

910
<!-- tocstop -->
1011

@@ -113,4 +114,20 @@ diagrams:
113114
# Add this line to the beginning of the resulting puml file
114115
before:
115116
- 'title clang-uml class diagram model'
116-
```
117+
```
118+
119+
## Paths
120+
By default, all paths specified in the configuration file, including:
121+
122+
* `glob`
123+
* `output_directory`
124+
* `compilation_database_dir`
125+
* `paths` filter
126+
127+
are relative to the parent directory of the configuration file. This can be
128+
changed in the following ways:
129+
* by specifying `relative_to` option in the configuration file
130+
* by providing `--paths-relative-to-pwd` command line option, in which
131+
case all paths will be relative to the directory where `clang-uml` is
132+
executed (this only makes sense for automation where `clang-uml` is executed
133+
from the same location relative to the project directory

docs/test_cases.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
# Test cases index
2-
3-
<!-- toc -->
4-
5-
* [Class diagrams](#class-diagrams)
6-
* [Sequence diagrams](#sequence-diagrams)
7-
* [Package diagrams](#package-diagrams)
8-
* [Include diagrams](#include-diagrams)
9-
* [Configuration diagrams](#configuration-diagrams)
10-
11-
<!-- tocstop -->
12-
132
## Class diagrams
143
* [t00002](./test_cases/t00002.md) - Basic class inheritance
154
* [t00003](./test_cases/t00003.md) - Class field and methods
@@ -60,6 +49,7 @@
6049
* [t00048](./test_cases/t00048.md) - Test case for unique entity id with multiple translation units
6150
* [t00049](./test_cases/t00049.md) - Test case configurable type aliases
6251
* [t00050](./test_cases/t00050.md) - Test case for generating notes from comments using jinja templates
52+
* [t00051](./test_cases/t00051.md) - Test case for relative paths in lambda names
6353
## Sequence diagrams
6454
* [t20001](./test_cases/t20001.md) - Basic sequence diagram test case
6555
* [t20002](./test_cases/t20002.md) - Free function sequence diagram test case

docs/test_cases/t00002_class.svg

Lines changed: 18 additions & 18 deletions
Loading

docs/test_cases/t00003_class.svg

Lines changed: 23 additions & 23 deletions
Loading

docs/test_cases/t00004_class.svg

Lines changed: 38 additions & 38 deletions
Loading

docs/test_cases/t00005_class.svg

Lines changed: 55 additions & 55 deletions
Loading

docs/test_cases/t00006_class.svg

Lines changed: 66 additions & 66 deletions
Loading

docs/test_cases/t00007_class.svg

Lines changed: 15 additions & 15 deletions
Loading

0 commit comments

Comments
 (0)