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

more prep for dotnet core

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-10-22 11:50:07 -07:00
parent 7c043dee7d
commit 4616ddf103
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/mk_util.py
View file

@ -734,7 +734,6 @@ def parse_options():
elif opt in ('-.net', '--dotnet'): elif opt in ('-.net', '--dotnet'):
DOTNET_ENABLED = True DOTNET_ENABLED = True
elif opt in ('--dotnetcore',): elif opt in ('--dotnetcore',):
DOTNET_ENABLED = True
DOTNET_CORE_ENABLED = True DOTNET_CORE_ENABLED = True
elif opt in ('--dotnet-key'): elif opt in ('--dotnet-key'):
DOTNET_KEY_FILE = arg DOTNET_KEY_FILE = arg
@ -893,6 +892,7 @@ def is_dotnet_enabled():
return DOTNET_ENABLED return DOTNET_ENABLED
def is_dotnet_core_enabled(): def is_dotnet_core_enabled():
print("core %s" % DOTNET_CORE_ENABLED)
return DOTNET_CORE_ENABLED return DOTNET_CORE_ENABLED
def is_python_enabled(): def is_python_enabled():
@ -1857,7 +1857,7 @@ class DotNetCoreDLLComponent(Component):
def mk_makefile(self, out): def mk_makefile(self, out):
global DOTNET_KEY_FILE global DOTNET_KEY_FILE
if not is_dotnet_enabled(): if not is_dotnet_core_enabled():
return return
cs_fp_files = [] cs_fp_files = []
cs_files = [] cs_files = []
@ -2008,7 +2008,7 @@ class DotNetCoreDLLComponent(Component):
flags=' '.join(gacUtilFlags))) flags=' '.join(gacUtilFlags)))
def mk_install(self, out): def mk_install(self, out):
if not DOTNET_ENABLED: if not is_dotnet_core_enabled():
return return
self._install_or_uninstall_to_gac(out, install=True) self._install_or_uninstall_to_gac(out, install=True)
@ -2872,6 +2872,8 @@ def mk_config():
if is_dotnet_enabled(): if is_dotnet_enabled():
print('C# Compiler: %s' % CSC) print('C# Compiler: %s' % CSC)
print('GAC utility: %s' % GACUTIL) print('GAC utility: %s' % GACUTIL)
if is_dotnet_core_enabled():
print('C# Compiler: %s' % DOTNET)
config.close() config.close()
@ -3197,6 +3199,8 @@ def mk_bindings(api_files):
dotnet_output_dir = None dotnet_output_dir = None
if is_dotnet_enabled(): if is_dotnet_enabled():
dotnet_output_dir = get_component('dotnet').src_dir dotnet_output_dir = get_component('dotnet').src_dir
elif is_dotnet_core_enabled():
dotnet_output_dir = get_component('dotnetcore').src_dir
java_output_dir = None java_output_dir = None
java_package_name = None java_package_name = None
if is_java_enabled(): if is_java_enabled():