Skip to content

Commit b45553a

Browse files
committed
Merge branch 'development' into master_github
2 parents 40803be + b15adfb commit b45553a

851 files changed

Lines changed: 7046 additions & 8910 deletions

File tree

Some content is hidden

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

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
./docker
2-
./build
2+
./build

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Describe here the issue that you are experiencing.
4646

4747
<!-- Which build-* script are you using for the build? -->
4848

49-
**Build Type:**
49+
**Build Type:**
5050
- [ ] cmake
5151
- [ ] custom build
5252

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: true
1414
matrix:
15-
compiler: [ [clang++-13, clang-13] ]
15+
compiler: [ [clang++-14, clang-14] ]
1616
build: [ Debug, Release ]
1717

1818
continue-on-error: false
@@ -42,16 +42,16 @@ jobs:
4242
shell: bash
4343
run: |
4444
sudo apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key
45-
sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
45+
sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main'
4646
sudo apt-get update
4747
sudo apt-get -y install --no-install-recommends \
4848
${{ matrix.compiler[1] }} \
49-
llvm-13-dev \
50-
libllvm13 \
51-
libclang-common-13-dev \
52-
libclang-13-dev \
53-
libclang-cpp13-dev \
54-
clang-tidy-13
49+
llvm-14-dev \
50+
libllvm14 \
51+
libclang-common-14-dev \
52+
libclang-14-dev \
53+
libclang-cpp14-dev \
54+
clang-tidy-14
5555
5656
- name: Building Phasar in ${{ matrix.build }} with ${{ matrix.compiler[0] }}
5757
env:

.github/workflows/reviewdog-clang-format.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
- tool: clang-format
1616
install: |
1717
sudo apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key
18-
sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main'
18+
sudo add-apt-repository -y 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main'
1919
sudo apt-get update
20-
sudo apt-get -y install --no-install-recommends clang-format-13
20+
sudo apt-get -y install --no-install-recommends clang-format-14
2121
regex: \.(h|c|hpp|cpp)$
22-
command: clang-format-13 --style=file -i
22+
command: clang-format-14 --style=file -i
2323

2424
continue-on-error: false
2525
steps:

.gitlab-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ image: pdschbrt/phasar-build-environment:latest
33
stages:
44
- build
55

6-
# install the necessary build tools
7-
before_script:
6+
# install the necessary build tools
7+
before_script:
88
- git submodule update --init --recursive
9-
9+
1010
build:
1111
stage: build
1212
# build all interesting targets
13-
script:
13+
script:
1414
- mkdir -p build
1515
- cd build
1616
- echo "checking RAM"

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v2.4.0
5+
rev: v4.3.0
66
hooks:
77
- id: trailing-whitespace
88
- id: end-of-file-fixer
99
- id: check-yaml
1010
- id: check-added-large-files
1111
- id: requirements-txt-fixer
1212
- repo: https://github.com/pre-commit/mirrors-clang-format
13-
rev: 'v13.0.0'
13+
rev: 'v14.0.6'
1414
hooks:
1515
- id: clang-format

.travis.yml

Lines changed: 0 additions & 88 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,10 @@ include_directories(
109109

110110
set(PHASAR_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}/phasar)
111111

112-
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${PHASAR_INSTALL_LIBDIR})
113-
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
112+
if (NOT PHASAR_IN_TREE)
113+
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${PHASAR_INSTALL_LIBDIR})
114+
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
115+
endif()
114116

115117
if (LLVM_ENABLE_LIBCXX)
116118
set(PHASAR_STD_FILESYSTEM c++fs)
@@ -123,8 +125,8 @@ endif()
123125
find_package(Threads)
124126

125127
# Boost
126-
find_package(Boost 1.65.1 COMPONENTS filesystem graph system program_options log ${BOOST_THREAD} REQUIRED)
127-
#find_package(Boost 1.72.0 COMPONENTS filesystem graph system program_options log ${BOOST_THREAD} REQUIRED)
128+
find_package(Boost 1.65.1 COMPONENTS graph program_options ${BOOST_THREAD} REQUIRED)
129+
#find_package(Boost 1.72.0 COMPONENTS graph program_options ${BOOST_THREAD} REQUIRED)
128130
include_directories(${Boost_INCLUDE_DIRS})
129131

130132
# Disable clang-tidy for the external projects
@@ -179,7 +181,7 @@ include_directories(${SQLITE3_INCLUDE_DIR})
179181
# LLVM
180182
if (NOT PHASAR_IN_TREE)
181183
# Only search for LLVM if we build out of tree
182-
find_package(LLVM 13 REQUIRED CONFIG)
184+
find_package(LLVM 14 REQUIRED CONFIG)
183185
include_directories(${LLVM_INCLUDE_DIRS})
184186
link_directories(${LLVM_LIB_PATH} ${LLVM_LIBRARY_DIRS})
185187
endif()
@@ -288,8 +290,6 @@ llvm_map_components_to_libnames(llvm_libs
288290
# phasar-based binaries
289291
add_subdirectory(tools)
290292

291-
set(PHASAR_PLUGINS_LIB phasar_plugins)
292-
293293
# Add Phasar unittests and build all IR test code
294294
if (PHASAR_BUILD_UNITTESTS)
295295
message("Phasar unittests")
@@ -406,10 +406,7 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${MAJOR_VERSION}.${MIN
406406
# better use autogenerated dependency information
407407
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
408408
# set(CPACK_DEBIAN_PACKAGE_DEPENDS "libboost_program_options (>= 1.66.0),
409-
# libboost_filesystem (>= 1.66.0),
410409
# libboost_graph (>= 1.66.0),
411-
# libboost_system (>= 1.66.0),
412-
# libboost_log (>= 1.66.0),
413410
# libboost_thread (>= 1.66.0),
414411
# libsqlite3 (>= 4.5.0),
415412
# libpthread (>= 4.5.0),

CODING_GUIDELINES.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
Coding Guidelines
22
=================
33

4-
In order to unify the look and feel of the Phasar code base, code should be
4+
In order to unify the look and feel of the Phasar code base, code should be
55
written according to the LLVM coding guidelines wherever possible. The LLVM
66
coding guidelines can be here:
77

88
https://llvm.org/docs/CodingStandards.html
99

10-
In addition, the pre-commit script in githooks/ has to be copied into the
10+
In addition, the pre-commit script in githooks/ has to be copied into the
1111
./git/hooks/ directory:
1212

1313
$ cp githooks/pre-commit .git/hooks/
1414

1515
The script will run some useful clang-tidy checks as well as clang-format over
1616
the entire code base just before your changes are committed in order to reduce
17-
the number of unnecessary merge conflicts and to unify the code base.
17+
the number of unnecessary merge conflicts and to unify the code base.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ A reviewer may request changes or ask questions during the review. If you are un
2828
Please remember that you are asking for valuable time from other professional developers.
2929

3030
## Please Help Us to Improve Phasar
31-
If you are using PhASAR without the wish or expertise to contribute to its code base, you can still help us by providing valuable feedback using this [web from](https://docs.google.com/forms/d/e/1FAIpQLScUXZcdXZe1rY8VxUKjXhTtrsNX5TysNUO4yD8-gaIHiqqWTQ/viewform). Please also refer to [Contributing to PhASAR](https://github.com/secure-software-engineering/phasar/wiki/Contributing-to-PhASAR).
31+
If you are using PhASAR without the wish or expertise to contribute to its code base, you can still help us by providing valuable feedback using this [web from](https://docs.google.com/forms/d/e/1FAIpQLScUXZcdXZe1rY8VxUKjXhTtrsNX5TysNUO4yD8-gaIHiqqWTQ/viewform). Please also refer to [Contributing to PhASAR](https://github.com/secure-software-engineering/phasar/wiki/Contributing-to-PhASAR).
3232

3333
Thanks for contributing to the PhASAR project.
3434

0 commit comments

Comments
 (0)