Skip to content
Snippets Groups Projects
Commit 75aa37e2 authored by florian's avatar florian
Browse files

ENH: Move library_name to global var

parent babf6bd1
No related branches found
No related tags found
1 merge request!5ENH: Check OS and choose library name accordingly
Pipeline #10872 failed
...@@ -23,6 +23,11 @@ ...@@ -23,6 +23,11 @@
module CaosDB module CaosDB
"""
Chose the name of the library according to the OS you're running.
"""
library_name = (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")
module Info module Info
""" """
...@@ -47,6 +52,8 @@ end # Info ...@@ -47,6 +52,8 @@ end # Info
module Utility module Utility
using CaosDB
""" """
get_env_var(var[, default]) get_env_var(var[, default])
...@@ -57,7 +64,7 @@ instead. ...@@ -57,7 +64,7 @@ instead.
function get_env_var(var::AbstractString, default::AbstractString = "") function get_env_var(var::AbstractString, default::AbstractString = "")
ret = ccall( ret = ccall(
(:caosdb_utility_get_env_var, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_utility_get_env_var, CaosDB.library_name),
Cstring, Cstring,
(Cstring, Cstring), (Cstring, Cstring),
var, var,
...@@ -89,7 +96,7 @@ mutable struct _Authenticator ...@@ -89,7 +96,7 @@ mutable struct _Authenticator
if t.wrapped_authenticator != C_NULL if t.wrapped_authenticator != C_NULL
# Only if pointer was filled after real initialization # Only if pointer was filled after real initialization
ccall( ccall(
(:caosdb_authentication_delete_authenticator, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_authentication_delete_authenticator, CaosDB.library_name),
Cint, Cint,
(Ref{_Authenticator},), (Ref{_Authenticator},),
Ref{_Authenticator}(t), Ref{_Authenticator}(t),
...@@ -118,7 +125,7 @@ function create_plain_password_authenticator( ...@@ -118,7 +125,7 @@ function create_plain_password_authenticator(
auth = Ref{_Authenticator}(_Authenticator()) auth = Ref{_Authenticator}(_Authenticator())
err_code = ccall( err_code = ccall(
(:caosdb_authentication_create_plain_password_authenticator, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_authentication_create_plain_password_authenticator, CaosDB.library_name),
Cint, Cint,
(Ref{_Authenticator}, Cstring, Cstring), (Ref{_Authenticator}, Cstring, Cstring),
auth, auth,
...@@ -158,7 +165,7 @@ mutable struct _Connection ...@@ -158,7 +165,7 @@ mutable struct _Connection
function f(t) function f(t)
if t.wrapped_connection != C_NULL if t.wrapped_connection != C_NULL
ccall( ccall(
(:caosdb_connection_delete_connection, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_connection_delete_connection, CaosDB.library_name),
Cint, Cint,
(Ref{_Connection},), (Ref{_Connection},),
Ref{_Connection}(t), Ref{_Connection}(t),
...@@ -184,7 +191,7 @@ mutable struct _CertificateProvider ...@@ -184,7 +191,7 @@ mutable struct _CertificateProvider
function f(t) function f(t)
if t.wrapped_certificate_provider != C_NULL if t.wrapped_certificate_provider != C_NULL
ccall( ccall(
(:caosdb_connection_delete_certificate_provider, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_connection_delete_certificate_provider, CaosDB.library_name),
Cint, Cint,
(Ref{_CertificateProvider},), (Ref{_CertificateProvider},),
Ref{_CertificateProvider}(t), Ref{_CertificateProvider}(t),
...@@ -210,7 +217,10 @@ mutable struct _Configuration ...@@ -210,7 +217,10 @@ mutable struct _Configuration
function f(t) function f(t)
if t.wrapped_connection_configuration != C_NULL if t.wrapped_connection_configuration != C_NULL
ccall( ccall(
(:caosdb_connection_delete_connection_configuration, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (
:caosdb_connection_delete_connection_configuration,
CaosDB.library_name,
),
Cint, Cint,
(Ref{_Configuration},), (Ref{_Configuration},),
Ref{_Configuration}(t), Ref{_Configuration}(t),
...@@ -232,7 +242,7 @@ function create_pem_file_certificate_provider(path::AbstractString) ...@@ -232,7 +242,7 @@ function create_pem_file_certificate_provider(path::AbstractString)
cert_provider = Ref{_CertificateProvider}(_CertificateProvider()) cert_provider = Ref{_CertificateProvider}(_CertificateProvider())
err_code = ccall( err_code = ccall(
(:caosdb_connection_create_pem_file_certificate_provider, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_connection_create_pem_file_certificate_provider, CaosDB.library_name),
Cint, Cint,
(Ref{_CertificateProvider}, Cstring), (Ref{_CertificateProvider}, Cstring),
cert_provider, cert_provider,
...@@ -269,7 +279,7 @@ function create_tls_connection_configuration( ...@@ -269,7 +279,7 @@ function create_tls_connection_configuration(
config = Ref{_Configuration}(_Configuration()) config = Ref{_Configuration}(_Configuration())
err_code = ccall( err_code = ccall(
(:caosdb_connection_create_tls_connection_configuration, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_connection_create_tls_connection_configuration, CaosDB.library_name),
Cint, Cint,
( (
Ref{_Configuration}, Ref{_Configuration},
...@@ -300,7 +310,7 @@ function create_insecure_connection_configuration(host::AbstractString, port::Ci ...@@ -300,7 +310,7 @@ function create_insecure_connection_configuration(host::AbstractString, port::Ci
config = Ref{_Configuration}(_Configuration()) config = Ref{_Configuration}(_Configuration())
err_code = ccall( err_code = ccall(
(:caosdb_connection_create_insecure_connection_configuration, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_connection_create_insecure_connection_configuration, CaosDB.library_name),
Cint, Cint,
(Ref{_Configuration}, Cstring, Cint), (Ref{_Configuration}, Cstring, Cint),
config, config,
...@@ -327,7 +337,7 @@ function create_connection(config::Ref{_Configuration}) ...@@ -327,7 +337,7 @@ function create_connection(config::Ref{_Configuration})
connection = Ref{_Connection}(_Connection()) connection = Ref{_Connection}(_Connection())
err_code = ccall( err_code = ccall(
(:caosdb_connection_create_connection, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_connection_create_connection, CaosDB.library_name),
Cint, Cint,
(Ref{_Connection}, Ref{_Configuration}), (Ref{_Connection}, Ref{_Configuration}),
connection, connection,
...@@ -355,7 +365,7 @@ function get_version_info(con::Ref{_Connection}) ...@@ -355,7 +365,7 @@ function get_version_info(con::Ref{_Connection})
info = Ref{CaosDB.Info._VersionInfo}(CaosDB.Info._VersionInfo()) info = Ref{CaosDB.Info._VersionInfo}(CaosDB.Info._VersionInfo())
err_code = ccall( err_code = ccall(
(:caosdb_connection_get_version_info, (@static Sys.iswindows() ? "ccaosdb" : "libccaosdb")), (:caosdb_connection_get_version_info, CaosDB.library_name),
Cint, Cint,
(Ref{CaosDB.Info._VersionInfo}, Ref{_Connection}), (Ref{CaosDB.Info._VersionInfo}, Ref{_Connection}),
info, info,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment