Skip to content

Commit 96f039e

Browse files
tolbrinotolbrino
committed
Upgrade to rebar3
- Add Travis CI configuration - Add license file
1 parent 3df8a32 commit 96f039e

File tree

12 files changed

+421
-22
lines changed

12 files changed

+421
-22
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
.rebar/
22
c_src/*.d
3+
/_build
4+
*.o
5+
*.so

‎.travis.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
sudo: false
2+
language: erlang
3+
script:
4+
- wget -c https://github.com/erlang/rebar3/releases/download/3.6.2/rebar3
5+
- chmod +x rebar3
6+
- REBAR3=./rebar3 make ci
7+
otp_release:
8+
- 21.1
9+
- 20.3
10+
- 20.2
11+
- 20.1
12+
- 20.0
13+
- 19.3
14+
- 19.2
15+
- 19.1
16+
- 18.3

‎LICENSE‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+

‎Makefile‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
.PHONY: all clean clean-all compile xref ci test
2+
3+
REBAR3 ?= rebar3
4+
5+
all: compile xref
6+
7+
ci: compile xref test
8+
9+
compile:
10+
$(REBAR3) compile
11+
12+
clean:
13+
$(REBAR3) clean
14+
15+
clean-all: clean
16+
rm -rf _build
17+
18+
xref:
19+
$(REBAR3) xref
20+
21+
test:
22+
$(REBAR3) ct

‎c_src/Makefile‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# Based on c_src.mk from erlang.mk by Loic Hoguin <essen@ninenines.eu>
2+
3+
CURDIR := $(shell pwd)
4+
BASEDIR := $(abspath $(CURDIR)/..)
5+
6+
PROJECT ?= $(notdir $(BASEDIR))
7+
PROJECT := $(strip $(PROJECT))
8+
9+
ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).")
10+
ERL_INTERFACE_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, include)]).")
11+
ERL_INTERFACE_LIB_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s\", [code:lib_dir(erl_interface, lib)]).")
12+
13+
C_SRC_DIR = $(CURDIR)
14+
C_SRC_OUTPUT ?= $(CURDIR)/../priv/$(PROJECT).so
15+
16+
# System type and C compiler/flags.
17+
18+
UNAME_SYS := $(shell uname -s)
19+
ifeq ($(UNAME_SYS), Darwin)
20+
CC ?= cc
21+
CFLAGS ?= -O3 -std=c99 -arch x86_64 -finline-functions -Wall -Wmissing-prototypes
22+
CXXFLAGS ?= -O3 -arch x86_64 -finline-functions -Wall
23+
LDFLAGS ?= -arch x86_64 -flat_namespace -undefined suppress
24+
else ifeq ($(UNAME_SYS), FreeBSD)
25+
CC ?= cc
26+
CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
27+
CXXFLAGS ?= -O3 -finline-functions -Wall
28+
else ifeq ($(UNAME_SYS), Linux)
29+
CC ?= gcc
30+
CFLAGS ?= -O3 -std=c99 -finline-functions -Wall -Wmissing-prototypes
31+
CXXFLAGS ?= -O3 -finline-functions -Wall
32+
endif
33+
34+
CFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
35+
CXXFLAGS += -fPIC -I $(ERTS_INCLUDE_DIR) -I $(ERL_INTERFACE_INCLUDE_DIR)
36+
37+
LDLIBS += -L $(ERL_INTERFACE_LIB_DIR) -lerl_interface -lei
38+
LDFLAGS += -shared
39+
40+
# Verbosity.
41+
42+
c_verbose_0 = @echo " C " $(?F);
43+
c_verbose = $(c_verbose_$(V))
44+
45+
cpp_verbose_0 = @echo " CPP " $(?F);
46+
cpp_verbose = $(cpp_verbose_$(V))
47+
48+
link_verbose_0 = @echo " LD " $(@F);
49+
link_verbose = $(link_verbose_$(V))
50+
51+
SOURCES := $(shell find $(C_SRC_DIR) -type f \( -name "*.c" -o -name "*.C" -o -name "*.cc" -o -name "*.cpp" \))
52+
OBJECTS = $(addsuffix .o, $(basename $(SOURCES)))
53+
54+
COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) -c
55+
COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c
56+
57+
$(C_SRC_OUTPUT): $(OBJECTS)
58+
@mkdir -p $(BASEDIR)/priv/
59+
$(link_verbose) $(CC) $(OBJECTS) $(LDFLAGS) $(LDLIBS) -o $(C_SRC_OUTPUT)
60+
61+
%.o: %.c
62+
$(COMPILE_C) $(OUTPUT_OPTION) $<
63+
64+
%.o: %.cc
65+
$(COMPILE_CPP) $(OUTPUT_OPTION) $<
66+
67+
%.o: %.C
68+
$(COMPILE_CPP) $(OUTPUT_OPTION) $<
69+
70+
%.o: %.cpp
71+
$(COMPILE_CPP) $(OUTPUT_OPTION) $<
72+
73+
clean:
74+
@rm -f $(C_SRC_OUTPUT) $(OBJECTS)

‎ebin/.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎rebar.config‎

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,39 @@
11
%% -*- erlang -*-
2-
%% Config file for afunix-application
3-
{erl_opts, [debug_info]}.
4-
%% change -DDLOG_DEFAULT=DLOG_DEBUG
5-
{port_env, [{"CFLAGS", "$CFLAGS -Wall -DDLOG_DEFAULT=DLOG_NONE"}]}.
6-
7-
{ct_extra_params, "-suite test/afunix_api_SUITE -erl_args -name ct"}.
8-
%% You can also run ct from the test dir using:
9-
%% ct_run -suite afunix_api_SUITE -erl_args -sname ct
10-
%% ct_run -suite afunix_echo_SUITE -erl_args -sname ct
2+
{erl_opts, [debug_info, fail_on_warning, nowarn_export_all]}.
3+
4+
{pre_hooks,
5+
[
6+
{"(linux|darwin)", compile, "make -C c_src PROJECT=afunix_drv OUTPUT_OPTION=\"-DDLOG_DEFAULT=DLOG_NONE\""}
7+
]}.
8+
9+
{post_hooks,
10+
[
11+
{"(linux|darwin)", clean, "make -C c_src clean"}
12+
]}.
13+
14+
{profiles,
15+
[
16+
{test,
17+
[
18+
{pre_hooks,
19+
[
20+
{"(linux|darwin)", compile, "make -C test/afunix_api_SUITE_data PROJECT=afunix_api_SUITE"}
21+
]},
22+
{post_hooks,
23+
[
24+
{"(linux|darwin)", clean, "make -C test/afunix_api_SUITE_data clean"}
25+
]}
26+
]}
27+
]}.
28+
29+
{xref_checks,
30+
[
31+
undefined_function_calls, undefined_functions, locals_not_used,
32+
deprecated_function_calls, deprecated_functions
33+
]}.
34+
35+
{dist_node,
36+
[
37+
{setcookie, 'afunixnode'},
38+
{sname, 'afunix'}
39+
]}.

‎rebar.lock‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[].

‎src/afunix.app.src‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
%% -*- erlang -*-
12
{application, afunix,
23
[{description, "AF_UNIX socket driver"},
3-
{vsn, git},
4-
{modules, [afunix]},
4+
{vsn, "1.0"},
55
{registered, []},
66
{env, []},
7-
{applications,[kernel,stdlib]}
8-
]}.
7+
{applications,[kernel,stdlib]},
8+
{included_applications, []},
9+
{maintainers, ["Tony Rogvall"]},
10+
{licenses, ["MPL-2.0"]},
11+
{links, [{"Github", "https://github.com/tonyrog/afunix"}]}
12+
]}.

‎test/afunix_api_SUITE.erl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ all() ->
4646
t_shutdown_async, t_fdopen, t_fdconnect].
4747

4848
groups() ->
49-
[{t_accept, [], [t_accept_timeout]},
50-
{t_connect, [], [t_connect_bad]},
51-
{t_recv, [], [t_recv_timeout, t_recv_eof]}].
49+
[{t_accept, [shuffle], [t_accept_timeout]},
50+
{t_connect, [shuffle], [t_connect_bad]},
51+
{t_recv, [shuffle], [t_recv_timeout, t_recv_eof]}].
5252

5353
init_per_suite(Config) ->
5454
Config.
@@ -205,7 +205,7 @@ t_fdconnect(Config) when is_list(Config) ->
205205
["in ", [], <<"a small town">>, [" in Germany,", <<>>]]],
206206
Question1 = iolist_to_binary(Question2),
207207
Answer = "there was a shoemaker, Schumacher was his name.",
208-
Path = ?config(data_dir, Config),
208+
Path = "../../../../test/priv",
209209
Lib = "afunix_api_SUITE",
210210
ok = erlang:load_nif(filename:join(Path,Lib), []),
211211
SocketName = socket_name(Config,"socket_t_fdopen"),

0 commit comments

Comments
 (0)