aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_prv_assembler.erl
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2016-08-24 12:44:03 -0700
committerGitHub <[email protected]>2016-08-24 12:44:03 -0700
commit766a2fb0c1724193a5846c3baee5d7f17f343ac5 (patch)
tree01840c574888ee84a7aaaa2e6cda7c5422e8dd81 /src/rlx_prv_assembler.erl
parentf2877a2dc9513c7f98c8a962798379c5c89f4246 (diff)
parent77b8e9202715d526b1bae06b4a8a7882e501dfdc (diff)
downloadrelx-766a2fb0c1724193a5846c3baee5d7f17f343ac5.tar.gz
relx-766a2fb0c1724193a5846c3baee5d7f17f343ac5.tar.bz2
relx-766a2fb0c1724193a5846c3baee5d7f17f343ac5.zip
Merge pull request #479 from emtenet/add-boot-varv3.21.0
Fix for #478 Boot variable $ERTS_LIB_DIR not supplied in Windows scripts
Diffstat (limited to 'src/rlx_prv_assembler.erl')
-rw-r--r--src/rlx_prv_assembler.erl24
1 files changed, 23 insertions, 1 deletions
diff --git a/src/rlx_prv_assembler.erl b/src/rlx_prv_assembler.erl
index 2f08005..53b7dfa 100644
--- a/src/rlx_prv_assembler.erl
+++ b/src/rlx_prv_assembler.erl
@@ -525,7 +525,7 @@ include_erts(State, Release, OutputDir, RelDir) ->
make_boot_script(State, Release, OutputDir, RelDir) ->
Options = [{path, [RelDir | rlx_util:get_code_paths(Release, OutputDir)]},
{outdir, RelDir},
- {variables, [{"ERTS_LIB_DIR", code:lib_dir()}]},
+ {variables, make_boot_script_variables(State)},
no_module_tests, silent],
Name = erlang:atom_to_list(rlx_release:name(Release)),
ReleaseFile = filename:join([RelDir, Name ++ ".rel"]),
@@ -551,6 +551,28 @@ make_boot_script(State, Release, OutputDir, RelDir) ->
?RLX_ERROR({release_script_generation_error, Module, Error})
end.
+make_boot_script_variables(State) ->
+ % A boot variable is needed when {include_erts, false} and the application
+ % directories are split between the release/lib directory and the erts/lib
+ % directory.
+ % The built-in $ROOT variable points to the erts directory on Windows
+ % (dictated by erl.ini [erlang] Rootdir=) and so a boot variable is made
+ % pointing to the release directory
+ % On non-Windows, $ROOT is set by the ROOTDIR environment variable as the
+ % release directory, so a boot variable is made pointing to the erts
+ % directory.
+ % NOTE the boot variable can point to either the release/erts root directory
+ % or the release/erts lib directory, as long as the usage here matches the
+ % usage used in the start up scripts
+ case {os:type(), rlx_state:get(State, include_erts, true)} of
+ {{win32, _}, false} ->
+ [{"RELEASE_DIR", rlx_state:output_dir(State)}];
+ {{win32, _}, true} ->
+ [];
+ _ ->
+ [{"ERTS_LIB_DIR", code:lib_dir()}]
+ end.
+
create_start_clean(RelDir, OutputDir, Options, State) ->
case rlx_util:make_script(Options,
fun(CorrectedOptions) ->