aboutsummaryrefslogtreecommitdiffstats
path: root/lib/reltool/src/reltool.hrl
diff options
context:
space:
mode:
authorSiri Hansen <siri@erlang.org>2012-03-15 11:52:41 +0100
committerSiri Hansen <siri@erlang.org>2012-03-19 09:51:43 +0100
commitba3e53ef71cc127d4df9c53f9f401645814e3fb7 (patch)
tree8652289e38a2ffb3054759fbcc7df19f6cece12f /lib/reltool/src/reltool.hrl
parentdac94945228322ffb9f8dd8495789c0cd64442a3 (diff)
downloadotp-ba3e53ef71cc127d4df9c53f9f401645814e3fb7.tar.gz
otp-ba3e53ef71cc127d4df9c53f9f401645814e3fb7.tar.bz2
otp-ba3e53ef71cc127d4df9c53f9f401645814e3fb7.zip
[reltool] Fix problems with sorting of applications
OTP-9792 The following problems have been solved: * reltool_target:do_merge_apps - in recursive calls to this function, the accumulator was reverted each time causing the order of applications listed after kernel and stdlib in the rel specification in the configuration to sometimes be messed up. * There are several ways to specify wich applications to include in an application: 1) in the .app file for the including applications 2a) in the .rel file, when listing applications 2b) in the rel specification in the reltool configuration 2a (systools) and 2b (reltool) should have the same effect and overwrite 1. According to the documentation of systools (sasl), the default value in 2a is an empty list. This should mean that if included applications are not mentioned in the .rel file, then any included application listed in the .app file will be disregarded. This is NOT the way systools actually works. The implementation sets the default for the .rel file to the same list as in the .app file. Reltool earlier implemented 2b as described in the systools documentation. However, after some discussion we decided to change this so that reltool handles 2b in the same way as systools handles 2a since this seems more intuitive. The sasl documentation will be altered accordingly (internal ref OTP-9980). * If the rel specification in the reltool configuration explicitly specified included applications to be an empty list, and the .app file had a non-empty list, then the empty list from the rel specification was discarded. This has been corrected so the rel specification now, if set, always overwrites the value of included_applications in the .app file. * reltool would earlier add load instructions in the script/boot files for ALL modules in the ebin directory of an application even if mod_cond was set to app (include only modules listed in the .app file). This has been corrected - now only modules with #mod.is_included==true are loaded. * reltool would earlier add start instructions in the script/boot file for included applications. This has been corrected - included applications shall only be loaded since the including application is responsible for starting them.
Diffstat (limited to 'lib/reltool/src/reltool.hrl')
-rw-r--r--lib/reltool/src/reltool.hrl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index fc0078715a..4e5c5b2849 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -206,7 +206,7 @@
{
name :: app_name(),
app_type :: app_type() | undefined,
- incl_apps = [] :: [incl_app()]
+ incl_apps :: [incl_app()] | undefined
}).
-record(rel,