aboutsummaryrefslogtreecommitdiffstats
path: root/lib/reltool/src/reltool_target.erl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-03-21 19:35:17 +0100
committerSiri Hansen <[email protected]>2012-03-22 08:46:30 +0100
commit602d96340b97315c156b597a5ccbfcc135a9a682 (patch)
tree160273a3c55e7a5445cfc1a7ec2bcd956e888116 /lib/reltool/src/reltool_target.erl
parent33e42a694e0ddd8a6c02bfe6c04298ca95aa938a (diff)
downloadotp-602d96340b97315c156b597a5ccbfcc135a9a682.tar.gz
otp-602d96340b97315c156b597a5ccbfcc135a9a682.tar.bz2
otp-602d96340b97315c156b597a5ccbfcc135a9a682.zip
[reltool] Add configuration parameter lib_dir on application level
As a way of specifying one specific version of an application, the following configuration parameter is added on application level: {lib_dir,Dir}, Dir = string() This can be useful if the parent directory of the application directory is not suitable to use as a lib dir on system level.
Diffstat (limited to 'lib/reltool/src/reltool_target.erl')
-rw-r--r--lib/reltool/src/reltool_target.erl8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl
index 3d83a77d99..77f862dbc2 100644
--- a/lib/reltool/src/reltool_target.erl
+++ b/lib/reltool/src/reltool_target.erl
@@ -155,6 +155,7 @@ do_gen_config(#app{name = Name,
archive_opts = ArchiveOpts,
use_selected_vsn = UseSelected,
vsn = Vsn,
+ active_dir = ActiveDir,
mods = Mods,
is_included = IsIncl},
InclDefs) ->
@@ -170,9 +171,10 @@ do_gen_config(#app{name = Name,
emit(excl_archive_filters, ExclArchiveDirs, undefined, InclDefs),
emit(archive_opts, ArchiveOpts, undefined, InclDefs),
if
- IsIncl, InclDefs -> [{vsn, Vsn}];
- UseSelected -> [{vsn, Vsn}];
- true -> []
+ IsIncl, InclDefs -> [{vsn, Vsn}, {lib_dir, ActiveDir}];
+ UseSelected =:= vsn -> [{vsn, Vsn}];
+ UseSelected =:= dir -> [{lib_dir, ActiveDir}];
+ true -> []
end,
[do_gen_config(M, InclDefs) || M <- Mods]
],