From 23695330ef1767c78193f330c3c3effdb76d4045 Mon Sep 17 00:00:00 2001 From: Erik Stenman Date: Mon, 4 Mar 2019 13:28:15 +0100 Subject: [PATCH] Make rebar use make (#15) * Handle 5 to 8 args. Generate a test file with all instructions for asm/disasm. * Add ops to test 7 and 8 arguments. * Make sure rebar builds sources before trying to build. * Make CI use rebar to build to make sure it works on top level without make. --- .circleci/config.yml | 2 +- Makefile | 2 ++ rebar.config | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c9ac9f..7709f3d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,7 +19,7 @@ jobs: - dialyzer-cache-v1- - run: name: Build - command: make + command: rebar3 compile - run: name: Static Analysis command: make dialyzer diff --git a/Makefile b/Makefile index 916426e..785acc4 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,8 @@ REBAR ?= rebar3 all: local +sources: $(GENERATED_SRC) + local: $(GENERATED_SRC) @$(REBAR) as local release diff --git a/rebar.config b/rebar.config index 2b014b7..4684063 100644 --- a/rebar.config +++ b/rebar.config @@ -12,6 +12,11 @@ {escript_main_app, aebytecode}. {escript_name, aefateasm}. {escript_emu_args, "%%!"}. + +{pre_hooks, + [{"(linux|darwin|solaris)", compile, "make sources"}, + {"(freebsd)", compile, "gmake sources"}]}. + {provider_hooks, [{post, [{compile, escriptize}]}]}.