aboutsummaryrefslogtreecommitdiffstats
path: root/lib/reltool/src/reltool.hrl
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-03-23 11:48:52 +0100
committerSiri Hansen <[email protected]>2012-03-23 11:48:52 +0100
commitb13b88779b3fbc0ef8bb91a17a5d064cd778e0fa (patch)
tree0f4bce1eb128326affdaacaeb0b2de2ac19860f8 /lib/reltool/src/reltool.hrl
parentfd89175a2b17e92a0b90cb28e5af2375d3aa4535 (diff)
parent38f068341ebf04e5d6bf5eff7fb01e44bce228b6 (diff)
downloadotp-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.hrl')
-rw-r--r--lib/reltool/src/reltool.hrl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index 4e5c5b2849..71d3b60a2b 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -63,6 +63,7 @@
-type mod() :: {incl_cond, incl_cond()}
| {debug_info, debug_info()}.
-type app() :: {vsn, app_vsn()}
+ | {lib_dir, lib_dir()}
| {mod, mod_name(), [mod()]}
| {mod_cond, mod_cond()}
| {incl_cond, incl_cond()}
@@ -169,7 +170,7 @@
{ %% Static info
name :: app_name(),
is_escript :: boolean() | {inlined, escript_app_name()},
- use_selected_vsn :: boolean() | undefined,
+ use_selected_vsn :: vsn | dir | undefined,
active_dir :: dir(),
sorted_dirs :: [dir()],
vsn :: app_vsn(),