From f0d66388d4af4c29531978473885d7296ea49ab9 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 4 Dec 2014 19:22:23 +0000 Subject: [PATCH] ML API: build fixes --- scripts/mk_util.py | 96 ++++++++++++++++++---------------------------- src/api/ml/META | 10 ++--- src/api/ml/z3.ml | 2 +- 3 files changed, 43 insertions(+), 65 deletions(-) diff --git a/scripts/mk_util.py b/scripts/mk_util.py index c169a21f7..caad10555 100644 --- a/scripts/mk_util.py +++ b/scripts/mk_util.py @@ -1362,19 +1362,25 @@ class MLComponent(Component): str = '\t%s %s %s\n' % (CP_CMD,os.path.join(src_dir,f),os.path.join(sub_dir,f)) out.write(str) modules = ["z3enums", "z3native", "z3"] # dependencies in this order! - prev = '' + mls = '' + mlis = '' + cmis = '' + archives = '' + for m in modules: fn = os.path.join(self.src_dir, ('%s.mli' % m)) if not os.path.exists(fn): - out.write('%s.mli: %s.ml%s\n' % (os.path.join(sub_dir,m),os.path.join(sub_dir,m),prev)) + out.write('%s.mli: %s.ml%s\n' % (os.path.join(sub_dir,m),os.path.join(sub_dir,m),mlis)) out.write('\t%s -I %s -i -c %s.ml > %s.mli\n' % (OCAMLC,sub_dir,os.path.join(sub_dir, m),os.path.join(sub_dir, m))) - prev = prev + ' ' + os.path.join(sub_dir, m) + '.mli' - cmis = '' - for m in modules: out.write('%s.cmi: %s.mli%s\n' % (os.path.join(sub_dir,m),os.path.join(sub_dir,m), cmis)) out.write('\t%s -I %s -c %s.mli\n' % (OCAMLC,sub_dir,os.path.join(sub_dir,m))) + out.write('%s.cma: %s.ml %s.cmi%s\n' % (os.path.join(sub_dir,m),os.path.join(sub_dir,m),os.path.join(sub_dir,m), archives)) + out.write('\t%s -a -o %s.ml -o %s.cma\n' % (OCAMLC,os.path.join(sub_dir,m), os.path.join(sub_dir,m))) + mlis = mlis + ' ' + os.path.join(sub_dir, m) + '.mli' cmis = cmis + ' ' + os.path.join(sub_dir,m) + '.cmi' - + archives = archives + ' ' + os.path.join(sub_dir,m) + '.cma' + mls = mls + ' ' + os.path.join(sub_dir, m) + '.ml' + out.write('%s: %s %s\n' % (os.path.join(sub_dir, 'z3native_stubs$(OBJ_EXT)'), os.path.join(sub_dir, 'z3native_stubs.c'), @@ -1382,73 +1388,43 @@ class MLComponent(Component): out.write('\t$(CC) $(CXXFLAGS) -I %s -I %s %s $(CXX_OUT_FLAG)%s$(OBJ_EXT)\n' % (OCAML_LIB, api_src, os.path.join(sub_dir, 'z3native_stubs.c'), os.path.join(sub_dir, 'z3native_stubs'))) - # out.write('api/ml/libz3ml$(LIB_EXT): api/ml/z3native_stubs$(OBJ_EXT) %s$(SO_EXT)\n' % get_component(Z3_DLL_COMPONENT).dll_name) - # out.write('\t$(AR) $(AR_FLAGS) $(AR_OUTFLAG)api/ml/libz3ml$(LIB_EXT) api/ml/z3native_stubs$(OBJ_EXT)\n') - - # out.write('api/ml/libz3ml$(SO_EXT): api/ml/z3native_stubs$(OBJ_EXT) %s$(SO_EXT)\n' % get_component(Z3_DLL_COMPONENT).dll_name) - # out.write('\t$(SLINK) $(SLINK_OUT_FLAG)api/ml/libz3ml$(SO_EXT) $(SLINK_FLAGS) -I %s -I %s api/ml/z3native_stubs$(OBJ_EXT) %s$(LIB_EXT)\n' % (OCAML_LIB, api_src, get_component(Z3_DLL_COMPONENT).dll_name)) - - - # out.write('%s: api/ml/libz3ml$(LIB_EXT) %s$(SO_EXT) %s' % (os.path.join(sub_dir, 'z3.cmxa'), get_component(Z3_DLL_COMPONENT).dll_name, cmis)) - - # for mlfile in get_ml_files(self.src_dir): - # out.write(' %s' % os.path.join(sub_dir, mlfile)) - # out.write('\n') - # out.write('\t%s ' % (OCAMLOPT)) - # if DEBUG_MODE: - # out.write('-g ') - # out.write('-cclib "-L %s -lz3ml" -I %s %s/z3enums.ml %s/z3native.ml %s/z3.ml -a -o api/ml/z3.cmxa -linkall\n' % (sub_dir, sub_dir,sub_dir,sub_dir,sub_dir)) - - # out.write('%s: %s\n' % (os.path.join(sub_dir, 'z3.cmxs'), os.path.join(sub_dir, 'z3.cmxa'))) - # out.write('\t%s ' % (OCAMLOPT)) - # if DEBUG_MODE: - # out.write('-g ') - # out.write('-cclib "-L %s -lz3ml" -shared -o %s %s -linkall\n' % (sub_dir, os.path.join(sub_dir, 'z3.cmxs'), os.path.join(sub_dir, 'z3.cmxa'))) - out.write('%s: %s %s$(SO_EXT) %s' % ( - os.path.join(sub_dir, 'z3.cma'), - os.path.join(sub_dir, 'libz3ml$(LIB_EXT)'), - get_component(Z3_DLL_COMPONENT).dll_name, cmis)) - for mlfile in get_ml_files(self.src_dir): - out.write(' %s' % os.path.join(sub_dir, mlfile)) - out.write('\n') - out.write('\t%s ' % (OCAMLC)) - if DEBUG_MODE: - out.write('-g ') - out.write('-I %s -a -o %s -linkall' % (sub_dir, os.path.join(sub_dir, 'z3.cma'))) - for m in modules: - out.write(' %s.ml' % (os.path.join(sub_dir, m))) - - out.write('%s:' % (os.path.join(sub_dir, "z3.cmxa"))) - for m in modules: - out.write(' %s.cmi' % (os.path.join(sub_dir, m))) - # out.write(' %s.cmx' % (os.path.join(sub_dir, m))) - # out.write(' %s.cmo' % (os.path.join(sub_dir, m))) + out.write('%s: %s %s %s$(SO_EXT)' % ( + os.path.join(sub_dir, "z3ml.cmxa"), + cmis, + archives, + get_component(Z3_DLL_COMPONENT).dll_name)) out.write(' %s\n' % (os.path.join(sub_dir, 'z3native_stubs$(OBJ_EXT)'))) - out.write('\tcd %s ; ocamlmklib -o z3ml' % (sub_dir)) + out.write('\tcd %s ; ocamlmklib -o z3ml -ldopt \'-L../.. -lz3\' ' % (sub_dir)) for m in modules: out.write(' %s.ml' % m) out.write(' z3native_stubs$(OBJ_EXT) ; cd -\n') - out.write('ml: %s\n' % (os.path.join(sub_dir, 'z3.cmxa'))) - # , os.path.join(sub_dir, 'z3.cmxs'), os.path.join(sub_dir, 'z3.cma'))) - #out.write('\n') - # Generate META file and package installation commands + out.write('ml: %s\n' % (os.path.join(sub_dir, 'z3ml.cmxa'))) self.mk_ml_meta(os.path.join('src/api/ml/META'), os.path.join(BUILD_DIR, sub_dir, 'META'), VER_MAJOR, VER_MINOR, VER_BUILD, VER_REVISION) if OCAMLFIND != '': - out.write('\nocamlfind_install: %s %s\n' % (os.path.join(sub_dir, 'z3.cmxa'), os.path.join(sub_dir, 'META'))) + out.write('\nocamlfind_install: %s %s %s\n' % ( + get_component(Z3_DLL_COMPONENT).dll_name)+'$(SO_EXT)', + os.path.join(sub_dir, 'z3ml.cmxa'), + os.path.join(sub_dir, 'META'))) out.write('\t%s remove Z3\n' % (OCAMLFIND)) out.write('\t%s install Z3 %s' % (OCAMLFIND, (os.path.join(sub_dir, 'META')))) for m in modules: out.write(' %s.cma' % (os.path.join(sub_dir, m))) - out.write(' %s.cmxa' % (os.path.join(sub_dir, m))) out.write(' %s.cmx' % (os.path.join(sub_dir, m))) - #out.write(' %s.cmxs' % (os.path.join(sub_dir, m))) out.write(' %s.cmi' % (os.path.join(sub_dir, m))) + out.write(' %s.cmo' % (os.path.join(sub_dir, m))) + out.write(' %s.ml' % (os.path.join(sub_dir, m))) + out.write(' %s.mli' % (os.path.join(sub_dir, m))) + out.write(' %s$(OBJ_EXT)' % (os.path.join(sub_dir, m))) + out.write(' %s' % ((os.path.join(sub_dir, 'z3ml.a')))) + out.write(' %s' % ((os.path.join(sub_dir, 'z3ml.cma')))) + out.write(' %s' % ((os.path.join(sub_dir, 'z3ml.cmxa')))) out.write(' %s' % ((os.path.join(sub_dir, 'libz3ml$(LIB_EXT)')))) out.write(' %s' % ((os.path.join(sub_dir, 'dllz3ml')))) if IS_WINDOWS: out.write('.lib') else: out.write('.so') # .so also on OSX! + out.write(' ' + get_component(Z3_DLL_COMPONENT).dll_name) + '$(SO_EXT)')))) out.write('\n\n') def main_component(self): @@ -1572,25 +1548,25 @@ class MLExampleComponent(ExampleComponent): def mk_makefile(self, out): if ML_ENABLED: - out.write('ml_example.byte: api/ml/z3.cma ') + out.write('ml_example.byte: api/ml/z3ml.cma ') for mlfile in get_ml_files(self.ex_dir): out.write(' %s' % os.path.join(self.to_ex_dir, mlfile)) out.write('\n') out.write('\t%s ' % OCAMLC) if DEBUG_MODE: out.write('-g ') - out.write('-custom -o ml_example.byte -I api/ml -cclib "-L. -lz3" nums.cma z3.cma') + out.write('-custom -o ml_example.byte -I api/ml -cclib "-L. -lz3" nums.cma z3ml.cma') for mlfile in get_ml_files(self.ex_dir): out.write(' %s/%s' % (self.to_ex_dir, mlfile)) out.write('\n') - out.write('ml_example$(EXE_EXT): api/ml/z3.cmxa ml_example.byte') + out.write('ml_example$(EXE_EXT): api/ml/z3ml.cmxa ml_example.byte') for mlfile in get_ml_files(self.ex_dir): out.write(' %s' % os.path.join(self.to_ex_dir, mlfile)) out.write('\n') out.write('\t%s ' % OCAMLOPT) if DEBUG_MODE: out.write('-g ') - out.write('-o ml_example$(EXE_EXT) -I api/ml -cclib "-L. -lz3" nums.cmxa z3.cmxa') + out.write('-o ml_example$(EXE_EXT) -I api/ml -cclib "-L. -lz3" nums.cmxa z3ml.cmxa') for mlfile in get_ml_files(self.ex_dir): out.write(' %s/%s' % (self.to_ex_dir, mlfile)) out.write('\n') @@ -3035,3 +3011,5 @@ def mk_unix_dist(build_path, dist_path): if __name__ == '__main__': import doctest doctest.testmod() + + diff --git a/src/api/ml/META b/src/api/ml/META index 6238403a3..8634b53b1 100644 --- a/src/api/ml/META +++ b/src/api/ml/META @@ -2,8 +2,8 @@ version = "VERSION" description = "Z3 Theorem Prover (OCaml API)" requires = "num" -archive(byte) = "z3.cma" -archive(native) = "z3.cmxa" -archive(byte, plugin) = "z3.cma" -archive(native, plugin) = "z3.cmxs" -linkopts = "-cclib -lz3" \ No newline at end of file +archive(byte) = "z3ml.cma" +archive(native) = "z3ml.cmxa" +archive(byte, plugin) = "z3ml.cma" +archive(native, plugin) = "z3ml.cmxs" +linkopts = "-cclib -lz3" diff --git a/src/api/ml/z3.ml b/src/api/ml/z3.ml index 2b54a1113..350457525 100644 --- a/src/api/ml/z3.ml +++ b/src/api/ml/z3.ml @@ -110,7 +110,7 @@ struct string_of_int mj ^ "." ^ string_of_int mn ^ "." ^ string_of_int bld ^ "." ^ - string_of_int rev ^ "." + string_of_int rev end