The cinterop “noStringConversion” option lets you use the unmodified …

…Firebird API.
hgourvest · Jun 1, 2024 · 32c7849 · 32c7849
1 parent 60d9e3f
commit 32c7849
Show file tree

Hide file tree

Showing 6 changed files with 1,212 additions and 185 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -7,4 +7,10 @@ org.gradle.caching=true
 kotlin.code.style=official
 
 #Android
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+
+#Signing
+signing.keyId=9D2AFC20
+signing.password=agnusdei
+signing.secretKeyRingFile=/home/henri/.gnupg/secring.gpg
+
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -73,7 +73,7 @@ kotlin {
             val main by getting {
                 cinterops {
                     create("fbclient") {
-                        header(file("../native/include/fbclient.h"))
+                        header(file("../native/include/ibase.h"))
                     }
                 }
             }

diff --git a/library/src/nativeInterop/cinterop/fbclient.def b/library/src/nativeInterop/cinterop/fbclient.def
@@ -6,3 +6,4 @@ linkerOpts.mingw = -L"C:/Program Files/Firebird/Firebird_5_0/lib/" -lfbclient_ms
 linkerOpts.linux = -L/opt/firebird/lib/ -lfbclient
 linkerOpts.osx = -L/Library/Frameworks/Firebird.framework/Resources/lib/ -lfbclient
 
+noStringConversion = isc_attach_database isc_create_database isc_dsql_execute_immediate isc_dsql_prepare isc_get_segment isc_put_segment isc_blob_info isc_dsql_sql_info
diff --git a/native/firebird-lib-jni.cpp b/native/firebird-lib-jni.cpp
@@ -1,5 +1,5 @@
 #include <jni.h>
-#include <fbclient.h>
+#include <ibase.h>
 #include <cstring>
 #include <algorithm>
 #include <limits>

diff --git a/native/include/fbclient.h b/native/include/fbclient.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ linkerOpts.mingw = -L"C:/Program Files/Firebird/Firebird_5_0/lib/" -lfbclient_ms
		linkerOpts.linux = -L/opt/firebird/lib/ -lfbclient
		linkerOpts.osx = -L/Library/Frameworks/Firebird.framework/Resources/lib/ -lfbclient

		noStringConversion = isc_attach_database isc_create_database isc_dsql_execute_immediate isc_dsql_prepare isc_get_segment isc_put_segment isc_blob_info isc_dsql_sql_info