Merge remote-tracking branch 'upstream/master' into release-1.0

CMakeLists.txt

@@ -112,6 +112,13 @@ else()
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${available_build_types})
   endif()
   message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
+
+  # Check the selected build type is valid
+  list(FIND available_build_types "${CMAKE_BUILD_TYPE}" _build_type_index)
+  if ("${_build_type_index}" EQUAL "-1")
+    message(FATAL_ERROR "\"${CMAKE_BUILD_TYPE}\" is an invalid build type.\n"
+      "Use one of the following build types ${available_build_types}")
+  endif()
 endif()
 
 # CMAKE_BUILD_TYPE has no meaning for multi-configuration generators

doc/mk_api_doc.py

@@ -12,10 +12,6 @@ import shutil
 ML_ENABLED=False
 BUILD_DIR='../build'
 
-def norm_path(p):
-    # We use '/' on mk_project for convenience
-    return os.path.join(*(p.split('/')))
-
 def display_help(exit_code):
     print("mk_api_doc.py: Z3 documentation generator\n")
     print("\nOptions:")
@@ -36,7 +32,7 @@ def parse_options():
 
     for opt, arg in options:
         if opt in ('-b', '--build'):
-            BUILD_DIR = norm_path(arg)
+            BUILD_DIR = mk_util.norm_path(arg)
         elif opt in ('h', '--help'):
             display_help()
             exit(1)

scripts/mk_unix_dist.py

@@ -42,7 +42,7 @@ def mk_dir(d):
 
 def set_build_dir(path):
     global BUILD_DIR
-    BUILD_DIR = path
+    BUILD_DIR = mk_util.norm_path(path)
     mk_dir(BUILD_DIR)
 
 def display_help():

scripts/mk_util.py

@@ -153,8 +153,7 @@ def is_cygwin_mingw():
     return IS_CYGWIN_MINGW
 
 def norm_path(p):
-    # We use '/' on mk_project for convenience
-    return os.path.join(*(p.split('/')))
+    return os.path.expanduser(os.path.normpath(p))
 
 def which(program):
     import os

scripts/mk_win_dist.py

@@ -46,7 +46,7 @@ def mk_dir(d):
 
 def set_build_dir(path):
     global BUILD_DIR, BUILD_X86_DIR, BUILD_X64_DIR
-    BUILD_DIR = path
+    BUILD_DIR = mk_util.norm_path(path)
     BUILD_X86_DIR = os.path.join(path, 'x86')
     BUILD_X64_DIR = os.path.join(path, 'x64')
     mk_dir(BUILD_X86_DIR)

scripts/update_api.py

@@ -710,6 +710,9 @@ def mk_java(java_dir, package_name):
                     java_wrapper.write('  }\n')
             elif k == OUT_MANAGED_ARRAY:
                 java_wrapper.write('  *(jlong**)a%s = (jlong*)_a%s;\n' % (i, i))
+
+            elif k == IN and param_type(param) == STRING:
+                java_wrapper.write('  jenv->ReleaseStringUTFChars(a%s, _a%s);\n' % (i, i));
             i = i + 1
         # return
         if result == STRING: