Merge be4288acc7 into 5d5cfe4f9b

.gitignore

@@ -1,3 +1,5 @@
+_build
+.rebar3
 .jiffy.dev
 *.app
 *.beam

c_src/Makefile

@@ -0,0 +1,74 @@
+# Based on c_src.mk from erlang.mk by Loic Hoguin <essen@ninenines.eu>
+
+CURDIR := $(shell pwd)
+BASEDIR := $(abspath $(CURDIR)/..)
+
+PROJECT ?= $(notdir $(BASEDIR))
+PROJECT := $(strip $(PROJECT))
+
+ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).")
+ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)]).")
+ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)]).")
+
+C_SRC_DIR = $(CURDIR)
+C_SRC_OUTPUT ?= $(CURDIR)/../priv/$(PROJECT).so
+
+# System type and C compiler/flags.
+
+UNAME_SYS := $(shell uname -s)
+ifeq ($(UNAME_SYS), Darwin)
+	CC ?= cc
+	CFLAGS ?= -O3 -std=c99 -arch x86_64 -finline-functions -Wall -Wmissing-prototypes
+	CXXFLAGS ?= -O3 -arch x86_64 -finline-functions -Wall
+	LDFLAGS ?= -arch x86_64 -flat_namespace -undefined suppress
+else ifeq ($(UNAME_SYS), FreeBSD)
+	CC ?= cc
+	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
+	CXXFLAGS ?= -O3 -finline-functions -Wall
+else ifeq ($(UNAME_SYS), Linux)
+	CC ?= gcc
+	CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
+	CXXFLAGS ?= -O3 -finline-functions -Wall
+endif
+
+CFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
+CXXFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
+
+LDLIBS += -L $(ERL_INTERFACE_LIB_DIR) -lerl_interface -lei
+LDFLAGS += -shared -lstdc++
+
+# 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)

rebar.config

@@ -1,37 +1,10 @@
-{port_specs, [
-    {"priv/jiffy.so", [
-        "c_src/*.c",
-        "c_src/*.cc",
-        "c_src/double-conversion/*.cc"
-    ]}
-]}.
-
-{port_env, [
-    {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin)",
-        "CFLAGS", "$CFLAGS -g -Wall -Werror -O3 -fno-strict-aliasing"},
-    {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin)",
-        "CXXFLAGS", "$CXXFLAGS -g -Wall -Werror -O3"},
-
-    {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin)",
-        "LDFLAGS", "$LDFLAGS -lstdc++"},
-
-    %% OS X Leopard flags for 64-bit
-    {"darwin9.*-64$", "CXXFLAGS", "-m64"},
-    {"darwin9.*-64$", "LDFLAGS", "-arch x86_64"},
-
-    %% OS X Snow Leopard flags for 32-bit
-    {"darwin10.*-32$", "CXXFLAGS", "-m32"},
-    {"darwin10.*-32$", "LDFLAGS", "-arch i386"},
-
-    %% This will merge into basho/rebar/rebar.config eventually
-    {"win32", "CFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS"},
-    {"win32", "CXXFLAGS", "-g -Wall -O3"}
-]}.
-
 {erl_opts, [
     {platform_define, "R1(1|2|3|4|5|6)", 'JIFFY_NO_MAPS'}
 ]}.
 
+{pre_hooks, [{"(linux|darwin|solaris)", compile, "make -C c_src"}]}.
+{post_hooks, [{"(linux|darwin|solaris)", clean, "make -C c_src clean"}]}.
+
 {eunit_opts, [
     verbose,
     {report, {
@@ -39,7 +12,33 @@
     }}
 ]}.
 
-{plugins, [
-    rebar_gdb_plugin
-]}.
+%% Remaining only used with rebar versions of 2.x
 
+{port_specs, [
+             {"priv/jiffy.so", [
+                               "c_src/*.c",
+                               "c_src/*.cc",
+                               "c_src/double-conversion/*.cc"
+                               ]}
+             ]}.
+{port_env, [
+           {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin)",
+            "CFLAGS", "$CFLAGS -g -Wall -Werror -O3 -fno-strict-aliasing"},
+           {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin)",
+            "CXXFLAGS", "$CXXFLAGS -g -Wall -Werror -O3"},
+           {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin)",
+            "LDFLAGS", "$LDFLAGS -lstdc++"},
+           %% OS X Leopard flags for 64-bit
+           {"darwin9.*-64$", "CXXFLAGS", "-m64"},
+           {"darwin9.*-64$", "LDFLAGS", "-arch x86_64"},
+           %% OS X Snow Leopard flags for 32-bit
+           {"darwin10.*-32$", "CXXFLAGS", "-m32"},
+           {"darwin10.*-32$", "LDFLAGS", "-arch i386"},
+           %% This will merge into basho/rebar/rebar.config eventually
+           {"win32", "CFLAGS", "/Wall /DWIN32 /D_WINDOWS /D_WIN32 /DWINDOWS"},
+           {"win32", "CXXFLAGS", "-g -Wall -O3"}
+           ]}.
+
+{plugins, [
+          rebar_gdb_plugin
+          ]}.

rebar.lock

@@ -0,0 +1 @@
+[].