瀏覽代碼

Add -D support to rebar_port_compiler

pull/3/head
Tuncer Ayaz 13 年之前
父節點
當前提交
28b9cebf0a
共有 1 個文件被更改,包括 11 次插入1 次删除
  1. +11
    -1
      src/rebar_port_compiler.erl

+ 11
- 1
src/rebar_port_compiler.erl 查看文件

@ -154,7 +154,7 @@ setup_env(Config) ->
%% max flexibility for users. %% max flexibility for users.
DefaultEnvs = filter_envs(default_env(), []), DefaultEnvs = filter_envs(default_env(), []),
PortEnvs = rebar_config:get_list(Config, port_envs, []), PortEnvs = rebar_config:get_list(Config, port_envs, []),
OverrideEnvs = filter_envs(PortEnvs, []),
OverrideEnvs = global_defines() ++ filter_envs(PortEnvs, []),
RawEnv = apply_defaults(os_env(), DefaultEnvs) ++ OverrideEnvs, RawEnv = apply_defaults(os_env(), DefaultEnvs) ++ OverrideEnvs,
expand_vars_loop(merge_each_var(RawEnv, [])). expand_vars_loop(merge_each_var(RawEnv, [])).
@ -162,6 +162,16 @@ setup_env(Config) ->
%% Internal functions %% Internal functions
%% =================================================================== %% ===================================================================
global_defines() ->
[begin
case string:tokens(D, "=") of
[Var, Val] ->
{Var, Val};
[Def] ->
{Def, "1"}
end
end || D <- rebar_config:get_global(defines, [])].
expand_sources([], Acc) -> expand_sources([], Acc) ->
Acc; Acc;
expand_sources([{ArchRegex, Spec} | Rest], Acc) -> expand_sources([{ArchRegex, Spec} | Rest], Acc) ->

Loading…
取消
儲存