aboutsummaryrefslogtreecommitdiffstats
path: root/lib/reltool/src
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-11-28 11:40:59 +0100
committerSiri Hansen <[email protected]>2018-11-28 11:40:59 +0100
commitda90cf437e07f0f21b15e0d0ea8ff38cbc0bb1ea (patch)
treece79a294a5da29fe01593895a634b13d56f1f009 /lib/reltool/src
parentc326c098ad41ea99f731cbb26416e07c0921b721 (diff)
parentf20d86b7994596ace8713b61af0925d273a7f03e (diff)
downloadotp-da90cf437e07f0f21b15e0d0ea8ff38cbc0bb1ea.tar.gz
otp-da90cf437e07f0f21b15e0d0ea8ff38cbc0bb1ea.tar.bz2
otp-da90cf437e07f0f21b15e0d0ea8ff38cbc0bb1ea.zip
Merge branch 'maint'
Diffstat (limited to 'lib/reltool/src')
-rw-r--r--lib/reltool/src/reltool_utils.erl13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/reltool/src/reltool_utils.erl b/lib/reltool/src/reltool_utils.erl
index 060a0912f9..2afa386cb3 100644
--- a/lib/reltool/src/reltool_utils.erl
+++ b/lib/reltool/src/reltool_utils.erl
@@ -47,6 +47,9 @@
call/2, cast/2, reply/3]).
+%% For testing
+-export([erl_libs/2]).
+
-include_lib("kernel/include/file.hrl").
-include_lib("wx/include/wx.hrl").
-include("reltool.hrl").
@@ -55,7 +58,15 @@ root_dir() ->
code:root_dir().
erl_libs() ->
- string:lexemes(os:getenv("ERL_LIBS", ""), ":;").
+ erl_libs(os:getenv("ERL_LIBS", ""), os:type()).
+
+erl_libs(ErlLibs, OsType) when is_list(ErlLibs) ->
+ Sep =
+ case OsType of
+ {win32, _} -> ";";
+ _ -> ":"
+ end,
+ string:lexemes(ErlLibs, Sep).
lib_dirs(Dir) ->
case erl_prim_loader:list_dir(Dir) of