3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-11 03:33:35 +00:00
Commit graph

558 commits

Author SHA1 Message Date
Nikolaj Bjorner 51b75a132c signed char -> int, update mk_util to catch warnings on fptest, thanks to jfc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-02 17:22:36 -07:00
Nikolaj Bjorner 4d30639fd7 merge dotnetcore into dotnet
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-05-30 13:01:48 -07:00
Nikolaj Bjorner 6604aab1a2 remove dotnet as a build option
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-05-29 17:08:45 -07:00
Louis Gesbert 5c0ad963c1 Fix z3 static link options 2019-05-23 09:49:32 +02:00
Nikolaj Bjorner 112e13eeea
Merge pull request #2292 from AltGr/ocaml-static-linking
Fix and enable OCaml static linking by default when --staticlib is specified
2019-05-22 17:26:00 +04:00
Louis Gesbert 9bb0c882fa OCaml API build: provide static linking options by default
when --staticlib is enabled, the linker will still choose to
dynamically link upon encountering `-lz3` when generating an
executable through OCaml.

The interaction between the underlying C linker and OCaml make it very
hard to choose the static version instead. The present patch works
around this issue by copying `libz3.a` to `libz3-static.a`, and using
`-lz3-static` instead: the static version is chosen since no dynamic
one is found.

One can get back to dynamically linking by compiling without
`--staticlib`, or switching back to `-lz3`, but will in the latter
case run into the same problem with specifying the option; if that
needs to be made easier, we could provide two versions of the `cm(x)a`
which differ only by their linking options.

One last solution would be to remove `lz3` altogether from the linking
options included in the cm(x)a, requiring either `-lz3` or
`-lz3-static` to be specified at link time. Simpler and most flexible,
but requires an update of all users that link with the Z3 ml api...
2019-05-21 17:45:19 +02:00
Louis Gesbert 8d5466e781 OCaml / static: fix linking options 2019-05-21 16:09:18 +02:00
Kate 7d43a4bca5 Fix Makefile generation for the OCaml api 2019-04-10 15:18:03 +01:00
Nikolaj Bjorner 869cb66736 step 1 in aligning version tweaks for #2184
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-16 11:52:55 -07:00
Nikolaj Bjorner 038f992ff4 remove platformtarget for dotnetcore spec
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-14 12:48:27 -07:00
Nuno Lopes deb2deb4ad fix linking of .so on old build system 2019-03-07 10:04:06 +00:00
Nuno Lopes c0f7afacc4 bump cmake minimum version to 3.4 as it was released 3+ years ago
some misc compiler flags cleanup
2019-03-07 09:58:36 +00:00
Nuno Lopes 7ad4ced12f librt no longer needed(?) 2019-03-06 12:16:48 +00:00
Nikolaj Bjorner 9dd41ba554 remove offending assert, disable assembly-info for dotnet core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-20 11:13:03 -08:00
Carsten Varming e1a9154555 Specify UTF-8 encoding in python build scripts 2019-01-05 13:48:15 -05:00
Nikolaj Bjorner c5ada288c2 updated script
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-12-12 12:46:28 -08:00
Nikolaj Bjorner 8d23ad2f7e fix generation of assembly-sign-input to take escape sequences and absolute paths
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-12-12 10:14:38 -08:00
Nikolaj Bjorner db3e5ce070
Merge pull request #1997 from waywardmonkeys/change-64-bit-configuration-strategy
Change how 64 bit builds are detected.
2018-12-12 09:55:13 -08:00
Nikolaj Bjorner 02f01fcef1 adding esrp feature
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-12-11 17:31:09 -08:00
Nikolaj Bjorner 93c59ffbd9 update script to sign assembly
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-12-11 15:48:33 -08:00
Bruce Mitchener 51a947b73d Change how 64 bit builds are detected.
Instead of doing this at configure time, we look at the actual
compile time status. This also avoids hardcoding checks based on
what CPU architecture is present, which doesn't work when Z3 is
being built on non-x86_64 platforms.
2018-12-09 16:16:20 +07:00
Nikolaj Bjorner ee7781e602 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-17 15:05:02 -08:00
Nikolaj Bjorner 9ec59fdb93 fix #1934
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-17 15:04:25 -08:00
Nikolaj Bjorner 5ebe342da1 add support for keyfiles
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-16 13:27:58 -08:00
Nikolaj Bjorner f4ced3c164 use netstandard1.4
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-15 16:40:35 -08:00
Nikolaj Bjorner 60d7444c96 build generated files outside of src
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-15 16:16:38 -08:00
Nikolaj Bjorner bb5837791a clean up dotnet core component
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-15 11:02:49 -08:00
Nikolaj Bjorner 8bfeca063d update example build for dotnet core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-15 10:36:27 -08:00
Nikolaj Bjorner 6a9c8a8999 remove spurious string
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-14 19:40:56 -08:00
Nikolaj Bjorner 4f4463b2b7 update for nuget/core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-14 15:06:24 -08:00
Nikolaj Bjorner 13d1ccfeaf update for nuget/core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-14 14:59:53 -08:00
Nikolaj Bjorner c372500018 update for nuget/core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-14 14:51:58 -08:00
Nikolaj Bjorner 84baddf87c Merge branch 'master' of https://github.com/z3prover/z3 2018-11-14 14:07:16 -08:00
Nikolaj Bjorner 1cc2cc0143 add TBD marker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-14 14:07:14 -08:00
Nikolaj Bjorner 74db2f2509
Merge pull request #1939 from msoeken/dotnetcore-fix
Choose runtime for .NET core DLL.
2018-11-14 14:06:43 -08:00
Mathias Soeken 690bd8502a Choose runtime for .NET core DLL. 2018-11-14 13:47:46 -08:00
Nikolaj Bjorner 2501a875ef update script to generate file directly instead of from makefile
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-14 13:44:40 -08:00
Nikolaj Bjorner c49d71ba66 Merge branch 'master' of https://github.com/z3prover/z3 2018-11-14 11:43:44 -08:00
Nikolaj Bjorner 139d8b85f0 core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-14 11:43:41 -08:00
Mathias Soeken 33363aeb58 Fix problem in mk_echo. 2018-11-14 11:27:55 -08:00
Mathias Soeken e39907c481 Fix some problems in mk_echo. 2018-11-14 11:25:18 -08:00
Mathias Soeken d4567a1255 Fix echo command for Windows. 2018-11-14 11:11:25 -08:00
Mathias Soeken 2fbaad15d7 Build example for dotnetcore. 2018-11-14 09:57:47 -08:00
Nikolaj Bjorner ccf6ca310e more dotnet core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-13 19:59:46 -08:00
Nikolaj Bjorner 37ec933c66 more dotnet core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-13 19:58:42 -08:00
Nikolaj Bjorner dbd5ef4526 more dotnet core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-13 19:58:09 -08:00
Nikolaj Bjorner bd78558826 adding dotnetcore handling
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-13 19:51:57 -08:00
Nikolaj Bjorner 225fb82d96 add TBD for dotnet example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-13 15:54:37 -08:00
Nikolaj Bjorner b02c698284 align variable names with dimacs input
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-08 16:52:10 -08:00
Nikolaj Bjorner 52801db3fd more dotnet core prepration
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-10-22 16:28:01 -07:00