diff options
author | Jordan Wilberding <[email protected]> | 2013-01-25 04:14:05 -0800 |
---|---|---|
committer | Jordan Wilberding <[email protected]> | 2013-01-25 04:14:05 -0800 |
commit | e29f7fa585670f2bb1aad6060bfa2fe0aeba1cd8 (patch) | |
tree | ccc9c612deac643818f62166c2827c018574f0b6 /src/rcl_state.erl | |
parent | 1a43e62a5ee0ceafb2082a41e632489b48e7f567 (diff) | |
parent | 58f0df46df654f6221aff6534477b5df1076e0fa (diff) | |
download | relx-e29f7fa585670f2bb1aad6060bfa2fe0aeba1cd8.tar.gz relx-e29f7fa585670f2bb1aad6060bfa2fe0aeba1cd8.tar.bz2 relx-e29f7fa585670f2bb1aad6060bfa2fe0aeba1cd8.zip |
Merge pull request #21 from ericbmerritt/next
working towards release upgrades
Diffstat (limited to 'src/rcl_state.erl')
-rw-r--r-- | src/rcl_state.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/rcl_state.erl b/src/rcl_state.erl index 842b635..ecf3115 100644 --- a/src/rcl_state.erl +++ b/src/rcl_state.erl @@ -1,4 +1,4 @@ -%%% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*- +%% -*- erlang-indent-level: 4; indent-tabs-mode: nil; fill-column: 80 -*- %%% Copyright 2012 Erlware, LLC. All Rights Reserved. %%% %%% This file is provided to you under the Apache License, @@ -62,6 +62,7 @@ -record(state_t, {log :: rcl_log:t(), root_dir :: file:name(), caller :: caller(), + action :: atom(), output_dir :: file:name(), lib_dirs=[] :: [file:name()], config_file=[] :: file:filename(), @@ -92,14 +93,17 @@ %% API %%============================================================================ %% @doc Create a new 'log level' for the system --spec new(proplists:proplist(), [file:filename()] | file:filename()) -> t(). -new(PropList, Target) when erlang:is_list(PropList) -> +-spec new(proplists:proplist(), atom()) -> t(). +new(PropList, Target) + when erlang:is_list(PropList), + erlang:is_atom(Target) -> {ok, Root} = file:get_cwd(), State0 = #state_t{log = proplists:get_value(log, PropList, rcl_log:new(error)), output_dir=proplists:get_value(output_dir, PropList, ""), lib_dirs=proplists:get_value(lib_dirs, PropList, ""), - config_file=Target, + config_file=proplists:get_value(config, PropList, ""), + action = Target, goals=proplists:get_value(goals, PropList, []), providers = [], releases=ec_dictionary:new(ec_dict), @@ -286,7 +290,7 @@ create_logic_providers(State0) -> new_test() -> LogState = rcl_log:new(error), - RCLState = new([{log, LogState}], []), + RCLState = new([{log, LogState}], release), ?assertMatch(LogState, log(RCLState)). -endif. |