Skip to content

Commit

Permalink
Get rid of rel/vars-toml.config.in
Browse files Browse the repository at this point in the history
It is easier to modify vars-toml.config directly
  • Loading branch information
Paweł Chrząszcz committed Sep 21, 2022
1 parent bf99f2a commit efee290
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ clean:
-rm -rf asngen
-rm configure.out
-rm rel/configure.vars.config
-rm rel/vars-toml.config

# REBAR_CT_EXTRA_ARGS comes from a test runner
ct:
Expand All @@ -27,7 +26,7 @@ ct:
eunit:
@$(RUN) $(REBAR) eunit

rel: certs configure.out rel/vars-toml.config
rel: certs configure.out rel/configure.vars.config
. ./configure.out && $(REBAR) as prod release

shell: certs etc/mongooseim.cfg
Expand All @@ -40,9 +39,6 @@ rock:
elif [ "$(BRANCH)" ]; then tools/rock_changed.sh $(BRANCH); \
else tools/rock_changed.sh; fi

rel/vars-toml.config: rel/vars-toml.config.in rel/configure.vars.config
cat $^ > $@

## Don't allow these files to go out of sync!
configure.out rel/configure.vars.config:
./tools/configure with-all without-jingle-sip
Expand Down
4 changes: 3 additions & 1 deletion rel/vars-toml.config.in → rel/vars-toml.config
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@
{s2s_certfile, "\"priv/ssl/fake_server.pem\""}.
{all_metrics_are_global, "false"}.

%% Defined in Makefile by appending configure.vars.config
"./configure.vars.config".

%% Defined by appending configure.vars.config
%% Uncomment for manual release generation.
%{mongooseim_runner_user, ""}.
%{mongooseim_script_dir, "$(cd ${0%/*} && pwd)"}.
Expand Down

0 comments on commit efee290

Please sign in to comment.