diff options
| author | Siri Hansen <[email protected]> | 2012-03-23 11:48:52 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2012-03-23 11:48:52 +0100 |
| commit | b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa (patch) | |
| tree | 0f4bce1eb128326affdaacaeb0b2de2ac19860f8 /lib/reltool/src/reltool_target.erl | |
| parent | fd89175a2b17e92a0b90cb28e5af2375d3aa4535 (diff) | |
| parent | 38f068341ebf04e5d6bf5eff7fb01e44bce228b6 (diff) | |
| download | otp-b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa.tar.gz otp-b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa.tar.bz2 otp-b13b88779b3fbc0ef8bb91a17a5d064cd778e0fa.zip | |
Merge branch 'siri/reltool/app-level-lib-dir/OTP-9977' into maint
* siri/reltool/app-level-lib-dir/OTP-9977:
[reltool] Allow lib_dir on app level to use relative path
[reltool] Add configuration parameter lib_dir on application level
Diffstat (limited to 'lib/reltool/src/reltool_target.erl')
| -rw-r--r-- | lib/reltool/src/reltool_target.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl index 44f1977ad6..e3a7b02143 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] ], |