mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 20:18:18 +00:00
Code Activity

update build scripts

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2019-05-29 17:02:45 -07:00
parent 25c93410b1
commit 30411b319a
2 changed files with 12 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/mk_unix_dist.py
View file

@ -22,8 +22,7 @@ BUILD_DIR='build-dist'
VERBOSE=True VERBOSE=True
DIST_DIR='dist' DIST_DIR='dist'
FORCE_MK=False FORCE_MK=False
DOTNET_ENABLED=True DOTNET_CORE_ENABLED=True
DOTNET_CORE_ENABLED=False
DOTNET_KEY_FILE=None DOTNET_KEY_FILE=None
JAVA_ENABLED=True JAVA_ENABLED=True
GIT_HASH=False GIT_HASH=False
@ -65,15 +64,14 @@ def display_help():
# Parse configuration option for mk_make script # Parse configuration option for mk_make script
def parse_options(): def parse_options():
global FORCE_MK, JAVA_ENABLED, GIT_HASH, DOTNET_ENABLED, DOTNET_CORE_ENABLED, DOTNET_KEY_FILE global FORCE_MK, JAVA_ENABLED, GIT_HASH, DOTNET_CORE_ENABLED, DOTNET_KEY_FILE
path = BUILD_DIR path = BUILD_DIR
options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=', options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=',
'help', 'help',
'silent', 'silent',
'force', 'force',
'nojava', 'nojava',
'nodotnet', 'nodotnetcore',
'dotnetcore',
'dotnet-key=', 'dotnet-key=',
'githash', 'githash',
'nopython' 'nopython'
@ -89,11 +87,8 @@ def parse_options():
display_help() display_help()
elif opt in ('-f', '--force'): elif opt in ('-f', '--force'):
FORCE_MK = True FORCE_MK = True
elif opt == '--nodotnet': elif opt == '--nodotnetcore':
DOTNET_ENABLED = False DOTNET_CORE_ENABLED = False
elif opt == '--dotnetcore':
DOTNET_CORE_ENABLED = True
DOTNET_ENABLED = False
elif opt == '--nopython': elif opt == '--nopython':
PYTHON_ENABLED = False PYTHON_ENABLED = False
elif opt == '--dotnet-key': elif opt == '--dotnet-key':
@ -118,10 +113,6 @@ def mk_build_dir(path):
opts.append('--dotnetcore') opts.append('--dotnetcore')
if not DOTNET_KEY_FILE is None: if not DOTNET_KEY_FILE is None:
opts.append('--dotnet-key=' + DOTNET_KEY_FILE) opts.append('--dotnet-key=' + DOTNET_KEY_FILE)
elif DOTNET_ENABLED:
opts.append('--dotnet')
if not DOTNET_KEY_FILE is None:
opts.append('--dotnet-key=' + DOTNET_KEY_FILE)
if JAVA_ENABLED: if JAVA_ENABLED:
opts.append('--java') opts.append('--java')
if GIT_HASH: if GIT_HASH:
@ -197,7 +188,7 @@ def mk_dist_dir():
dist_path = os.path.join(DIST_DIR, get_z3_name()) dist_path = os.path.join(DIST_DIR, get_z3_name())
mk_dir(dist_path) mk_dir(dist_path)
mk_util.DOTNET_CORE_ENABLED = DOTNET_CORE_ENABLED mk_util.DOTNET_CORE_ENABLED = DOTNET_CORE_ENABLED
mk_util.DOTNET_ENABLED = DOTNET_ENABLED mk_util.DOTNET_ENABLED = False
mk_util.DOTNET_KEY_FILE = DOTNET_KEY_FILE mk_util.DOTNET_KEY_FILE = DOTNET_KEY_FILE
mk_util.JAVA_ENABLED = JAVA_ENABLED mk_util.JAVA_ENABLED = JAVA_ENABLED
mk_util.PYTHON_ENABLED = PYTHON_ENABLED mk_util.PYTHON_ENABLED = PYTHON_ENABLED

22
scripts/mk_win_dist.py
View file

@ -24,8 +24,7 @@ BUILD_X86_DIR=os.path.join('build-dist', 'x86')
VERBOSE=True VERBOSE=True
DIST_DIR='dist' DIST_DIR='dist'
FORCE_MK=False FORCE_MK=False
DOTNET_ENABLED=True DOTNET_CORE_ENABLED=True
DOTNET_CORE_ENABLED=False
ESRP_SIGN=False ESRP_SIGN=False
DOTNET_KEY_FILE=None DOTNET_KEY_FILE=None
JAVA_ENABLED=True JAVA_ENABLED=True
@ -76,15 +75,14 @@ def display_help():
# Parse configuration option for mk_make script # Parse configuration option for mk_make script
def parse_options(): def parse_options():
global FORCE_MK, JAVA_ENABLED, GIT_HASH, DOTNET_ENABLED, DOTNET_CORE_ENABLED, DOTNET_KEY_FILE, PYTHON_ENABLED, X86ONLY, X64ONLY, ESRP_SIGN global FORCE_MK, JAVA_ENABLED, GIT_HASH, DOTNET_CORE_ENABLED, DOTNET_KEY_FILE, PYTHON_ENABLED, X86ONLY, X64ONLY, ESRP_SIGN
path = BUILD_DIR path = BUILD_DIR
options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=', options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=',
'help', 'help',
'silent', 'silent',
'force', 'force',
'nojava', 'nojava',
'nodotnet', 'nodotnetcore',
'dotnetcore',
'dotnet-key=', 'dotnet-key=',
'esrp', 'esrp',
'githash', 'githash',
@ -103,11 +101,8 @@ def parse_options():
display_help() display_help()
elif opt in ('-f', '--force'): elif opt in ('-f', '--force'):
FORCE_MK = True FORCE_MK = True
elif opt == '--nodotnet': elif opt == '--nodotnetcore':
DOTNET_ENABLED = False DOTNET_CORE_ENABLED = False
elif opt == '--dotnetcore':
DOTNET_CORE_ENABLED = True
DOTNET_ENABLED = False
elif opt == '--nopython': elif opt == '--nopython':
PYTHON_ENABLED = False PYTHON_ENABLED = False
elif opt == '--dotnet-key': elif opt == '--dotnet-key':
@ -139,10 +134,6 @@ def mk_build_dir(path, x64):
opts.append('--dotnetcore') opts.append('--dotnetcore')
if not DOTNET_KEY_FILE is None: if not DOTNET_KEY_FILE is None:
opts.append('--dotnet-key=' + DOTNET_KEY_FILE) opts.append('--dotnet-key=' + DOTNET_KEY_FILE)
elif DOTNET_ENABLED:
opts.append('--dotnet')
if not DOTNET_KEY_FILE is None:
opts.append('--dotnet-key=' + DOTNET_KEY_FILE)
if JAVA_ENABLED: if JAVA_ENABLED:
opts.append('--java') opts.append('--java')
if x64: if x64:
@ -227,10 +218,7 @@ def mk_dist_dir(x64):
dist_path = os.path.join(DIST_DIR, get_z3_name(x64)) dist_path = os.path.join(DIST_DIR, get_z3_name(x64))
mk_dir(dist_path) mk_dir(dist_path)
mk_util.ESRP_SIGN = ESRP_SIGN mk_util.ESRP_SIGN = ESRP_SIGN
if DOTNET_CORE_ENABLED:
mk_util.DOTNET_CORE_ENABLED = True mk_util.DOTNET_CORE_ENABLED = True
else:
mk_util.DOTNET_ENABLED = DOTNET_ENABLED
mk_util.DOTNET_KEY_FILE = DOTNET_KEY_FILE mk_util.DOTNET_KEY_FILE = DOTNET_KEY_FILE
mk_util.JAVA_ENABLED = JAVA_ENABLED mk_util.JAVA_ENABLED = JAVA_ENABLED
mk_util.PYTHON_ENABLED = PYTHON_ENABLED mk_util.PYTHON_ENABLED = PYTHON_ENABLED