ソースを参照

update config deps and support semver in app vsn

pull/3/head
Tristan Sloughter 10年前
コミット
055fa5b639
2個のファイルの変更14行の追加7行の削除
  1. +11
    -7
      rebar.config
  2. +3
    -0
      src/rebar_utils.erl

+ 11
- 7
rebar.config ファイルの表示

@ -27,13 +27,17 @@
{platform_define, "^[0-9]+", namespaced_types} {platform_define, "^[0-9]+", namespaced_types}
]}. ]}.
{deps, [{providers, "",
{git, "https://github.com/tsloughter/providers.git",
{branch, "format_error"}}},
{relx, "",
{git, "https://github.com/tsloughter/relx.git",
{branch, "format_error2"}}},
{getopt, "", {git, "https://github.com/jcomellas/getopt.git", {branch, "master"}}}]}.
{deps, [
{erlware_commons, ".*",
{git, "https://github.com/erlware/erlware_commons.git",
{branch, "master"}}},
{providers, "",
{git, "https://github.com/tsloughter/providers.git",
{branch, "master"}}},
{relx, "",
{git, "https://github.com/tsloughter/relx.git",
{branch, "ec_git_vsn"}}},
{getopt, "", {git, "https://github.com/jcomellas/getopt.git", {branch, "master"}}}]}.
{erlydtl_opts, [{doc_root, "priv/templates"}, {erlydtl_opts, [{doc_root, "priv/templates"},
{compiler_options, [report, return, debug_info]}]}. {compiler_options, [report, return, debug_info]}]}.

+ 3
- 0
src/rebar_utils.erl ファイルの表示

@ -473,6 +473,9 @@ vcs_vsn_1(Vcs, Dir) ->
end end
end. end.
%% Temp work around for repos like relx that use "semver"
vcs_vsn_cmd(VCS, Dir) when VCS =:= semver ; VCS =:= "semver" ->
rebar_git_resource:make_vsn(Dir);
vcs_vsn_cmd(VCS, Dir) when VCS =:= git ; VCS =:= "git" -> vcs_vsn_cmd(VCS, Dir) when VCS =:= git ; VCS =:= "git" ->
rebar_git_resource:make_vsn(Dir); rebar_git_resource:make_vsn(Dir);
vcs_vsn_cmd(VCS, Dir) when VCS =:= pkg ; VCS =:= "pkg" -> vcs_vsn_cmd(VCS, Dir) when VCS =:= pkg ; VCS =:= "pkg" ->

読み込み中…
キャンセル
保存