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

step 1 in aligning version tweaks for #2184

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-03-16 11:52:55 -07:00
parent 038f992ff4
commit 869cb66736
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/mk_util.py
View file

@ -102,7 +102,7 @@ STATIC_BIN=False
VER_MAJOR=None VER_MAJOR=None
VER_MINOR=None VER_MINOR=None
VER_BUILD=None VER_BUILD=None
VER_REVISION=None VER_TWEAK=None
PREFIX=sys.prefix PREFIX=sys.prefix
GMP=False GMP=False
VS_PAR=False VS_PAR=False
@ -553,22 +553,22 @@ def find_c_compiler():
raise MKException('C compiler was not found. Try to set the environment variable CC with the C compiler available in your system.') raise MKException('C compiler was not found. Try to set the environment variable CC with the C compiler available in your system.')
def set_version(major, minor, build, revision): def set_version(major, minor, build, revision):
global VER_MAJOR, VER_MINOR, VER_BUILD, VER_REVISION, GIT_DESCRIBE global VER_MAJOR, VER_MINOR, VER_BUILD, VER_TWEAK, GIT_DESCRIBE
VER_MAJOR = major VER_MAJOR = major
VER_MINOR = minor VER_MINOR = minor
VER_BUILD = build VER_BUILD = build
VER_REVISION = revision VER_TWEAK = revision
if GIT_DESCRIBE: if GIT_DESCRIBE:
branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']) branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'])
VER_REVISION = int(check_output(['git', 'rev-list', '--count', 'HEAD'])) VER_TWEAK = int(check_output(['git', 'rev-list', '--count', 'HEAD']))
def get_version(): def get_version():
return (VER_MAJOR, VER_MINOR, VER_BUILD, VER_REVISION) return (VER_MAJOR, VER_MINOR, VER_BUILD, VER_TWEAK)
def get_version_string(n): def get_version_string(n):
if n == 3: if n == 3:
return "{}.{}.{}".format(VER_MAJOR,VER_MINOR,VER_BUILD) return "{}.{}.{}".format(VER_MAJOR,VER_MINOR,VER_BUILD)
return "{}.{}.{}.{}".format(VER_MAJOR,VER_MINOR,VER_BUILD,VER_REVISION) return "{}.{}.{}.{}".format(VER_MAJOR,VER_MINOR,VER_BUILD,VER_TWEAK)
def build_static_lib(): def build_static_lib():
return STATIC_LIB return STATIC_LIB
@ -1783,7 +1783,7 @@ class DotNetDLLComponent(Component):
{ 'VER_MAJOR': str(major), { 'VER_MAJOR': str(major),
'VER_MINOR': str(minor), 'VER_MINOR': str(minor),
'VER_BUILD': str(build), 'VER_BUILD': str(build),
'VER_REVISION': str(revision), 'VER_TWEAK': str(revision),
} }
) )
else: else:
@ -2222,7 +2222,7 @@ class MLComponent(Component):
else: else:
prefix_lib = '-L' + PREFIX + '/lib' prefix_lib = '-L' + PREFIX + '/lib'
substitutions = { 'LEXTRA': prefix_lib, substitutions = { 'LEXTRA': prefix_lib,
'VERSION': "{}.{}.{}.{}".format(VER_MAJOR, VER_MINOR, VER_BUILD, VER_REVISION) } 'VERSION': "{}.{}.{}.{}".format(VER_MAJOR, VER_MINOR, VER_BUILD, VER_TWEAK) }
configure_file(os.path.join(self.src_dir, 'META.in'), configure_file(os.path.join(self.src_dir, 'META.in'),
os.path.join(BUILD_DIR, self.sub_dir, 'META'), os.path.join(BUILD_DIR, self.sub_dir, 'META'),
@ -3054,7 +3054,7 @@ def update_version():
major = VER_MAJOR major = VER_MAJOR
minor = VER_MINOR minor = VER_MINOR
build = VER_BUILD build = VER_BUILD
revision = VER_REVISION revision = VER_TWEAK
if major is None or minor is None or build is None or revision is None: if major is None or minor is None or build is None or revision is None:
raise MKException("set_version(major, minor, build, revision) must be used before invoking update_version()") raise MKException("set_version(major, minor, build, revision) must be used before invoking update_version()")
if not ONLY_MAKEFILES: if not ONLY_MAKEFILES: