Skip to content

Commit 15e4a4b

Browse files
authored
Merge pull request #432 from bruntib/clang10
Uplift used Clang to 10.0
2 parents 4ac0bdc + 969693d commit 15e4a4b

14 files changed

Lines changed: 109 additions & 101 deletions

File tree

.travis.yml

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,19 @@ services:
1010
update: true
1111
sources:
1212
- ubuntu-toolchain-r-test
13-
- llvm-toolchain-xenial-7
13+
- sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main"
14+
key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"
1415

1516
.apt_xenial_sqlite: &apt_xenial_sqlite
1617
<<: *apt_xenial_config
1718
packages:
1819
# Boost
1920
- libboost-all-dev
2021
# LLVM/clang
21-
- llvm-7
22-
- llvm-7-dev
23-
- clang-7
24-
- libclang-7-dev
22+
- llvm-10
23+
- llvm-10-dev
24+
- clang-10
25+
- libclang-10-dev
2526
# Java
2627
- default-jdk
2728
# ODB
@@ -52,10 +53,10 @@ services:
5253
# Boost
5354
- libboost-all-dev
5455
# LLVM/clang
55-
- llvm-7
56-
- llvm-7-dev
57-
- clang-7
58-
- libclang-7-dev
56+
- llvm-10
57+
- llvm-10-dev
58+
- clang-10
59+
- libclang-10-dev
5960
# Java
6061
- default-jdk
6162
# ODB
@@ -89,10 +90,10 @@ services:
8990
# Boost
9091
- libboost-all-dev
9192
# LLVM/clang
92-
- llvm-7
93-
- llvm-7-dev
94-
- clang-7
95-
- libclang-7-dev
93+
- llvm-10
94+
- llvm-10-dev
95+
- clang-10
96+
- libclang-10-dev
9697
# Java
9798
- default-jdk
9899
# ODB
@@ -120,10 +121,10 @@ services:
120121
# Boost
121122
- libboost-all-dev
122123
# LLVM/clang
123-
- llvm-7
124-
- llvm-7-dev
125-
- clang-7
126-
- libclang-7-dev
124+
- llvm-10
125+
- llvm-10-dev
126+
- clang-10
127+
- libclang-10-dev
127128
# Java
128129
- default-jdk
129130
# ODB
@@ -154,10 +155,10 @@ services:
154155
# Boost
155156
- libboost-all-dev
156157
# LLVM/clang
157-
- llvm-7
158-
- llvm-7-dev
159-
- clang-7
160-
- libclang-7-dev
158+
- llvm-10
159+
- llvm-10-dev
160+
- clang-10
161+
- libclang-10-dev
161162
# Java
162163
- default-jdk
163164
# ODB
@@ -186,10 +187,10 @@ services:
186187
# Boost
187188
- libboost-all-dev
188189
# LLVM/clang
189-
- llvm-7
190-
- llvm-7-dev
191-
- clang-7
192-
- libclang-7-dev
190+
- llvm-10
191+
- llvm-10-dev
192+
- clang-10
193+
- libclang-10-dev
193194
# Java
194195
- default-jdk
195196
# ODB
@@ -323,8 +324,8 @@ before_script:
323324
- llvm-config --version --has-rtti
324325
- javac -version
325326
# LLVM/Clang test from package install
326-
- /usr/bin/clang-7 --version
327-
- /usr/bin/llvm-config-7 --version --has-rtti
327+
- /usr/bin/clang-10 --version
328+
- /usr/bin/llvm-config-10 --version --has-rtti
328329
# ODB
329330
- export CMAKE_PREFIX_PATH=$HOME/odb_install:$CMAKE_PREFIX_PATH
330331
- export PATH=$HOME/odb_install/bin:$PATH
@@ -358,8 +359,8 @@ before_script:
358359
-DCMAKE_BUILD_TYPE=Release
359360
-DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/install_pgsql
360361
-DTEST_DB="pgsql:host=localhost;port=5432;user=postgres;password=;database=cc_test"
361-
-DLLVM_DIR=/usr/lib/llvm-7/cmake
362-
-DClang_DIR=/usr/lib/cmake/clang-7
362+
-DLLVM_DIR=/usr/lib/llvm-10/cmake
363+
-DClang_DIR=/usr/lib/cmake/clang-10
363364
- make install -j $(nproc)
364365
- make test ARGS=-V
365366

@@ -372,8 +373,8 @@ before_script:
372373
-DCMAKE_BUILD_TYPE=Release
373374
-DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/install_sqlite
374375
-DTEST_DB="sqlite:database=$HOME/cc_test.sqlite"
375-
-DLLVM_DIR=/usr/lib/llvm-7/cmake
376-
-DClang_DIR=/usr/lib/cmake/clang-7
376+
-DLLVM_DIR=/usr/lib/llvm-10/cmake
377+
-DClang_DIR=/usr/lib/cmake/clang-10
377378
- make install -j $(nproc)
378379
- make test ARGS=-V
379380

doc/deps.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ be installed from the official repository of the given Linux distribution.
1616
is required. (Alternatively, you can compile with Clang.)
1717
- **`gcc-X`, `gcc-X-plugin-dev`**: For building ODB.
1818
- **`libboost-all-dev`**: Boost can be used during the development.
19-
- **`llvm-7-dev`**, **`clang-7`**, **`libclang-7-dev`**: C++ parser uses
19+
- **`llvm-10-dev`**, **`clang-10`**, **`libclang-10-dev`**: C++ parser uses
2020
LLVM/Clang for parsing the source code.
2121
- **`odb`**, **`libodb-dev`**: For persistence ODB can be used which is an
2222
Object Relation Mapping (ORM) system.
@@ -48,17 +48,17 @@ known issues.
4848

4949
#### Ubuntu 16.04 ("Xenial Xerus") LTS
5050

51-
The standard Ubuntu Xenial package repository contains only LLCM/Clang version
52-
6, which is not sufficient for CodeCompass, as at least version 7.0 is
51+
The standard Ubuntu Xenial package repository contains only LLVM/Clang version
52+
6, which is not sufficient for CodeCompass, as at least version 10.0 is
5353
required. Therefore LLVM and Clang should be installed from the official LLVM
5454
repositories:
5555

5656
```bash
57-
sudo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main
58-
sudo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main
57+
sudo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main
58+
sudo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main
5959

6060
sudo apt-get install git cmake make g++ libboost-all-dev \
61-
llvm-7-dev libclang-7-dev \
61+
llvm-10-dev libclang-10-dev \
6262
odb libodb-dev \
6363
default-jdk libssl-dev libgraphviz-dev libmagic-dev libgit2-dev ctags \
6464
libgtest-dev npm nodejs-legacy
@@ -68,7 +68,7 @@ sudo apt-get install git cmake make g++ libboost-all-dev \
6868

6969
```bash
7070
sudo apt install git cmake make g++ gcc-7-plugin-dev libboost-all-dev \
71-
llvm-7-dev clang-7 libclang-7-dev \
71+
llvm-10-dev clang-10 libclang-10-dev \
7272
default-jdk libssl1.0-dev libgraphviz-dev libmagic-dev libgit2-dev ctags \
7373
libgtest-dev npm
7474
```
@@ -77,7 +77,7 @@ sudo apt install git cmake make g++ gcc-7-plugin-dev libboost-all-dev \
7777

7878
```bash
7979
sudo apt install git cmake make g++ libboost-all-dev \
80-
llvm-7-dev clang-7 libclang-7-dev \
80+
llvm-10-dev clang-10 libclang-10-dev \
8181
odb libodb-dev thrift-compiler libthrift-dev \
8282
default-jdk libssl-dev libgraphviz-dev libmagic-dev libgit2-dev ctags \
8383
libgtest-dev npm
@@ -277,8 +277,8 @@ cmake .. \
277277
-DCMAKE_INSTALL_PREFIX=<CodeCompass_install_dir> \
278278
-DDATABASE=<database_type> \
279279
-DCMAKE_BUILD_TYPE=<build_type> \
280-
-DLLVM_DIR=/usr/lib/llvm-7/cmake \
281-
-DClang_DIR=/usr/lib/cmake/clang-7
280+
-DLLVM_DIR=/usr/lib/llvm-10/cmake \
281+
-DClang_DIR=/usr/lib/cmake/clang-10
282282

283283
# To specify linker for building CodeCompass use
284284
# -DCODECOMPASS_LINKER=<path_to_linker>

docker/dev/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ RUN set -x && apt-get update -qq \
2222
libmagic-dev \
2323
libsqlite3-dev \
2424
libssl-dev \
25-
llvm-7 clang-7 llvm-7-dev libclang-7-dev \
25+
llvm-10 clang-10 llvm-10-dev libclang-10-dev \
2626
npm \
2727
thrift-compiler libthrift-dev \
2828
odb libodb-sqlite-dev libodb-pgsql-dev && \

docker/runtime/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ARG DEBIAN_FRONTEND=noninteractive
4343

4444
RUN set -x && apt-get update -qq \
4545
&& apt-get install -qqy --no-install-recommends \
46-
llvm-7 \
46+
llvm-10 \
4747
libboost-filesystem-dev libboost-log-dev libboost-program-options-dev \
4848
libsqlite3-dev \
4949
postgresql-server-dev-12 \

docker/web/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ARG DEBIAN_FRONTEND=noninteractive
1717

1818
RUN set -x && apt-get update -qq \
1919
&& apt-get install -qqy --no-install-recommends \
20-
llvm-7 \
20+
llvm-10 \
2121
libboost-filesystem-dev libboost-log-dev libboost-program-options-dev \
2222
libsqlite3-dev \
2323
postgresql-server-dev-12 \

0 commit comments

Comments
 (0)