mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-04 13:29:11 +00:00
Code Activity

increment version number to 4.8.4

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-11-19 15:17:55 -08:00
parent 7f5d66c3c2
commit e83e9b02df
5 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -34,7 +34,7 @@ endif()
################################################################################
set(Z3_VERSION_MAJOR 4)
set(Z3_VERSION_MINOR 8)
set(Z3_VERSION_PATCH 3)
set(Z3_VERSION_PATCH 4)
set(Z3_VERSION_TWEAK 0)
set(Z3_VERSION "${Z3_VERSION_MAJOR}.${Z3_VERSION_MINOR}.${Z3_VERSION_PATCH}.${Z3_VERSION_TWEAK}")
set(Z3_FULL_VERSION_STR "${Z3_VERSION}") # Note this might be modified

14
scripts/mk_nuget_release.py
View file

@ -31,8 +31,6 @@ def download_installs():
for asset in data['assets']:
url = asset['browser_download_url']
name = asset['name']
if "x64" not in name:
continue
print("Downloading ", url)
sys.stdout.flush()
urllib.request.urlretrieve(url, "packages/%s" % name)
@ -40,6 +38,8 @@ def download_installs():
os_info = {"ubuntu-14" : ('so', 'ubuntu.14.04-x64'),
'ubuntu-16' : ('so', 'ubuntu.16.04-x64'),
'win' : ('dll', 'win-x64'),
'win' : ('dll', 'win-x86'),
'osx' : ('dylib', 'macos'),
'debian' : ('so', 'debian.8-x64') }
def classify_package(f):
@ -54,18 +54,20 @@ def unpack():
# out
# +- runtimes
# +- win-x64
# +- win-x86
# +- ubuntu.16.04-x64
# +- ubuntu.14.04-x64
# +- debian.8-x64
# +- macos
# +
for f in os.listdir("packages"):
if f.endswith("zip") and "x64" in f and classify_package(f):
print(f)
if f.endswith("zip") and classify_package(f):
os_name, package_dir, ext, dst = classify_package(f)
zip_ref = zipfile.ZipFile("packages/%s" % f, 'r')
zip_ref.extract("%s/bin/libz3.%s" % (package_dir, ext), "tmp")
mk_dir("out/runtimes/%s" % dst)
shutil.move("tmp/%s/bin/libz3.%s" % (package_dir, ext), "out/runtimes/%s/." % dst)
shutil.move("tmp/%s/bin/libz3.%s" % (package_dir, ext), "out/runtimes/%s/." % dst, "/y")
if "win" in f:
mk_dir("out/lib/netstandard1.4/")
for b in ["Microsoft.Z3.dll"]:
@ -77,7 +79,7 @@ def create_nuget_spec():
contents = """<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Microsoft.Z3.x64</id>
<id>Microsoft.Z3</id>
<version>%s</version>
<authors>Microsoft</authors>
<description>Z3 is a satisfiability modulo theories solver from Microsoft Research.</description>
@ -96,7 +98,7 @@ def create_nuget_spec():
</metadata>
</package>"""
with open("out/Microsoft.Z3.x64.nuspec", 'w') as f:
with open("out/Microsoft.Z3.nuspec", 'w') as f:
f.write(contents % mk_util.get_version_string(3))
def create_nuget_package():

2
scripts/mk_project.py
View file

@ -8,7 +8,7 @@
from mk_util import *
def init_version():
set_version(4, 8, 3, 0)
set_version(4, 8, 4, 0)
# Z3 Project definition
def init_project_def():

11
src/sat/sat_parallel.cpp
View file

@ -285,17 +285,6 @@ namespace sat {
return copied;
}
void parallel::set_phase(local_search& s) {
#pragma omp critical (par_solver)
{
m_consumer_ready = true;
m_phase.reserve(s.num_vars(), l_undef);
for (unsigned i = 0; i < s.num_vars(); ++i) {
m_phase[i] = s.get_phase(i) ? l_true : l_false;
}
m_num_clauses = s.num_non_binary_clauses();
}
}
bool parallel::copy_solver(solver& s) {
bool copied = false;

2
src/sat/sat_parallel.h
View file

@ -104,8 +104,6 @@ namespace sat {
void get_phase(solver& s);
void set_phase(local_search& s);
bool get_phase(local_search& s);
bool copy_solver(solver& s);