From 4d30639fd78622e49db738342fbe646f1524c473 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Thu, 30 May 2019 13:01:48 -0700 Subject: [PATCH] merge dotnetcore into dotnet Signed-off-by: Nikolaj Bjorner --- scripts/mk_project.py | 2 +- scripts/mk_unix_dist.py | 7 +++---- scripts/mk_util.py | 14 ++++++-------- scripts/mk_win_dist.py | 7 +++---- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/scripts/mk_project.py b/scripts/mk_project.py index 78f9d5afc..8f9da5897 100644 --- a/scripts/mk_project.py +++ b/scripts/mk_project.py @@ -86,7 +86,7 @@ def init_project_def(): static=build_static_lib(), export_files=API_files, staging_link='python') - add_dot_net_core_dll('dotnetcore', ['api_dll'], 'api/dotnet', dll_name='Microsoft.Z3', default_key_file='src/api/dotnet/Microsoft.Z3.snk') + add_dot_net_core_dll('dotnet', ['api_dll'], 'api/dotnet', dll_name='Microsoft.Z3', default_key_file='src/api/dotnet/Microsoft.Z3.snk') add_java_dll('java', ['api_dll'], 'api/java', dll_name='libz3java', package_name="com.microsoft.z3", manifest_file='manifest') add_ml_lib('ml', ['api_dll'], 'api/ml', lib_name='libz3ml') add_hlib('cpp', 'api/c++', includes2install=['z3++.h']) diff --git a/scripts/mk_unix_dist.py b/scripts/mk_unix_dist.py index 5f6999e70..05dcf2d1e 100644 --- a/scripts/mk_unix_dist.py +++ b/scripts/mk_unix_dist.py @@ -55,7 +55,6 @@ def display_help(): print(" -b , --build= subdirectory where x86 and x64 Z3 versions will be built (default: build-dist).") print(" -f, --force force script to regenerate Makefiles.") print(" --nodotnet do not include .NET bindings in the binary distribution files.") - print(" --dotnetcore build for dotnet core.") print(" --dotnet-key= sign the .NET assembly with the private key in .") print(" --nojava do not include Java bindings in the binary distribution files.") print(" --nopython do not include Python bindings in the binary distribution files.") @@ -71,7 +70,7 @@ def parse_options(): 'silent', 'force', 'nojava', - 'nodotnetcore', + 'nodotnet', 'dotnet-key=', 'githash', 'nopython' @@ -87,7 +86,7 @@ def parse_options(): display_help() elif opt in ('-f', '--force'): FORCE_MK = True - elif opt == '--nodotnetcore': + elif opt == '--nodotnet': DOTNET_CORE_ENABLED = False elif opt == '--nopython': PYTHON_ENABLED = False @@ -110,7 +109,7 @@ def mk_build_dir(path): if not check_build_dir(path) or FORCE_MK: opts = ["python", os.path.join('scripts', 'mk_make.py'), "-b", path, "--staticlib"] if DOTNET_CORE_ENABLED: - opts.append('--dotnetcore') + opts.append('--dotnet') if not DOTNET_KEY_FILE is None: opts.append('--dotnet-key=' + DOTNET_KEY_FILE) if JAVA_ENABLED: diff --git a/scripts/mk_util.py b/scripts/mk_util.py index 4e0216212..bd8889fb5 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -62,7 +62,7 @@ PATTERN_COMPONENT='pattern' UTIL_COMPONENT='util' API_COMPONENT='api' DOTNET_COMPONENT='dotnet' -DOTNET_CORE_COMPONENT='dotnetcore' +DOTNET_CORE_COMPONENT='dotnet' JAVA_COMPONENT='java' ML_COMPONENT='ml' CPP_COMPONENT='cpp' @@ -651,8 +651,7 @@ def display_help(exit_code): if IS_WINDOWS: print(" -v, --vsproj generate Visual Studio Project Files.") print(" --optimize generate optimized code during linking.") - print(" --dotnetcore generate .NET platform bindings.") - print(" --dotnet generate .NET bindings.") + print(" --dotnet generate .NET platform bindings.") print(" --dotnet-key= sign the .NET assembly using the private key in .") print(" --java generate Java bindings.") print(" --ml generate OCaml bindings.") @@ -697,7 +696,7 @@ def parse_options(): options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:df:sxhmcvtnp:gj', ['build=', 'debug', 'silent', 'x64', 'help', 'makefiles', 'showcpp', 'vsproj', 'guardcf', - 'trace', 'dotnet', 'dotnetcore', 'dotnet-key=', 'esrp', 'staticlib', 'prefix=', 'gmp', 'java', 'parallel=', 'gprof', 'js', + 'trace', 'dotnet', 'dotnet-key=', 'esrp', 'staticlib', 'prefix=', 'gmp', 'java', 'parallel=', 'gprof', 'js', 'githash=', 'git-describe', 'x86', 'ml', 'optimize', 'noomp', 'pypkgdir=', 'python', 'staticbin', 'log-sync']) except: print("ERROR: Invalid command line option") @@ -729,7 +728,7 @@ def parse_options(): VS_PROJ = True elif opt in ('-t', '--trace'): TRACE = True - elif opt in ('--dotnetcore',): + elif opt in ('--dotnet',): DOTNET_CORE_ENABLED = True elif opt in ('--dotnet-key'): DOTNET_KEY_FILE = arg @@ -1626,7 +1625,7 @@ def set_key_file(self): # build for dotnet core -class DotNetCoreDLLComponent(Component): +class DotNetDLLComponent(Component): def __init__(self, name, dll_name, path, deps, assembly_info_dir, default_key_file): Component.__init__(self, name, path, deps) if dll_name is None: @@ -2374,9 +2373,8 @@ def add_dll(name, deps=[], path=None, dll_name=None, export_files=[], reexports= reg_component(name, c) return c - def add_dot_net_core_dll(name, deps=[], path=None, dll_name=None, assembly_info_dir=None, default_key_file=None): - c = DotNetCoreDLLComponent(name, dll_name, path, deps, assembly_info_dir, default_key_file) + c = DotNetDLLComponent(name, dll_name, path, deps, assembly_info_dir, default_key_file) reg_component(name, c) def add_java_dll(name, deps=[], path=None, dll_name=None, package_name=None, manifest_file=None): diff --git a/scripts/mk_win_dist.py b/scripts/mk_win_dist.py index 79fe26ef3..c685f4bd8 100644 --- a/scripts/mk_win_dist.py +++ b/scripts/mk_win_dist.py @@ -63,7 +63,6 @@ def display_help(): print(" -b , --build= subdirectory where x86 and x64 Z3 versions will be built (default: build-dist).") print(" -f, --force force script to regenerate Makefiles.") print(" --nodotnet do not include .NET bindings in the binary distribution files.") - print(" --dotnetcore build for dotnet core.") print(" --dotnet-key= sign the .NET assembly with the private key in .") print(" --esrp sign with esrp.") print(" --nojava do not include Java bindings in the binary distribution files.") @@ -82,7 +81,7 @@ def parse_options(): 'silent', 'force', 'nojava', - 'nodotnetcore', + 'nodotnet', 'dotnet-key=', 'esrp', 'githash', @@ -101,7 +100,7 @@ def parse_options(): display_help() elif opt in ('-f', '--force'): FORCE_MK = True - elif opt == '--nodotnetcore': + elif opt == '--nodotnet': DOTNET_CORE_ENABLED = False elif opt == '--nopython': PYTHON_ENABLED = False @@ -131,7 +130,7 @@ def mk_build_dir(path, x64): parallel = '--parallel=' + MAKEJOBS opts = ["python", os.path.join('scripts', 'mk_make.py'), parallel, "-b", path] if DOTNET_CORE_ENABLED: - opts.append('--dotnetcore') + opts.append('--dotnet') if not DOTNET_KEY_FILE is None: opts.append('--dotnet-key=' + DOTNET_KEY_FILE) if JAVA_ENABLED: