3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-15 00:46:38 +00:00
Commit graph

140 commits

Author SHA1 Message Date
Nikolaj Bjorner
2b82fd5d0c updated include directives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-01 10:51:47 -07:00
Nikolaj Bjorner
b19f94ae5b make include paths uniformly use path relative to src. #534
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-31 13:24:11 -07:00
Dan Liew
229fd3dc3e [CMake] Fix dependencies for generating install_tactic.cpp.
Previously CMake was not aware of which headers files the generation
of `install_tactic.cpp` depended on. Consequently this could result
in broken incremental builds if

* Existing headers that declared tactics/probes changed.
* New tactics/probes were added to new header files.

Now the `z3_add_component()` CMake function has been modifed to take an
optional `TACTIC_HEADERS` argument which allows the headers that declare
tactics/probes to be explicitly listed. The necessary component
declarations have been modified to declare their tactic/probe header
files.

With this information CMake will now regenerate `install_tactic.cpp`
correctly.

This required the `mk_install_tactic_cpp_internal()` function to be
changed to take a list of header files rather than a list of component
source directories. The two consumers (CMake and Python/Makefile build
systems) of this function have been modified to work with this change.

This partially fixes #1030.
2017-06-21 23:03:48 +01:00
Dan Liew
4b517b96df [CMake] Move CMake files into their intended location so the
`contrib/cmake/bootstrap.py` script no longer needs to be executed.

The previous location of the CMake files was a compromise proposed
by @agurfinkel in #461. While this has served us well (allowing progress
to be made) over time limitations of this approach have appeared.

The main problem is that doing many git operations (e.g. pull, rebase)
means the CMake files don't get updated unless the user remembers to
run the script. This can lead to broken and confusing build system
behaviour.

This commit only does the file moving and necessary changes to
`.gitignore`. Other changes will be done in subsequent commits.
2017-06-12 11:59:00 +01:00
Nuno Lopes
dedae29300 add a few more statics to avoid symbol clashes 2016-12-01 17:37:07 +00:00
Fabian Wolff
6eaab00e83 Fix spelling errors 2016-07-09 11:46:43 +02:00
Nikolaj Bjorner
a7e2fb31e3 updates to resource exceptions, update master possibly handle pull request issue
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 11:36:49 -08:00
Nikolaj Bjorner
2a051719d8 cleanup deprecated critical sections, fix cancellation for par_or_else tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 09:43:00 -08:00
Nikolaj Bjorner
baee4225a7 reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 16:21:24 -08:00
Christoph M. Wintersteiger
6749c19ab1 Merge branch 'static_analysis' of https://github.com/daniel-j-h/z3
# Conflicts:
#	src/ast/ast.h
#	src/interp/iz3foci.cpp
#	src/muz/duality/duality_dl_interface.cpp
#	src/util/hwf.h
2015-10-19 15:14:45 +01:00
Nikolaj Bjorner
4bc044c982 update header guards to be C++ style. Fixes issue #9
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-07-08 23:18:40 -07:00
Nikolaj Bjorner
203c5015c8 fix debian amd64 warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-18 15:17:21 -07:00
Daniel J. Hofmann
88f6e74a27 Wnewline-eof 2015-04-03 19:31:09 +02:00
Nikolaj Bjorner
52619b9dbb pull unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 14:57:11 -07:00
Christoph M. Wintersteiger
ed81e3b9d8 Bugfix for BV-SLS initialization
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-20 17:07:32 +00:00
Christoph M. Wintersteiger
826d295981 build fixes and removed unused variables 2015-01-21 19:29:31 +00:00
Christoph M. Wintersteiger
9a53fe43e6 Removed unnecessary #includes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-21 15:31:12 +00:00
Christoph M. Wintersteiger
71e5f03b44 build fix 2015-01-21 13:04:05 +00:00
Christoph M. Wintersteiger
83023c7211 build fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-21 13:02:18 +00:00
Christoph M. Wintersteiger
0746ede537 BV SLS: Final adjustments
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-20 15:59:25 +00:00
Christoph M. Wintersteiger
168c3eb363 BV-SLS optimization
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:44 +00:00
Christoph M. Wintersteiger
85ff954bc6 merge fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:43 +00:00
Christoph M. Wintersteiger
8745872d28 compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:42 +00:00
Christoph M. Wintersteiger
0016ba5f3e compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:41 +00:00
Christoph M. Wintersteiger
7105e4d213 compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:40 +00:00
Christoph M. Wintersteiger
7a7566f39e compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:39 +00:00
Christoph M. Wintersteiger
bec5938d9c removed unused file
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:39 +00:00
Christoph M. Wintersteiger
992d150b81 BVSLS comments
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:38 +00:00
Andreas Froehlich
7d18a17bb3 Cleaned up final SLS version. Enjoy! 2015-01-12 17:19:37 +00:00
Andreas Froehlich
80c94ef0b6 Moved parameters to the right file. Almost clean. 2015-01-12 17:19:37 +00:00
Andreas Froehlich
ca1e3c3d9f Backup before I touch early pruning ... 2015-01-12 17:19:25 +00:00
Andreas Froehlich
fb18547a5f Fixed bug with VNS repick. 2015-01-12 17:19:24 +00:00
Andreas Froehlich
de028e7a30 Almost cleaned up version. 2015-01-12 17:19:24 +00:00
Andreas Froehlich
c56e55b230 Current version before integration ... 2015-01-12 17:19:23 +00:00
Christoph M. Wintersteiger
a48bb976e9 bvsls bugfix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:22 +00:00
Christoph M. Wintersteiger
e382742a29 bvsls refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:22 +00:00
Christoph M. Wintersteiger
ad412d4f08 bvsls refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:20 +00:00
Christoph M. Wintersteiger
1b98e6002b compilation fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:19 +00:00
Christoph M. Wintersteiger
b76ffddf49 compilation fix
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:18 +00:00
Christoph M. Wintersteiger
71fdb59747 removed dependency of bvsls on goal_refs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:17 +00:00
Christoph M. Wintersteiger
e9797c3922 bugfix 2015-01-12 17:19:16 +00:00
Christoph M. Wintersteiger
1834bb5950 disabled old code 2015-01-12 17:19:15 +00:00
Christoph M. Wintersteiger
1f326d9e72 removed dependency of bvsls on goal_refs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:14 +00:00
Andreas Froehlich
ad8cac7d88 uct forget and minisat restarts added 2015-01-12 17:19:13 +00:00
Christoph M. Wintersteiger
13307a1d51 SLS refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:12 +00:00
Christoph M. Wintersteiger
7451e5cae0 SLS refactoring
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:19:11 +00:00
Andreas Froehlich
442827e523 Current version for relocating. 2015-01-12 17:18:52 +00:00
Christoph M. Wintersteiger
664fa82c6c removed tabs
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-01-12 17:18:51 +00:00
Andreas Froehlich
140d28b6b3 plenty of new stuff 2015-01-12 17:18:50 +00:00
Andreas Froehlich
dfe2d945e9 some extensions/modifications. versions added. 2015-01-12 17:18:36 +00:00