diff options
| author | Dan Gudmundsson <[email protected]> | 2013-11-29 09:50:42 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-11-29 09:50:42 +0100 |
| commit | d299987d7e22d1236f14a4e097e8ee805a1b72ea (patch) | |
| tree | 377b3ffd0c088580b1713f51d238c46e24da9fd2 /lib/sasl/src | |
| parent | ac7902caa784d4f4c73eb7291ab4736a75ad13a4 (diff) | |
| parent | a9340a1692b0ae4d3b3c0328d007ac4a7db5cc75 (diff) | |
| download | otp-d299987d7e22d1236f14a4e097e8ee805a1b72ea.tar.gz otp-d299987d7e22d1236f14a4e097e8ee805a1b72ea.tar.bz2 otp-d299987d7e22d1236f14a4e097e8ee805a1b72ea.zip | |
Merge branch 'dgud/sasl/no_dot_erlang_boot/OTP-8479' into maint
* dgud/sasl/no_dot_erlang_boot/OTP-8479:
sasl: Add no_dot_erlang documentation and tests
sasl: Add no_dot_erlang start script
Diffstat (limited to 'lib/sasl/src')
| -rw-r--r-- | lib/sasl/src/systools_make.erl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl index b2e95fdbee..bab88552f9 100644 --- a/lib/sasl/src/systools_make.erl +++ b/lib/sasl/src/systools_make.erl @@ -1135,10 +1135,10 @@ generate_script(Output, Release, Appls, Flags) -> load_appl_mods(Appls, Mandatory ++ Preloaded, PathFlag, Variables) ++ [{path, create_path(Appls, PathFlag, Variables)}] ++ - create_kernel_procs(Appls) ++ - create_load_appls(Appls) ++ - create_start_appls(Appls) ++ - script_end() + create_kernel_procs(Appls) ++ + create_load_appls(Appls) ++ + create_start_appls(Appls) ++ + script_end(lists:member(no_dot_erlang, Flags)) }, ScriptFile = Output ++ ".script", @@ -1229,9 +1229,12 @@ create_load_appls([]) -> %%______________________________________________________________________ %% The final part of the script. -script_end() -> +script_end(false) -> %% Do not skip loading of $HOME/.erlang [{apply, {c, erlangrc, []}}, - {progress, started}]. + {progress, started}]; +script_end(true) -> %% Ignore loading of $HOME/.erlang + [{progress, started}]. + %%----------------------------------------------------------------- %% Function: sort_appls(Appls) -> {ok, Appls'} | throw({error, Error}) @@ -2055,6 +2058,9 @@ cas([no_warn_sasl | Args], X) -> %%% no_module_tests (kept for backwards compatibility, but ignored) ---- cas([no_module_tests | Args], X) -> cas(Args, X); +cas([no_dot_erlang | Args], X) -> + cas(Args, X); + %%% ERROR -------------------------------------------------------------- cas([Y | Args], X) -> cas(Args, X++[Y]). |