diff options
| author | Siri Hansen <[email protected]> | 2012-03-23 10:55:18 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-03-23 10:55:18 +0100 |
| commit | 13dbd2e55a746ba92a580a9521e55e338276e8c4 (patch) | |
| tree | fad77bc1cf3990d710ec76fb6ab74ac9f994d20c /lib/reltool/src/reltool_target.erl | |
| parent | 8a886bda04b7656f9f6ced9be14a98d6b6df0a0a (diff) | |
| parent | fd89175a2b17e92a0b90cb28e5af2375d3aa4535 (diff) | |
| download | otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.tar.gz otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.tar.bz2 otp-13dbd2e55a746ba92a580a9521e55e338276e8c4.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/reltool/src/reltool_target.erl')
| -rw-r--r-- | lib/reltool/src/reltool_target.erl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl index 3d83a77d99..44f1977ad6 100644 --- a/lib/reltool/src/reltool_target.erl +++ b/lib/reltool/src/reltool_target.erl @@ -247,10 +247,15 @@ gen_app(#app{name = Name, env = Env, mod = StartMod, start_phases = StartPhases}}) -> - StartMod2 = - case StartMod =:= undefined of - true -> []; - false -> [{mod, StartMod}] + StartPhases2 = + case StartPhases of + undefined -> []; + _ -> [{start_phases, StartPhases}] + end, + Tail = + case StartMod of + undefined -> StartPhases2; + _ -> [{mod, StartMod} | StartPhases2] end, {application, Name, [{description, Desc}, @@ -261,10 +266,9 @@ gen_app(#app{name = Name, {applications, ReqApps}, {included_applications, InclApps}, {env, Env}, - {start_phases, StartPhases}, {maxT, MaxT}, {maxP, MaxP} | - StartMod2]}. + Tail]}. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Generate the contents of a rel file |