Skip to content

Commit dc126c6

Browse files
committed
Public version 0.5.0
1 parent 7a4a7b1 commit dc126c6

File tree

408 files changed

+41804
-9945
lines changed

Some content is hidden

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

408 files changed

+41804
-9945
lines changed

.gitlab-ci.yml

Lines changed: 85 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
stages:
22
- build_major_compilers
3+
- build_minor_compiler_gcc10
4+
- build_minor_compiler_gcc9
35
- build_minor_compiler_gcc8
46
- build_minor_compiler_gcc7
57
- build_major_compiler_clang
@@ -9,10 +11,34 @@ stages:
911
- install_deb_file
1012
- install_rpm_file
1113

12-
build_gcc10:
14+
build_gcc:
15+
only:
16+
refs:
17+
- master
1318
tags:
1419
- vm_linux
1520
stage: build_major_compilers
21+
image: gcc
22+
script:
23+
- apt-get update
24+
- apt-get install cmake -y
25+
# Build without boost
26+
- ./build.sh
27+
# Build with boost
28+
- apt-get install libboost-test-dev -y
29+
- cd build
30+
- cmake .. -DCMAKE_BUILD_TYPE=Release -DCPPINCLUDE_BUILD_WITH_TESTS=ON
31+
- cmake --build . --config Release -j$(nproc)
32+
# Run tests
33+
- ctest . -C Release
34+
35+
build_gcc10:
36+
only:
37+
refs:
38+
- master
39+
tags:
40+
- vm_linux
41+
stage: build_minor_compiler_gcc10
1642
image: ubuntu
1743
script:
1844
- apt-get update
@@ -28,8 +54,32 @@ build_gcc10:
2854
- cmake --build . --config Release -j$(nproc)
2955
# Run tests
3056
- ctest . -C Release
57+
needs: [build_gcc]
58+
59+
build_gcc9:
60+
only:
61+
refs:
62+
- master
63+
tags:
64+
- vm_linux
65+
stage: build_minor_compiler_gcc9
66+
image: ubuntu
67+
script:
68+
- apt-get update
69+
- apt-get install cmake gcc-9 g++-9 libboost-test-dev -y
70+
- export CC=gcc-9
71+
- export CXX=g++-9
72+
- cd build
73+
- cmake .. -DCMAKE_BUILD_TYPE=Release -DCPPINCLUDE_BUILD_WITH_TESTS=ON
74+
- cmake --build . --config Release -j$(nproc)
75+
# Run tests
76+
- ctest . -C Release
77+
needs: [build_gcc10]
3178

3279
build_gcc8:
80+
only:
81+
refs:
82+
- master
3383
tags:
3484
- vm_linux
3585
stage: build_minor_compiler_gcc8
@@ -44,9 +94,12 @@ build_gcc8:
4494
- cmake --build . --config Release -j$(nproc)
4595
# Run tests
4696
- ctest . -C Release
47-
needs: [build_gcc10]
97+
needs: [build_gcc9]
4898

4999
build_gcc7:
100+
only:
101+
refs:
102+
- master
50103
tags:
51104
- vm_linux
52105
stage: build_minor_compiler_gcc7
@@ -64,6 +117,9 @@ build_gcc7:
64117
needs: [build_gcc8]
65118

66119
build_clang:
120+
only:
121+
refs:
122+
- master
67123
tags:
68124
- vm_linux
69125
stage: build_major_compiler_clang
@@ -81,6 +137,9 @@ build_clang:
81137
needs: [build_gcc7]
82138

83139
build_windows:
140+
only:
141+
refs:
142+
- master
84143
stage: build_major_compilers
85144
tags:
86145
- vm_win
@@ -102,6 +161,9 @@ build_windows:
102161
- ctest . -C Release
103162

104163
build_vs2017:
164+
only:
165+
refs:
166+
- master
105167
stage: build_major_compilers
106168
tags:
107169
- vm_win
@@ -115,6 +177,9 @@ build_vs2017:
115177
- cmake --build . --config Release -j4
116178

117179
build_macos:
180+
only:
181+
refs:
182+
- master
118183
stage: build_major_compilers
119184
tags:
120185
- macmini
@@ -130,6 +195,9 @@ build_macos:
130195
- ctest . -C Release
131196

132197
build_arm_linux:
198+
only:
199+
refs:
200+
- master
133201
stage: build_minor_compiler_arm
134202
tags:
135203
- arm-linux
@@ -139,9 +207,12 @@ build_arm_linux:
139207
- cmake --build . --config Release -j$(nproc)
140208
# Run tests
141209
- ctest . -C Release
142-
needs: [build_gcc10]
210+
needs: [build_gcc]
143211

144212
check_typos:
213+
only:
214+
refs:
215+
- master
145216
tags:
146217
- vm_linux
147218
stage: check_typos
@@ -158,6 +229,9 @@ check_typos:
158229
needs: [build_clang]
159230

160231
cppcheck:
232+
only:
233+
refs:
234+
- master
161235
tags:
162236
- vm_linux
163237
stage: run_cppcheck
@@ -171,6 +245,9 @@ cppcheck:
171245
needs: [check_typos]
172246

173247
generate_deb_file:
248+
only:
249+
refs:
250+
- master
174251
tags:
175252
- vm_linux
176253
stage: install_deb_file
@@ -191,13 +268,16 @@ generate_deb_file:
191268
needs: [cppcheck]
192269

193270
generate_rpm_file:
271+
only:
272+
refs:
273+
- master
194274
tags:
195275
- vm_linux
196276
stage: install_rpm_file
197277
image: centos
198278
script:
199279
- yum group install "Development Tools" -y
200-
- yum install cmake3 -y
280+
- yum install cmake3 libarchive -y
201281
- cd build
202282
- cmake3 .. -DCMAKE_BUILD_TYPE=Release
203283
- cmake3 --build . --config Release
@@ -206,6 +286,6 @@ generate_rpm_file:
206286
- rpm -i *.rpm
207287
- cd ..
208288
- cppinclude --version
209-
needs: [build_gcc10]
289+
needs: [build_gcc]
210290

211291

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
# Changelog
22

3+
## [v0.5.0](docs/versions/VERSION_0.5.0.md)
4+
5+
### Improved (v0.5.0)
6+
7+
* Perfomance with regex
8+
9+
### Added (v0.5.0)
10+
11+
* New argument *show_details*
12+
* New argument *thousands_separator*
13+
* New argument *verbose_ignore*
14+
315
## [v0.4.0](docs/versions/VERSION_0.4.0.md)
416

517
### Added (v0.4.0)
618

7-
* New argument *show_only_std_headers*
19+
* New argument *show_only_std_headers*
820

921
## [v0.3.1](docs/versions/VERSION_0.3.1.md)
1022

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.10)
22

33
project(cppinclude
4-
VERSION 0.4.0
4+
VERSION 0.5.0
55
DESCRIPTION "Tool for analyzing includes in C++"
66
LANGUAGES CXX
77
)
@@ -10,6 +10,7 @@ include_directories(src/)
1010
include_directories(src/3rd-part/fmt/include/)
1111
include_directories(src/3rd-part/stdfwd/include/)
1212
include_directories(src/3rd-part/std_fs/include/)
13+
include_directories(src/3rd-part/std_fs/re2/re2)
1314

1415
set(CMAKE_CXX_STANDARD 17)
1516
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -60,6 +61,7 @@ add_subdirectory(src/tools)
6061
add_subdirectory(src/project)
6162
add_subdirectory(src/application)
6263
add_subdirectory(src/3rd-part/fmt)
64+
add_subdirectory(src/3rd-part/re2)
6365
add_subdirectory(src/json)
6466
add_subdirectory(src/compilation_db)
6567
add_subdirectory(src/cmake_project)

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2021 cppinclude
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

0 commit comments

Comments
 (0)