yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(rel): rel_vsn renamed to release_version

This commit is contained in:
Zaiming Shi 2020-12-08 21:56:35 +01:00
parent 6d1cd6b7ea
commit 084ce97d41
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/emqx.cmd
View File

@ -15,7 +15,7 @@
:: Set variables that describe the release :: Set variables that describe the release
@set rel_name=emqx @set rel_name=emqx
@set rel_vsn={{ rel_vsn }} @set rel_vsn={{ release_version }}
@set erts_vsn={{ erts_vsn }} @set erts_vsn={{ erts_vsn }}
@set erl_opts={{ erl_opts }} @set erl_opts={{ erl_opts }}

2
bin/emqx_ctl.cmd
View File

@ -4,7 +4,7 @@
:: Set variables that describe the release :: Set variables that describe the release
@set rel_name=emqx @set rel_name=emqx
@set rel_vsn={{ rel_vsn }} @set rel_vsn={{ release_version }}
@set erts_vsn={{ erts_vsn }} @set erts_vsn={{ erts_vsn }}
@set erl_opts={{ erl_opts }} @set erl_opts={{ erl_opts }}

4
data/emqx_vars
View File

@ -3,7 +3,7 @@
## Update the vars to the end of this file instead. ## Update the vars to the end of this file instead.
###################################################################### ######################################################################
## constants from relx template ## constants from relx template
REL_VSN="{{ rel_vsn }}" REL_VSN="{{ release_version }}"
ERTS_VSN="{{ erts_vsn }}" ERTS_VSN="{{ erts_vsn }}"
ERL_OPTS="{{ erl_opts }}" ERL_OPTS="{{ erl_opts }}"
RUNNER_ROOT_DIR="{{ runner_root_dir }}" RUNNER_ROOT_DIR="{{ runner_root_dir }}"
@ -17,6 +17,6 @@ EMQX_DISCR="{{ emqx_description }}"
## computed vars ## computed vars
REL_NAME="emqx" REL_NAME="emqx"
ERTS_PATH=$RUNNER_ROOT_DIR/erts-$ERTS_VSN/bin ERTS_PATH="$RUNNER_ROOT_DIR/erts-$ERTS_VSN/bin"
## updated vars here ## updated vars here

26
rebar.config.erl
View File

@ -49,6 +49,7 @@ profiles() ->
relx(Profile) -> relx(Profile) ->
Vsn = get_vsn(), Vsn = get_vsn(),
[ {include_src,false} [ {include_src,false}
, {include_erts, true}
, {extended_start_script,false} , {extended_start_script,false}
, {generate_start_script,false} , {generate_start_script,false}
, {sys_config,false} , {sys_config,false}
@ -144,15 +145,15 @@ relx_overlay(ReleaseType) ->
, {copy,"bin/*","bin/"} , {copy,"bin/*","bin/"}
, {template,"etc/*.conf","etc/"} , {template,"etc/*.conf","etc/"}
, {template,"etc/emqx.d/*.conf","etc/emqx.d/"} , {template,"etc/emqx.d/*.conf","etc/emqx.d/"}
, {copy,"priv/emqx.schema","releases/{{rel_vsn}}/"} , {copy,"priv/emqx.schema","releases/{{release_version}}/"}
, {copy, "etc/certs","etc/"} , {copy, "etc/certs","etc/"}
, {copy,"bin/emqx.cmd","bin/emqx.cmd-{{rel_vsn}}"} , {copy,"bin/emqx.cmd","bin/emqx.cmd-{{release_version}}"}
, {copy,"bin/emqx_ctl.cmd","bin/emqx_ctl.cmd-{{rel_vsn}}"} , {copy,"bin/emqx_ctl.cmd","bin/emqx_ctl.cmd-{{release_version}}"}
, {copy,"bin/emqx","bin/emqx-{{rel_vsn}}"} , {copy,"bin/emqx","bin/emqx-{{release_version}}"}
, {copy,"bin/emqx_ctl","bin/emqx_ctl-{{rel_vsn}}"} , {copy,"bin/emqx_ctl","bin/emqx_ctl-{{release_version}}"}
, {copy,"bin/install_upgrade.escript", "bin/install_upgrade.escript-{{rel_vsn}}"} , {copy,"bin/install_upgrade.escript", "bin/install_upgrade.escript-{{release_version}}"}
, {copy,"bin/nodetool","bin/nodetool-{{rel_vsn}}"} , {copy,"bin/nodetool","bin/nodetool-{{release_version}}"}
, {copy,"_build/default/lib/cuttlefish/cuttlefish","bin/cuttlefish-{{rel_vsn}}"} , {copy,"_build/default/lib/cuttlefish/cuttlefish","bin/cuttlefish-{{release_version}}"}
] ++ do_relx_overlay(ReleaseType). ] ++ do_relx_overlay(ReleaseType).
do_relx_overlay(cloud) -> do_relx_overlay(cloud) ->
@ -164,8 +165,15 @@ do_relx_overlay(edge) ->
, {template,"etc/emqx_edge.d/vm.args.edge","etc/vm.args"} , {template,"etc/emqx_edge.d/vm.args.edge","etc/vm.args"}
]. ].
env(Name, Default) ->
case os:getenv(Name) of
"" -> Default;
false -> Default;
Value -> Value
end.
get_vsn() -> get_vsn() ->
PkgVsn = case os:getenv("PKG_VSN") of PkgVsn = case env("PKG_VSN", false) of
false -> os:cmd("git describe --tags"); false -> os:cmd("git describe --tags");
Vsn -> Vsn Vsn -> Vsn
end, end,