Skip to content
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

Conan migration #516

Draft
wants to merge 112 commits into
base: development
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
2153aee
restructure: preparation
jusito Jul 26, 2022
d473eac
restructure: mv a lot to old
jusito Jul 26, 2022
41f983a
restructure: moving include / src / test
jusito Jul 26, 2022
7f74332
restructre: includes to correct subfolder
jusito Jul 27, 2022
1ea753c
build: circular dep between utils / config resolve
jusito Jul 27, 2022
9714410
build: initial CMakeLists + just-simple.cmake
jusito Jul 27, 2022
0ee0e53
test: simple test for link resolving
jusito Jul 27, 2022
2c48b79
build: phasar-config
jusito Jul 27, 2022
7caf54a
restructure: partly reverting with fabian
jusito Jul 27, 2022
9dac8e6
build: fix circular dependency with fabian
jusito Jul 27, 2022
d353ddf
restructure: phasar-util-test working
jusito Jul 27, 2022
db15da9
restructure: phasar-db working
jusito Jul 27, 2022
e3e15e1
restructure: phasar-db-test working
jusito Jul 27, 2022
d5998f3
restructure: phasar-clang working
jusito Jul 27, 2022
3811be6
build: check always library order
jusito Jul 27, 2022
8cb3a15
restructured: merged PhasarPass and PhasarLLVM because of many circul…
jusito Jul 27, 2022
ecc0183
restructure: phasar-llvm & phasar-llvm-test
jusito Jul 28, 2022
4d3bf34
restructure: llvm_test_code moved to test folder
jusito Jul 28, 2022
25ef397
restructure: moved llvm_test_code part 1
jusito Jul 28, 2022
293f769
restructure: created llvm_test_code links
jusito Jul 28, 2022
e8ccbdd
restructure: llvm_test_code generation done
jusito Jul 28, 2022
636846a
restructure: migrated .ll path in tests
jusito Jul 28, 2022
0d8237b
restructure: fix files not copied, 14 tests fail
jusito Jul 28, 2022
cdce1db
restructure: fix openssl testcode
jusito Jul 28, 2022
48fa222
restructure: adding experimental / controller
jusito Aug 1, 2022
53931c2
restructure: adding phasar-llvm-tool
jusito Aug 1, 2022
8c16d26
temp: conan recipes
jusito Aug 1, 2022
d672303
restructure: mv example-tool
jusito Aug 1, 2022
1904b60
restructure: enabled example-tool
jusito Aug 1, 2022
81b7cbf
restructure: mv boomerang
jusito Aug 1, 2022
9af3df5
restructure: adding boomerang
jusito Aug 1, 2022
c0ad3bb
restructure: enabled phasar-clang-tool
jusito Aug 1, 2022
528d890
restructure: fix failing tests with fabian
jusito Aug 1, 2022
f87984f
restructure: rm unneccessary CMakeLists
jusito Aug 1, 2022
be6d777
restructure: fix src folder missing
jusito Aug 1, 2022
59fdc12
doc: cmake error more precise
jusito Aug 1, 2022
8a10f66
fix: macos m1 working
jusito Aug 2, 2022
2ed3e0f
build: updating conan llvm with libclang
jusito Aug 2, 2022
83f2033
build: adding libclang
jusito Aug 2, 2022
bd57421
build: .ll generation using conan bin
jusito Aug 2, 2022
72dc28e
test: removed unneccessary tests
jusito Aug 2, 2022
0919c9e
fix: updated n_json to match n_validator
jusito Aug 2, 2022
8ee2c50
fix: enabled phasar-clang
jusito Aug 10, 2022
fdf2cac
fix: updated js.cmake with install / coverage
jusito Aug 10, 2022
01d764f
build(llvm): adding llvm recipse from pr
jusito Aug 16, 2022
c6731c7
restructure: reverting doc/img folder mv
jusito Aug 16, 2022
3eab605
build(cmake): created options.cmake
jusito Aug 16, 2022
7089a65
doc: doxygen file updated to 1.9.4
jusito Aug 16, 2022
aef8793
dox: migrated doxygen
jusito Aug 16, 2022
e7c88c6
doc(doxygen): merged all targets
jusito Aug 17, 2022
aed5891
build: prepared PHASAR_IN_TREE
jusito Aug 17, 2022
17645cf
build: PHASAR_BUILD_UNITTESTS
jusito Aug 17, 2022
1dc3f52
build: CMAKE_SOURCE_DIR -> PROJECT_
jusito Aug 18, 2022
04dfa42
build: option skip doxygen
jusito Aug 18, 2022
29c2424
build: PHASAR_IN_TREE build is fine
jusito Aug 18, 2022
579f49d
restructure: cleanup & config/*
jusito Aug 19, 2022
5a9c0c6
build: cmake presets for static/in tree
jusito Aug 19, 2022
afabcf6
clean: old / temp scripts
jusito Aug 22, 2022
3ec2263
build: phasar shared + llvm recipe
jusito Aug 23, 2022
45fcabf
test: disabled Memory6/7
jusito Aug 23, 2022
fe2c22a
util: run_debugger.sh
jusito Aug 23, 2022
ca29007
clean: removed test only added for restructuring
jusito Aug 23, 2022
d28d8a9
tool: + missed log line
jusito Aug 24, 2022
0c7c0f9
build: update wali recipe + test_conan_package.sh
jusito Aug 24, 2022
7c1e44c
restructure: lib/ test/ -> old/ worklist
jusito Aug 24, 2022
7db8aa7
build: fix resources not copied
jusito Sep 5, 2022
afbac9c
build: fix doxygen not excluded on option
jusito Sep 5, 2022
aada550
build: test_conan_folder build folder incorrect
jusito Sep 5, 2022
779aeaf
build: + conanrecipe for phasar itself
jusito Sep 5, 2022
bd55bcd
doc(conan): keep_binaries not needed but used
jusito Sep 6, 2022
7d2b084
conan: git ignored example.ll
jusito Sep 7, 2022
e041835
conan(llvm): recipe supports llvm 15.0.0
jusito Sep 7, 2022
e62b1a0
util: tools for merge preparations
jusito Sep 7, 2022
6351186
restructure: cleaning old
jusito Sep 7, 2022
3066d53
restructure: prepared old for merging
jusito Sep 7, 2022
8c4b0ed
restructure: fix utils
jusito Sep 7, 2022
fb1bfad
build: fix link order + script
jusito Sep 15, 2022
43fb334
build: fix compiling / nlohmann_json version
jusito Sep 15, 2022
9acdd78
build: fix conan recipe dependency
jusito Sep 15, 2022
212606a
script: fix typo
jusito Sep 15, 2022
b328e0c
fix(utils): Table.h missing include
jusito Sep 15, 2022
9edecbc
build: updated just-simple.cmake + link order
jusito Sep 16, 2022
dc1cd1b
build(conan): calver + short has
jusito Sep 19, 2022
a8ce8f9
build(conan): moved files
jusito Sep 19, 2022
1fbb045
build(conan): fix export sources
jusito Sep 19, 2022
5bbae8d
util: improving merge helper
jusito Nov 30, 2022
4dda585
Merge branch 'development' into development-conan
jusito Dec 2, 2022
d07f35a
util: updated merge helper
jusito Dec 2, 2022
4f0f5e4
Merge branch 'development' into development-conan
jusito Dec 2, 2022
bb2c1ec
clean: removed wali
jusito Dec 5, 2022
507522d
Merge branch 'development' into development-conan
jusito Feb 14, 2023
635dee6
fix: deploy / previous merge
jusito Feb 14, 2023
da2f9d4
build: boost 1.81.0
jusito Feb 14, 2023
ae0e982
build: updated conan recipe
jusito Feb 14, 2023
a876eeb
Merge commit '7c2df98af1b2c16103f62861fc2992314c6b7a63' into developm…
jusito Jul 10, 2023
5dd8c5d
Merge commit '9edfdb8bbb764cbc40c7ac98c2bf9bb2eba2a7aa' into developm…
jusito Jul 10, 2023
3c0f86e
Merge commit '8f727f07cb8da6cf332f87dd4b8f79e1d416a74a' into developm…
jusito Jul 10, 2023
045f814
Merge commit 'a1a1a47d712b6a88b71bbb93724756005e9d0ebf' into developm…
jusito Jul 10, 2023
4645057
Merge commit 'a453b293cd918f0b389b0ac0e016a4b5c4672ef8' into developm…
jusito Jul 10, 2023
6e77a5e
Merge commit '5230c1f072726998462317d56115a4a118e458c3' into developm…
jusito Jul 10, 2023
9726469
Merge commit '5f185369e236195d61d9d9475678f75a2c7e309b' into developm…
jusito Jul 10, 2023
ca437ce
Merge commit 'b1a9431836a0e13a956db8f045f95e0aaeed3af8' into developm…
jusito Jul 10, 2023
8e07558
Merge commit 'e6b8e7f22b58443aa397dfdfad32e4e45cca12f3' into developm…
jusito Jul 10, 2023
9ac590a
Merge commit '42b05cab5b532405d8655b496fdec1b1d2178511' into developm…
jusito Jul 10, 2023
a8e487a
Merge commit '442a3d0d799d47c24b94590fa06bd1bdb7a94114' into developm…
jusito Jul 10, 2023
68fcdc1
Merge commit '0c50227860d23ce934b36ae4086e7726fb9fff72' into developm…
jusito Jul 10, 2023
ec77f11
Merge commit '67443314a76223b63efa83d87118745d05083ff1' into developm…
jusito Jul 10, 2023
376a69c
Merge commit 'c3b932c2df44df61eb33e99b1a76bec6ea64e412' into developm…
jusito Jul 10, 2023
aaeb8ab
Merge commit '4f568a7bfb9c2bf0bca6e0821ac4a803e69e6588' into developm…
jusito Jul 11, 2023
cdd977f
Merge branch 'development' into development-conan
jusito Jul 11, 2023
f2f63ae
build(conan): updated llvm recipe + deploy
jusito Jul 24, 2023
d796ea3
build(conan): dont copy but link myphasartool.cpp
jusito Jul 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
27 changes: 5 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
bin/*

# build directories for cmake
build/
build_*/
build-*/
build*/
cmake-build*/
cmake-install*/
CMakeUserPresets.json

# LLVM project
llvm-project/*
Expand All @@ -26,6 +27,7 @@ doc/*

# log/ directory
log/*
**/*/logs/

# CMake build dir
build/*
Expand Down Expand Up @@ -118,22 +120,3 @@ TAGS
# config files
compiler_info.txt
standard_header_paths.conf

# CMake temporary files
CMakeFiles
CMakeCache.txt
!cmake/*.cmake
cmake-build-debug/*
*.pc
Makefile
!test/*/Makefile

# Unit test output
Testing/
unittests/DB/DBConnTest
unittests/PhasarLLVM/ControlFlow/LLVMBasedCFGTest
unittests/PhasarLLVM/ifdside/Problems/IFDSConstAnalysisTest
unittests/PhasarLLVM/ifdside/Problems/IFDSTaintAnalysisTest
unittests/PhasarLLVM/Pointer/LLVMTypeHierarchyTest
unittests/Utils/LLVMShorthandsTest
unittests/Utils/PAMMTest
11 changes: 0 additions & 11 deletions .gitmodules

This file was deleted.

3 changes: 0 additions & 3 deletions CHANGELOG.md

This file was deleted.

Loading
Loading