Fixing generator and readme

README.md

@@ -1,27 +1,22 @@
-
 It's required to have a JDK installed to build.
 Make sure the `JAVA_HOME` environment variable is set.
 
-If you are on a Mac and install `openjdk` via `brew` then additionally, it's required to set:
-```
-export JAVA_AWT_LIBRARY=$JAVA_HOME/libexec/openjdk.jdk/Contents/Home/lib
-```
-because the [`FindJNI.cmake`](https://cmake.org/cmake/help/latest/module/FindJNI.html) module doesn't look there for the `awt` library.
 
 ### Development
 
-Be sure to build with `DISABLE_SANITIZER=1` and `BUILD_JDBC=1` enabled
+To build the driver, run `make release`. 
+
 
 This will produce two jars in the build folder:
-`build/<build_type>/tools/jdbc/duckdb_jdbc.jar`
-`build/<build_type>/tools/jdbc/duckdb_jdbc_tests.jar`
+`build/release/duckdb_jdbc.jar`
+`build/release/duckdb_jdbc_tests.jar`
 
-The tests can be ran using this command (taking a `debug` build for example)
+The tests can be ran using using `make test` or this command
 ```
-java -cp "build/debug/tools/jdbc/duckdb_jdbc_tests.jar:build/debug/tools/jdbc/duckdb_jdbc.jar" org/duckdb/TestDuckDBJDBC
+java -cp "build/release/duckdb_jdbc_tests.jar:build/release/duckdb_jdbc.jar" org/duckdb/TestDuckDBJDBC
 ```
 
 This optionally takes an argument to only run a single test, for example:
 ```
-java -cp "build/debug/tools/jdbc/duckdb_jdbc_tests.jar:build/debug/tools/jdbc/duckdb_jdbc.jar"  org/duckdb/TestDuckDBJDBC test_valid_but_local_config_throws_exception
+java -cp "build/release/duckdb_jdbc_tests.jar:build/release/duckdb_jdbc.jar"  org/duckdb/TestDuckDBJDBC test_valid_but_local_config_throws_exception
 ```

header2whatever.yaml

@@ -1,5 +1,5 @@
 - headers:
-    - "../../build/debug/tools/jdbc/CMakeFiles/duckdb_jdbc.dir/native_headers/org_duckdb_DuckDBNative.h"
+    - "build/release/CMakeFiles/duckdb_jdbc.dir/native_headers/org_duckdb_DuckDBNative.h"
   hooks: generator.py
   templates:
     - src: "src/jni/functions.hpp.template"

src/jni/functions.cpp.template

@@ -1,4 +1,4 @@
-// This file was generated by tools/jdbc/generator.py
+// This file was generated by generator.py
 
 #include "org_duckdb_DuckDBNative.h"
 #include "functions.hpp"

src/jni/functions.hpp.template

@@ -1,4 +1,4 @@
-// This file was generated by tools/jdbc/generator.py
+// This file was generated by generator.py
 
 #pragma once
 

src/main/java/org/duckdb/DuckDBNative.java

@@ -50,7 +50,7 @@ class DuckDBNative {
             URL lib_res = DuckDBNative.class.getResource(lib_res_name);
             if (lib_res == null) {
                 System.load(
-                    Paths.get("../../build/debug/tools/jdbc", lib_res_name).normalize().toAbsolutePath().toString());
+                    Paths.get("../../build/release", lib_res_name).normalize().toAbsolutePath().toString());
             } else {
                 try (final InputStream lib_res_input_stream = lib_res.openStream()) {
                     Files.copy(lib_res_input_stream, lib_file, StandardCopyOption.REPLACE_EXISTING);