support tests of SWIG Java

souffle-lang · Jan 24, 2022 · 3898188 · 3898188
1 parent 2f6999a
commit 3898188
Show file tree

Hide file tree

Showing 5 changed files with 120 additions and 319 deletions.
diff --git a/cmake/setup_test_dir.py b/cmake/setup_test_dir.py
@@ -39,7 +39,7 @@
         else:
             os.remove(path) # only remove files
 else:
-    os.mkdir(output_dir)
+    os.makedirs(output_dir, exist_ok=True)
 
 if extra_data == "json":
     for file in [os.path.basename(p) for p in glob.glob(os.path.join(input_dir,"*.json"))]:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -518,7 +518,8 @@ JSON_DATA_TEXT = \"\"\"{
   \"rpath_fmt\": \"${RPATH_FMT}\",
   \"path_delimiter\": \"${OS_PATH_DELIMITER}\",
   \"exe_extension\": \"${EXE_EXTENSION}\",
-  \"source_include_dir\": \"${CMAKE_CURRENT_SOURCE_DIR}/include\"
+  \"source_include_dir\": \"${CMAKE_CURRENT_SOURCE_DIR}/include\",
+  \"jni_includes\": \"${JAVA_INCLUDE_PATH}${OS_PATH_DELIMITER}${JAVA_INCLUDE_PATH2}\"
 }\"\"\"
 ${TEMPLATE}
 ")

diff --git a/src/souffle-compile.in b/src/souffle-compile.in