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

Merge pull request #540 from martin-neuhaeusser/ocaml-install

Browse source 
Include *.cmx files during installation of OCaml bindings.
This commit is contained in:
Christoph M. Wintersteiger 2016-03-29 13:27:10 +01:00
parent 7eec68c954 28f9c61d76
commit 8709df27c5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/mk_util.py
View file

@ -1913,6 +1913,7 @@ class MLComponent(Component):
for m in self.modules: for m in self.modules:
out.write(' ' + os.path.join(self.to_src_dir, m) + '.mli') out.write(' ' + os.path.join(self.to_src_dir, m) + '.mli')
out.write(' ' + os.path.join(self.sub_dir, m) + '.cmi') out.write(' ' + os.path.join(self.sub_dir, m) + '.cmi')
out.write(' ' + os.path.join(self.sub_dir, m) + '.cmx')
out.write(' %s' % ((os.path.join(self.sub_dir, 'libz3ml$(LIB_EXT)')))) out.write(' %s' % ((os.path.join(self.sub_dir, 'libz3ml$(LIB_EXT)'))))
out.write(' %s' % ((os.path.join(self.sub_dir, 'z3ml$(LIB_EXT)')))) out.write(' %s' % ((os.path.join(self.sub_dir, 'z3ml$(LIB_EXT)'))))
out.write(' %s' % ((os.path.join(self.sub_dir, 'z3ml.cma')))) out.write(' %s' % ((os.path.join(self.sub_dir, 'z3ml.cma'))))
@ -2013,7 +2014,7 @@ class DotNetExampleComponent(ExampleComponent):
if VS_X64: if VS_X64:
out.write(' /platform:x64') out.write(' /platform:x64')
elif VS_ARM: elif VS_ARM:
out.write(' /platform:arm') out.write(' /platform:arm')
else: else:
out.write(' /platform:x86') out.write(' /platform:x86')
for csfile in get_cs_files(self.ex_dir): for csfile in get_cs_files(self.ex_dir):
@ -2206,7 +2207,7 @@ def mk_config():
static_opt = static_opt + 'd' static_opt = static_opt + 'd'
config.write( config.write(
'AR_FLAGS=/nologo\n' 'AR_FLAGS=/nologo\n'
'LINK_FLAGS=/nologo %s\n' 'LINK_FLAGS=/nologo %s\n'
'SLINK_FLAGS=/nologo /LDd\n' % static_opt) 'SLINK_FLAGS=/nologo /LDd\n' % static_opt)
if VS_X64: if VS_X64:
config.write( config.write(
@ -2249,7 +2250,7 @@ def mk_config():
'LINK_EXTRA_FLAGS=/link%s /DEBUG /MACHINE:X86 /SUBSYSTEM:CONSOLE /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE /NXCOMPAT\n' 'LINK_EXTRA_FLAGS=/link%s /DEBUG /MACHINE:X86 /SUBSYSTEM:CONSOLE /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE /NXCOMPAT\n'
'SLINK_EXTRA_FLAGS=/link%s /DEBUG /MACHINE:X86 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE:NO\n' % (LTCG, LTCG)) 'SLINK_EXTRA_FLAGS=/link%s /DEBUG /MACHINE:X86 /SUBSYSTEM:WINDOWS /INCREMENTAL:NO /STACK:8388608 /OPT:REF /OPT:ICF /TLBID:1 /DYNAMICBASE:NO\n' % (LTCG, LTCG))
# End of Windows VS config.mk # End of Windows VS config.mk
if is_verbose(): if is_verbose():
@ -2483,7 +2484,7 @@ def mk_makefile():
print("To build Z3, open a [Visual Studio x64 Command Prompt], then") print("To build Z3, open a [Visual Studio x64 Command Prompt], then")
elif VS_ARM: elif VS_ARM:
print(" platform: ARM\n") print(" platform: ARM\n")
print("To build Z3, open a [Visual Studio ARM Command Prompt], then") print("To build Z3, open a [Visual Studio ARM Command Prompt], then")
else: else:
print(" platform: x86") print(" platform: x86")
print("To build Z3, open a [Visual Studio Command Prompt], then") print("To build Z3, open a [Visual Studio Command Prompt], then")
@ -3388,7 +3389,7 @@ class MakeRuleCmd(object):
cls.write_cmd(out, "mkdir -p {install_root}{dir}".format( cls.write_cmd(out, "mkdir -p {install_root}{dir}".format(
install_root=install_root, install_root=install_root,
dir=dir)) dir=dir))
@classmethod @classmethod
def _is_path_prefix_of(cls, temp_path, target_as_abs): def _is_path_prefix_of(cls, temp_path, target_as_abs):
""" """
@ -3517,4 +3518,3 @@ def configure_file(template_file_path, output_file_path, substitutions):
if __name__ == '__main__': if __name__ == '__main__':
import doctest import doctest
doctest.testmod() doctest.testmod()