diff --git a/.gitignore b/.gitignore index b4d3d201..6cd60ce6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ doc/*.css doc/*.html doc/*.png doc/edoc-info -.directory -.eunit -.rebar +rebar3 +rebar.lock +.eunit/ +.rebar/ +_build/ diff --git a/Makefile b/Makefile index f66c52db..c1ad1420 100644 --- a/Makefile +++ b/Makefile @@ -30,15 +30,19 @@ endif PROPER_REBAR := .$(SEP)rebar +REBAR3_URL := https://s3.amazonaws.com/rebar3/rebar3 +REBAR3 ?= $(shell which rebar3 || which .$(SEP)rebar3 || \ + (wget $(REBAR3_URL) && chmod +x rebar3 && echo .$(SEP)rebar3)) + default: compile all: compile dialyzer doc test compile: - $(PROPER_REBAR) compile + $(REBAR3) compile dialyzer: .plt/proper_plt compile - dialyzer -n -nn --plt $< -Wunmatched_returns ebin + dialyzer -n -nn --plt $< -Wunmatched_returns _build/default/lib/proper/ebin .plt/proper_plt: .plt dialyzer --build_plt --output_plt $@ --apps erts kernel stdlib compiler crypto syntax_tools eunit @@ -58,6 +62,7 @@ clean: distclean: clean $(RM) -r .eunit .rebar $(RM) .plt/proper_plt + $(RM) -r _build rebar3 rebar.lock $(PROPER_REBAR) clean rebuild: distclean compile diff --git a/mix.exs b/mix.exs deleted file mode 100644 index fad99211..00000000 --- a/mix.exs +++ /dev/null @@ -1,33 +0,0 @@ -defmodule Proper.Mixfile do - use Mix.Project - - def project do - [app: :proper, - version: "1.3.0", - description: description(), - package: package(), - deps: deps(), - aliases: aliases()] - end - - defp deps do - [] - end - - defp description do - """ - QuickCheck-inspired property-based testing tool for Erlang. - """ - end - - defp package do - [files: ~w(src include rebar.config Makefile COPYING README.md THANKS examples scripts mix.exs), - maintainers: ["Manolis Papadakis", "Eirini Arvaniti", "Kostis Sagonas"], - licenses: ["GPL"], - links: %{"GitHub" => "https://github.com/proper-testing/proper"}] - end - - defp aliases do - [docs: "cmd ./make_doc"] - end -end diff --git a/src/proper.app.src b/src/proper.app.src index e4b4c8db..f6e3b098 100644 --- a/src/proper.app.src +++ b/src/proper.app.src @@ -1,7 +1,7 @@ %%% -*- coding: utf-8 -*- %%% -*- erlang-indent-level: 2 -*- %%% ------------------------------------------------------------------- -%%% Copyright 2010-2018 Manolis Papadakis , +%%% Copyright 2010-2019 Manolis Papadakis , %%% Eirini Arvaniti %%% and Kostis Sagonas %%% @@ -20,14 +20,17 @@ %%% You should have received a copy of the GNU General Public License %%% along with PropEr. If not, see . -%%% @copyright 2010-2018 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas +%%% @copyright 2010-2019 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas %%% @version {@version} %%% @author Manolis Papadakis %%% @doc This is the source for the proper.app file. {application, proper, [{description, "A QuickCheck-inspired property-based testing tool for Erlang"}, - {vsn, "1.3.0"}, + {maintainers, ["Manolis Papadakis", "Eirini Arvaniti", "Kostis Sagonas"]}, + {licenses, ["GPL3"]}, + {link, [{"GitHub", "https://github.com/proper-testing/proper"}]}, + {vsn, "1.4.0"}, {registered, []}, - {applications, [compiler,kernel,stdlib]}, + {applications, [compiler, kernel, stdlib]}, {env, []}]}.