From 30411b319ae31d32f60fe3cebfcc332cc19a2bd7 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Wed, 29 May 2019 17:02:45 -0700 Subject: [PATCH] update build scripts Signed-off-by: Nikolaj Bjorner --- scripts/mk_unix_dist.py | 21 ++++++--------------- scripts/mk_win_dist.py | 24 ++++++------------------ 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/scripts/mk_unix_dist.py b/scripts/mk_unix_dist.py index bad51528f..5f6999e70 100644 --- a/scripts/mk_unix_dist.py +++ b/scripts/mk_unix_dist.py @@ -22,8 +22,7 @@ BUILD_DIR='build-dist' VERBOSE=True DIST_DIR='dist' FORCE_MK=False -DOTNET_ENABLED=True -DOTNET_CORE_ENABLED=False +DOTNET_CORE_ENABLED=True DOTNET_KEY_FILE=None JAVA_ENABLED=True GIT_HASH=False @@ -65,15 +64,14 @@ def display_help(): # Parse configuration option for mk_make script 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 options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=', 'help', 'silent', 'force', 'nojava', - 'nodotnet', - 'dotnetcore', + 'nodotnetcore', 'dotnet-key=', 'githash', 'nopython' @@ -89,11 +87,8 @@ def parse_options(): display_help() elif opt in ('-f', '--force'): FORCE_MK = True - elif opt == '--nodotnet': - DOTNET_ENABLED = False - elif opt == '--dotnetcore': - DOTNET_CORE_ENABLED = True - DOTNET_ENABLED = False + elif opt == '--nodotnetcore': + DOTNET_CORE_ENABLED = False elif opt == '--nopython': PYTHON_ENABLED = False elif opt == '--dotnet-key': @@ -118,10 +113,6 @@ def mk_build_dir(path): opts.append('--dotnetcore') if not DOTNET_KEY_FILE is None: 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: opts.append('--java') if GIT_HASH: @@ -197,7 +188,7 @@ def mk_dist_dir(): dist_path = os.path.join(DIST_DIR, get_z3_name()) mk_dir(dist_path) 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.JAVA_ENABLED = JAVA_ENABLED mk_util.PYTHON_ENABLED = PYTHON_ENABLED diff --git a/scripts/mk_win_dist.py b/scripts/mk_win_dist.py index 2a88c625c..79fe26ef3 100644 --- a/scripts/mk_win_dist.py +++ b/scripts/mk_win_dist.py @@ -24,8 +24,7 @@ BUILD_X86_DIR=os.path.join('build-dist', 'x86') VERBOSE=True DIST_DIR='dist' FORCE_MK=False -DOTNET_ENABLED=True -DOTNET_CORE_ENABLED=False +DOTNET_CORE_ENABLED=True ESRP_SIGN=False DOTNET_KEY_FILE=None JAVA_ENABLED=True @@ -76,15 +75,14 @@ def display_help(): # Parse configuration option for mk_make script 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 options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=', 'help', 'silent', 'force', 'nojava', - 'nodotnet', - 'dotnetcore', + 'nodotnetcore', 'dotnet-key=', 'esrp', 'githash', @@ -103,11 +101,8 @@ def parse_options(): display_help() elif opt in ('-f', '--force'): FORCE_MK = True - elif opt == '--nodotnet': - DOTNET_ENABLED = False - elif opt == '--dotnetcore': - DOTNET_CORE_ENABLED = True - DOTNET_ENABLED = False + elif opt == '--nodotnetcore': + DOTNET_CORE_ENABLED = False elif opt == '--nopython': PYTHON_ENABLED = False elif opt == '--dotnet-key': @@ -139,10 +134,6 @@ def mk_build_dir(path, x64): opts.append('--dotnetcore') if not DOTNET_KEY_FILE is None: 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: opts.append('--java') if x64: @@ -227,10 +218,7 @@ def mk_dist_dir(x64): dist_path = os.path.join(DIST_DIR, get_z3_name(x64)) mk_dir(dist_path) mk_util.ESRP_SIGN = ESRP_SIGN - if DOTNET_CORE_ENABLED: - mk_util.DOTNET_CORE_ENABLED = True - else: - mk_util.DOTNET_ENABLED = DOTNET_ENABLED + mk_util.DOTNET_CORE_ENABLED = True mk_util.DOTNET_KEY_FILE = DOTNET_KEY_FILE mk_util.JAVA_ENABLED = JAVA_ENABLED mk_util.PYTHON_ENABLED = PYTHON_ENABLED