Merge pull request #35 from mmzeeman/use-makefile-instead-of-pc

Move to a makefile based nif compilation

Author: mmzeeman

.github/workflows/test.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Compile
-        run: make
+        run: make NO_OPT=1
 
       - name: Test
-        run: make test 
+        run: make test NO_OPT=1 

c_src/Makefile

@@ -0,0 +1,82 @@
+# Based on c_src.mk from erlang.mk by Loic Hoguin <[email protected]>
+
+CURDIR := $(shell pwd)
+BASEDIR := $(abspath $(CURDIR)/..)
+
+PROJECT ?= $(notdir $(BASEDIR))
+PROJECT := $(strip $(PROJECT))
+
+ERTS_INCLUDE_DIR ?= $(shell erl -noshell -eval "io:format(\"~ts/erts-~ts/include/\", [code:root_dir(), erlang:system_info(version)])." -s init stop)
+ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, include)])." -s init stop)
+ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -eval "io:format(\"~ts\", [code:lib_dir(erl_interface, lib)])." -s init stop)
+
+DUCKDB_INCLUDE_DIR ?= $(CURDIR)/duckdb
+
+C_SRC_DIR = $(CURDIR)
+C_SRC_OUTPUT ?= $(CURDIR)/../priv/$(PROJECT).so
+
+ifeq ($(NO_OPT), 1)
+	O_LEVEL = 0
+else
+	O_LEVEL ?= 3
+endif
+
+# System type and C compiler/flags.
+
+UNAME_SYS := $(shell uname -s)
+ifeq ($(UNAME_SYS), Darwin)
+	CC ?= cc
+	CFLAGS ?= -O$(O_LEVEL) -std=c99 -finline-functions -Wall -Wmissing-prototypes
+	CXXFLAGS ?= -O$(O_LEVEL) -finline-functions -Wall
+	LDFLAGS ?= -flat_namespace -undefined suppress
+else ifeq ($(UNAME_SYS), FreeBSD)
+	CC ?= cc
+	CFLAGS ?= -O$(O_LEVEL) -std=c99 -finline-functions -Wall -Wmissing-prototypes
+	CXXFLAGS ?= -O$(O_LEVEL) -finline-functions -Wall
+else ifeq ($(UNAME_SYS), Linux)
+	CC ?= gcc
+	CFLAGS ?= -O$(O_LEVEL) -std=c99 -finline-functions -Wall -Wmissing-prototypes
+	CXXFLAGS ?= -O$(O_LEVEL) -finline-functions -Wall
+endif
+
+CFLAGS += -fPIC -I $(DUCKDB_INCLUDE_DIR) -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
+CXXFLAGS += -std=c++11 -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
+
+LDLIBS += -L $(ERL_INTERFACE_LIB_DIR) -lei
+LDFLAGS += -shared
+
+# Verbosity.
+
+c_verbose_0 = @echo " C     " $(?F);
+c_verbose = $(c_verbose_$(V))
+
+cpp_verbose_0 = @echo " CPP   " $(?F);
+cpp_verbose = $(cpp_verbose_$(V))
+
+link_verbose_0 = @echo " LD    " $(@F);
+link_verbose = $(link_verbose_$(V))
+
+SOURCES := $(shell find $(C_SRC_DIR) -type f \( -name "*.c" -o -name "*.C" -o -name "*.cc" -o -name "*.cpp" \))
+OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
+
+COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) -c
+COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
+
+$(C_SRC_OUTPUT): $(OBJECTS)
+	@mkdir -p $(BASEDIR)/priv/
+	$(link_verbose) $(CC) $(OBJECTS) $(LDFLAGS) $(LDLIBS) -o $(C_SRC_OUTPUT)
+
+%.o: %.c
+	$(COMPILE_C) $(OUTPUT_OPTION) $<
+
+%.o: %.cc
+	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
+
+%.o: %.C
+	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
+
+%.o: %.cpp
+	$(COMPILE_CPP) $(OUTPUT_OPTION) $<
+
+clean:
+	@rm -f $(C_SRC_OUTPUT) $(OBJECTS)

c_src/educkdb_nif.c

@@ -1491,7 +1491,6 @@ educkdb_parameter_name(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
 static ERL_NIF_TERM
 educkdb_parameter_index(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) {
     char name[MAX_ATOM_LENGTH];
-    int len;
     educkdb_prepared_statement *stmt;
     ErlNifBinary bin;
     idx_t index;

rebar.config

@@ -0,0 +1,38 @@
+{minimum_otp_vsn, "25.0"}.
+
+{erl_opts, [debug_info]}.
+
+{xref_checks, [undefined_function_calls,
+    undefined_functions,
+    locals_not_used,
+    deprecated_function_calls,
+    deprecated_functions]}.
+
+{artifacts, ["priv/educkdb.so"]}.
+
+{pre_hooks,
+    [{"(linux|darwin|solaris)", compile, "make -C c_src"},
+    {"(freebsd)", compile, "gmake -C c_src"}]}.
+{post_hooks,
+    [{"(linux|darwin|solaris)", clean, "make -C c_src clean"},
+    {"(freebsd)", clean, "gmake -C c_src clean"}]}.
+
+{dialyzer, [
+    {warnings, [
+        unmatched_returns,
+        error_handling,
+        race_conditions,
+        underspecs,
+        unknown
+    ]}
+]}.
+
+{project_plugins, [rebar3_ex_doc]}.
+
+{hex, [{doc, ex_doc}]}.
+
+{ex_doc, [
+    {source_url, <<"https://github.com/mmzeeman/educkdb">>},
+    {extras, [<<"README.md">>, <<"LICENSE">>]},
+    {main, <<"readme">>}
+]}.

rebar.config.script

@@ -1,7 +1,7 @@
 {application, educkdb,
  [
   {description, "DuckDB NIF Interface"},
-  {vsn, "0.9.10"},
+  {vsn, "0.10.0"},
   {modules, [educkdb]},
   {registered, []},
   {licenses, ["Apache-2.0"]},

src/educkdb.app.src

@@ -195,7 +195,7 @@
 -on_load(init/0).
 
 init() ->
-    NifName = "educkdb_nif",
+    NifName = "educkdb",
     NifFileName = case code:priv_dir(educkdb) of
                       {error, bad_name} -> filename:join("priv", NifName);
                       Dir -> filename:join(Dir, NifName)