Minor adjustments after rebasing ml-ng onto unstable.

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>

.gitignore

@@ -68,4 +68,9 @@ src/api/java/enumerations/*.java
 src/api/ml/z3native_stubs.c
 src/api/ml/z3native.ml
 src/api/ml/z3enums.ml
+src/api/ml/z3native.mli
+src/api/ml/z3enums.mli
 src/api/ml/z3.mllib
+*.bak
+doc/api
+doc/code

scripts/mk_util.py

@@ -357,6 +357,7 @@ def check_ml():
     rmf('hello.cmo')
     rmf('hello.cmx')
     rmf('a.out')
+    rmf('hello.o')
     find_ml_lib()
     find_ocaml_find()
 
@@ -384,6 +385,8 @@ def find_ml_lib():
         OCAML_LIB = line[:-1]
     if is_verbose():
         print 'OCAML_LIB=%s' % OCAML_LIB
+    t.close()
+    rmf('output')
     return
 
 def is64():
@@ -1737,10 +1740,10 @@ def mk_config():
         # End of Windows VS config.mk
         if is_verbose():
             print('64-bit:         %s' % is64())
-            print('ML API:         %s' % is_ml_enabled())
             if is_java_enabled():
                 print('JNI Bindings:   %s' % JNI_HOME)
                 print('Java Compiler:  %s' % JAVAC)
+            print('ML API:         %s' % is_ml_enabled())
             if is_ml_enabled():
                 print('OCaml Compiler: %s' % OCAMLC)
                 print('OCaml Native:   %s' % OCAMLOPT)
@@ -1859,11 +1862,11 @@ def mk_config():
             print('64-bit:         %s' % is64())
             if GPROF:
                 print('gprof:          enabled')
-            print('Python version: %s' % distutils.sysconfig.get_python_version())
+            print('Python version: %s' % distutils.sysconfig.get_python_version())            
-            print('ML API:         %s' % is_ml_enabled())
             if is_java_enabled():
                 print('JNI Bindings:   %s' % JNI_HOME)
                 print('Java Compiler:  %s' % JAVAC)
+            print('ML API:         %s' % is_ml_enabled())
             if is_ml_enabled():
                 print('Ocaml Compiler: %s' % OCAMLC)
                 print('Ocaml Native:   %s' % OCAMLOPT)

src/api/ml/README-test-win

@@ -1,23 +0,0 @@
-This directory contains scripts to build the test application using
-OCaml. You also need CamlIDL to be able to generate the OCaml API.
-
-- To download OCaml:
-  http://caml.inria.fr/ocaml/      
-
-- To download CamlIDL:
-  http://forge.ocamlcore.org/projects/camlidl/
-
-- One must build the OCaml library before compiling the example.
-  Go to directory ../ocaml
-
-- Use 'build-test.cmd' to build the test application using the OCaml compiler.
-
-Remark: The OCaml and C compiler tool chains must be configured in your environment.
-Running from the Visual Studio Command Prompt configures the Microsoft C compiler.
-
-- The script 'exec.cmd' adds the bin directory to the path. So,
-  test_mlapi.exe can find z3.dll.
-
-
-
-