Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ doc/*.css
doc/*.html
doc/*.png
doc/edoc-info
include/compile_flags.hrl
.directory
.eunit
.rebar
11 changes: 4 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,10 @@ fast: get-deps compile

all: fast dialyzer doc tests

include/compile_flags.hrl: write_compile_flags
./write_compile_flags $@

get-deps:
$(REBAR) get-deps

compile: include/compile_flags.hrl
compile:
$(REBAR) compile

dialyzer: .plt/proper_plt compile
Expand All @@ -52,7 +49,7 @@ dialyzer: .plt/proper_plt compile
dialyzer --build_plt --output_plt $@ --apps erts kernel stdlib compiler crypto syntax_tools

check_escripts:
./check_escripts.sh make_doc write_compile_flags
./check_escripts.sh make_doc

tests: compile
$(REBAR) eunit
Expand All @@ -65,10 +62,10 @@ clean:

distclean: clean
$(RM) -r .eunit .rebar
$(RM) include/compile_flags.hrl .plt/proper_plt
$(RM) .plt/proper_plt
$(REBAR) clean

rebuild: distclean include/compile_flags.hrl
rebuild: distclean
$(REBAR) compile

retest: compile
Expand Down
1 change: 0 additions & 1 deletion include/proper_internal.hrl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
%%% @doc Internal header file: This header is included in all PropEr source
%%% files.

-include("compile_flags.hrl").
-include("proper_common.hrl").


Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ defmodule Proper.Mixfile do
end

defp package do
[files: ~w(src include rebar.config configure Makefile COPYING README.md THANKS check_escripts.sh clean_doc.sh clean_temp.sh write_compile_flags mix.exs),
[files: ~w(src include rebar.config configure Makefile COPYING README.md THANKS check_escripts.sh clean_doc.sh clean_temp.sh mix.exs),
maintainers: ["Manolis Papadakis", "Eirini Arvaniti", "Kostis Sagonas"],
licenses: ["GPL"],
links: %{"GitHub" => "https://github.com/manopapad/proper"}]
Expand Down
14 changes: 10 additions & 4 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
%% WARNING: Our version of rebar does NOT automatically report warnings,
%% nor does it add erl_opts to eunit_compile_opts.

{minimum_otp_vsn, "17.0"}.

{erl_first_files, ["src/vararg.erl"]}.
{eunit_first_files, ["src/vararg.erl",
"src/proper_transformer.erl",
Expand All @@ -35,9 +37,13 @@
{erl_opts, [debug_info,
report_warnings, {warn_format,1}, warn_export_vars,
warn_obsolete_guard, warn_unused_import,
warn_missing_spec, warn_untyped_record]}.
warn_missing_spec, warn_untyped_record,
{platform_define, "^17", 'USE_ERL_SCAN_LINE'},
{platform_define, "^19|^2", 'AT_LEAST_19'},
{platform_define, "^2", 'AT_LEAST_20'},
{platform_define, "^2[1-9]", 'AT_LEAST_21'}]}.

{pre_hooks, [{"(linux|darwin|gnu)", compile, "make include/compile_flags.hrl"},
{"(freebsd|netbsd|openbsd|solaris|dragonfly)", compile, "gmake include/compile_flags.hrl"},
{"win32", compile, "escript.exe write_compile_flags include/compile_flags.hrl"}]}.
{post_hooks, [{clean, "./clean_doc.sh"}]}.

{dialyzer, [{warnings, [unmatched_returns]},
{plt_extra_apps, [erts, kernel, stdlib, compiler, crypto, syntax_tools]}]}.
1 change: 0 additions & 1 deletion test/proper_tests.erl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

-module(proper_tests).

-include("compile_flags.hrl").
-include("proper.hrl").

-include_lib("eunit/include/eunit.hrl").
Expand Down
2 changes: 0 additions & 2 deletions test/symb_statem_maps.erl
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

-module(symb_statem_maps).

-include("compile_flags.hrl").

-include_lib("proper/include/proper.hrl").

-export([command/1,
Expand Down
66 changes: 0 additions & 66 deletions write_compile_flags

This file was deleted.