Skip to content

Cleanup Build #673

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.

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
merged 37 commits into from
Oct 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0b5fa33
Pin swift version
fabianbs96 Sep 30, 2023
26d43e0
Some build cleanup
fabianbs96 Oct 1, 2023
20aec5e
Correctly find unittests even if the build-folder is not called "build"
fabianbs96 Oct 2, 2023
dc8fb86
Greater build variety in the CI
fabianbs96 Oct 2, 2023
beb086e
Minimize direct modification of CMAKE_CXX_FLAGS + use portable varian…
fabianbs96 Oct 2, 2023
1d5d25d
Add compile options only for C++ build + link LLVM publicly to suppor…
fabianbs96 Oct 2, 2023
bb76601
Only add asan for CXX builds
fabianbs96 Oct 3, 2023
e31e6cb
Some build cleanup
fabianbs96 Oct 1, 2023
df57b8f
Correctly find unittests even if the build-folder is not called "build"
fabianbs96 Oct 2, 2023
1aee661
Greater build variety in the CI
fabianbs96 Oct 2, 2023
7911cd9
Minimize direct modification of CMAKE_CXX_FLAGS + use portable varian…
fabianbs96 Oct 2, 2023
31edaad
Add compile options only for C++ build + link LLVM publicly to suppor…
fabianbs96 Oct 2, 2023
bc53ffb
Only add asan for CXX builds
fabianbs96 Oct 3, 2023
6127bc6
Move config defines to config.h.in
fabianbs96 Oct 3, 2023
13502ef
Merge branch 'f-CleanupBuild' of github-psr:secure-software-engineeri…
fabianbs96 Oct 3, 2023
2080b29
Fix add_cxx_* macros + link more privately
fabianbs96 Oct 3, 2023
740a60b
Make PhasarClang optional
fabianbs96 Oct 3, 2023
4052d1e
Install phasar-config.h
fabianbs96 Oct 3, 2023
319d22b
Out-factor DebugSan in PHASAR_ENABLE_SANITIZERS
fabianbs96 Oct 4, 2023
7674e70
Allow for multi-config (not tested)
fabianbs96 Oct 4, 2023
85440f5
Make dependencies independent from phasar build flags + enable more w…
fabianbs96 Oct 4, 2023
2753330
Support for manually setting USE_LLVM_FAT_LIB + remove some obsolete …
fabianbs96 Oct 9, 2023
cd17dd4
Cleanup system deps
fabianbs96 Oct 9, 2023
40fbb3b
Fix install boost in CI
fabianbs96 Oct 9, 2023
49430d3
Modernize LLVM build + minor improvements in bootstrap.sh
fabianbs96 Oct 9, 2023
b28bfd4
Merge branch 'development' into f-CleanupBuild
fabianbs96 Oct 9, 2023
2ddeb55
Improve add_phasar_library
fabianbs96 Oct 12, 2023
d5a40dd
Fix phasar_llvm lib build
fabianbs96 Oct 12, 2023
37aace4
Cleanup inclusion of OpenSSL- and Swift tests
fabianbs96 Oct 13, 2023
2acb9ed
minor
fabianbs96 Oct 16, 2023
fdcb57d
Remove explicit definition of linker language and lib prefix
fabianbs96 Oct 16, 2023
aac4aa2
Update install
fabianbs96 Oct 16, 2023
0d8104f
Improve install by adding phasar include directories to the targets i…
fabianbs96 Oct 17, 2023
61fb768
minor
fabianbs96 Oct 17, 2023
99d4288
Small fixes for the in-tree build
fabianbs96 Oct 18, 2023
0fa2a0f
minor style
fabianbs96 Oct 20, 2023
652c644
minor tweak for in-tree build
fabianbs96 Oct 20, 2023
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
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Checks: '-*,
-cppcoreguidelines-non-private-member-variables-in-classes,
-cppcoreguidelines-init-variables,
-cppcoreguidelines-macro-usage,
-cppcoreguidelines-avoid-do-while,
bugprone-*,
-bugprone-easily-swappable-parameters,
modernize-*,
Expand Down
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ assignees: ''
Replace the empty checkboxes [ ] below with checked ones [x] accordingly. -->

- [ ] I have searched open and closed issues for duplicates
- [ ] I made sure that I am not using an old project version (DO: pull Phasar, update git submodules, rebuild the project and check if the bug is still there)
- [ ] I made sure that I am not using an old project version (DO: pull PhASAR, update git submodules, rebuild the project and check if the bug is still there)

----------------------------------------

Expand All @@ -24,9 +24,9 @@ Describe here the issue that you are experiencing.
- that reproduce the bug
- e.g. cli arguments and flags

**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behaviour)
**Actual result:** Describe here what happens after you run the steps above (i.e. the buggy behavior)

**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behaviour)
**Expected result:** Describe here what should happen after you run the steps above (i.e. what would be the correct behavior)

### Context (Environment)

Expand All @@ -35,7 +35,7 @@ Describe here the issue that you are experiencing.
- **phasar:** \[commit-id]
- **googletest:** \[commit-id]
- **json:** \[commit-id]
- **WALi-OpenNWA:** \[commit-id]
- **json-schema-validator** \[commit-id]

<!-- Which operating system are you using? -->

Expand All @@ -48,11 +48,12 @@ Describe here the issue that you are experiencing.

**Build Type:**
- [ ] cmake
- [ ] bootstrap.sh
- [ ] custom build

### Possible solution

We are happy to discuss possible solutions to this problem, especially if it origniates from a design flaw.
We are happy to discuss possible solutions to this problem, especially if it originates from a design flaw.

### Example files

Expand Down
24 changes: 10 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ jobs:
matrix:
compiler: [ [clang++-14, clang-14] ]
build: [ Debug, Release ]
include:
- build: Debug
flags: -DPHASAR_BUILD_DYNLIB=ON -DPHASAR_ENABLE_SANITIZERS=ON
- build: Release
flags: -DPHASAR_ENABLE_DYNAMIC_LOG=OFF

continue-on-error: false
steps:
Expand All @@ -23,20 +28,11 @@ jobs:
fetch-depth: 0
submodules: recursive

- name: Install Basic Dependencies
shell: bash
run: |
sudo apt-get update
sudo apt-get -y install --no-install-recommends \
cmake \
ninja-build \
libstdc++6 \
libboost-all-dev

- name: Install Phasar Dependencies
shell: bash
run: |
./utils/InstallAptDependencies.sh
sudo apt-get -y install --no-install-recommends libboost-graph-dev

- name: Install Strategy Dependencies
shell: bash
Expand All @@ -59,17 +55,17 @@ jobs:
swift-version: "5.8.1"
- name: Building Phasar in ${{ matrix.build }} with ${{ matrix.compiler[0] }}
env:
BUILD_TYPE: ${{ matrix.build }}
CXX: ${{ matrix.compiler[0] }}
CC: ${{ matrix.compiler[1] }}
shell: bash
run: |
mkdir build
cd build
cmake .. \
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-DCMAKE_CXX_COMPILER=$CXX \
-DBUILD_SWIFT_TESTS=1 \
-DCMAKE_BUILD_TYPE=${{ matrix.build }} \
-DBUILD_SWIFT_TESTS=ON \
-DPHASAR_DEBUG_LIBDEPS=ON \
${{ matrix.flags }} \
-G Ninja
cmake --build .

Expand Down
1 change: 1 addition & 0 deletions BreakingChanges.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Development HEAD

- Default build mode is no longer `SHARED` but `STATIC`. To build in shared mode, use the cmake option `BUILD_SHARED_LIBS` which we don't recommend anymore. Consider using `PHASAR_BUILD_DYNLIB` instead to build one big libphasar.so.
- Build type `DebugSan` has been removed in favor of a new CMake option `PHASAR_ENABLE_SANITIZERS` that not only works in `Debug` mode.

## v0323

Expand Down
Loading