Skip to content

Uplift used Clang to 10.0 #432

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.

Sign up for GitHub

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

Merged
whisperity merged 3 commits into from
Aug 17, 2020
Merged

Uplift used Clang to 10.0 #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27ed5b9
Upstreaming to Clang 10
bruntib Aug 14, 2020
20f7c06
[cpp_reparse] Uplift plugin to support LLVM 10.0
whisperity Aug 14, 2020
969693d
Use LLVM/Clang 10 for Xenial in CI
mcserep Aug 17, 2020
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
63 changes: 32 additions & 31 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@ services:
update: true
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-xenial-7
- sourceline: "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main"
key_url: "https://apt.llvm.org/llvm-snapshot.gpg.key"

.apt_xenial_sqlite: &apt_xenial_sqlite
<<: *apt_xenial_config
packages:
# Boost
- libboost-all-dev
# LLVM/clang
- llvm-7
- llvm-7-dev
- clang-7
- libclang-7-dev
- llvm-10
- llvm-10-dev
- clang-10
- libclang-10-dev
# Java
- default-jdk
# ODB
Expand Down Expand Up @@ -52,10 +53,10 @@ services:
# Boost
- libboost-all-dev
# LLVM/clang
- llvm-7
- llvm-7-dev
- clang-7
- libclang-7-dev
- llvm-10
- llvm-10-dev
- clang-10
- libclang-10-dev
# Java
- default-jdk
# ODB
Expand Down Expand Up @@ -89,10 +90,10 @@ services:
# Boost
- libboost-all-dev
# LLVM/clang
- llvm-7
- llvm-7-dev
- clang-7
- libclang-7-dev
- llvm-10
- llvm-10-dev
- clang-10
- libclang-10-dev
# Java
- default-jdk
# ODB
Expand Down Expand Up @@ -120,10 +121,10 @@ services:
# Boost
- libboost-all-dev
# LLVM/clang
- llvm-7
- llvm-7-dev
- clang-7
- libclang-7-dev
- llvm-10
- llvm-10-dev
- clang-10
- libclang-10-dev
# Java
- default-jdk
# ODB
Expand Down Expand Up @@ -154,10 +155,10 @@ services:
# Boost
- libboost-all-dev
# LLVM/clang
- llvm-7
- llvm-7-dev
- clang-7
- libclang-7-dev
- llvm-10
- llvm-10-dev
- clang-10
- libclang-10-dev
# Java
- default-jdk
# ODB
Expand Down Expand Up @@ -186,10 +187,10 @@ services:
# Boost
- libboost-all-dev
# LLVM/clang
- llvm-7
- llvm-7-dev
- clang-7
- libclang-7-dev
- llvm-10
- llvm-10-dev
- clang-10
- libclang-10-dev
# Java
- default-jdk
# ODB
Expand Down Expand Up @@ -323,8 +324,8 @@ before_script:
- llvm-config --version --has-rtti
- javac -version
# LLVM/Clang test from package install
- /usr/bin/clang-7 --version
- /usr/bin/llvm-config-7 --version --has-rtti
- /usr/bin/clang-10 --version
- /usr/bin/llvm-config-10 --version --has-rtti
# ODB
- export CMAKE_PREFIX_PATH=$HOME/odb_install:$CMAKE_PREFIX_PATH
- export PATH=$HOME/odb_install/bin:$PATH
Expand Down Expand Up @@ -358,8 +359,8 @@ before_script:
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/install_pgsql
-DTEST_DB="pgsql:host=localhost;port=5432;user=postgres;password=;database=cc_test"
-DLLVM_DIR=/usr/lib/llvm-7/cmake
-DClang_DIR=/usr/lib/cmake/clang-7
-DLLVM_DIR=/usr/lib/llvm-10/cmake
-DClang_DIR=/usr/lib/cmake/clang-10
- make install -j $(nproc)
- make test ARGS=-V

Expand All @@ -372,8 +373,8 @@ before_script:
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/install_sqlite
-DTEST_DB="sqlite:database=$HOME/cc_test.sqlite"
-DLLVM_DIR=/usr/lib/llvm-7/cmake
-DClang_DIR=/usr/lib/cmake/clang-7
-DLLVM_DIR=/usr/lib/llvm-10/cmake
-DClang_DIR=/usr/lib/cmake/clang-10
- make install -j $(nproc)
- make test ARGS=-V

Expand Down
20 changes: 10 additions & 10 deletions doc/deps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ be installed from the official repository of the given Linux distribution.
is required. (Alternatively, you can compile with Clang.)
- **`gcc-X`, `gcc-X-plugin-dev`**: For building ODB.
- **`libboost-all-dev`**: Boost can be used during the development.
- **`llvm-7-dev`**, **`clang-7`**, **`libclang-7-dev`**: C++ parser uses
- **`llvm-10-dev`**, **`clang-10`**, **`libclang-10-dev`**: C++ parser uses
LLVM/Clang for parsing the source code.
- **`odb`**, **`libodb-dev`**: For persistence ODB can be used which is an
Object Relation Mapping (ORM) system.
Expand Down Expand Up @@ -48,17 +48,17 @@ known issues.

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

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

```bash
sudo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main
sudo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main
sudo deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main
sudo deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main

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

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

```bash
sudo apt install git cmake make g++ libboost-all-dev \
llvm-7-dev clang-7 libclang-7-dev \
llvm-10-dev clang-10 libclang-10-dev \
odb libodb-dev thrift-compiler libthrift-dev \
default-jdk libssl-dev libgraphviz-dev libmagic-dev libgit2-dev ctags \
libgtest-dev npm
Expand Down Expand Up @@ -277,8 +277,8 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=<CodeCompass_install_dir> \
-DDATABASE=<database_type> \
-DCMAKE_BUILD_TYPE=<build_type> \
-DLLVM_DIR=/usr/lib/llvm-7/cmake \
-DClang_DIR=/usr/lib/cmake/clang-7
-DLLVM_DIR=/usr/lib/llvm-10/cmake \
-DClang_DIR=/usr/lib/cmake/clang-10

# To specify linker for building CodeCompass use
# -DCODECOMPASS_LINKER=<path_to_linker>
Expand Down
2 changes: 1 addition & 1 deletion docker/dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN set -x && apt-get update -qq \
libmagic-dev \
libsqlite3-dev \
libssl-dev \
llvm-7 clang-7 llvm-7-dev libclang-7-dev \
llvm-10 clang-10 llvm-10-dev libclang-10-dev \
npm \
thrift-compiler libthrift-dev \
odb libodb-sqlite-dev libodb-pgsql-dev && \
Expand Down
2 changes: 1 addition & 1 deletion docker/runtime/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ARG DEBIAN_FRONTEND=noninteractive

RUN set -x && apt-get update -qq \
&& apt-get install -qqy --no-install-recommends \
llvm-7 \
llvm-10 \
libboost-filesystem-dev libboost-log-dev libboost-program-options-dev \
libsqlite3-dev \
postgresql-server-dev-12 \
Expand Down
2 changes: 1 addition & 1 deletion docker/web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ARG DEBIAN_FRONTEND=noninteractive

RUN set -x && apt-get update -qq \
&& apt-get install -qqy --no-install-recommends \
llvm-7 \
llvm-10 \
libboost-filesystem-dev libboost-log-dev libboost-program-options-dev \
libsqlite3-dev \
postgresql-server-dev-12 \
Expand Down
Loading