diff options
| author | Siri Hansen <[email protected]> | 2013-06-05 14:58:58 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2013-06-05 14:58:58 +0200 |
| commit | 3a40a631313ea3a5b05de121ebd6a559d8543329 (patch) | |
| tree | 846a70b93f4870e5dcaeae7026b67f4afe5f3db1 /lib/reltool | |
| parent | 00e93e8948c84bc5150e3c8dbea0820e60491461 (diff) | |
| parent | b81d9bf18cd99b60f4bd964f190f63673e0a9b6b (diff) | |
| download | otp-3a40a631313ea3a5b05de121ebd6a559d8543329.tar.gz otp-3a40a631313ea3a5b05de121ebd6a559d8543329.tar.bz2 otp-3a40a631313ea3a5b05de121ebd6a559d8543329.zip | |
Merge branch 'siri/install-otp-in-unicode-path'
* siri/install-otp-in-unicode-path:
[sasl] Remove priv dir after release_handler_SUITE
Update preloaded init.beam
Allow unicode characters for boot and config in init:make_permanent
[sasl] Clean priv_dir after systools_SUITE
[reltool] Use unicode characters in work dir for unicode test
[sasl] Use unicode characters in priv dir name also on windows
[reltool] Write erl.ini as UTF-8
[sasl] Update tests to run under unicode path
[sasl] Rewrite release_handler_SUITE:clean_priv_dir to work on unicode paths
[sasl] Update example/target_system.erl to handle unicode
[sasl] Write erl.ini as utf8, allowing unicode path for root dir and bin dir
Diffstat (limited to 'lib/reltool')
| -rw-r--r-- | lib/reltool/src/reltool_target.erl | 9 | ||||
| -rw-r--r-- | lib/reltool/test/reltool_server_SUITE.erl | 11 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/reltool/src/reltool_target.erl b/lib/reltool/src/reltool_target.erl index 9cda5dabd3..b59108d8dd 100644 --- a/lib/reltool/src/reltool_target.erl +++ b/lib/reltool/src/reltool_target.erl @@ -1455,10 +1455,11 @@ do_install(RelName, TargetDir) -> {win32, _} -> NativeRootDir = nativename(TargetDir2), NativeErtsBinDir = nativename(ErtsBinDir), - IniData = ["[erlang]\r\n", - "Bindir=", NativeErtsBinDir, "\r\n", - "Progname=erl\r\n", - "Rootdir=", NativeRootDir, "\r\n"], + IniData0 = ["[erlang]\r\n", + "Bindir=", NativeErtsBinDir, "\r\n", + "Progname=erl\r\n", + "Rootdir=", NativeRootDir, "\r\n"], + IniData = unicode:characters_to_binary(IniData0), IniFile = filename:join([BinDir, "erl.ini"]), ok = file:write_file(IniFile, IniData); _ -> diff --git a/lib/reltool/test/reltool_server_SUITE.erl b/lib/reltool/test/reltool_server_SUITE.erl index 61d8ced7fc..feeac9e099 100644 --- a/lib/reltool/test/reltool_server_SUITE.erl +++ b/lib/reltool/test/reltool_server_SUITE.erl @@ -807,13 +807,14 @@ create_target_unicode(Config) -> %% If file name translation mode is unicode, then use unicode %% characters release name (which will be used as file name for - %% .rel, .script and .boot) - RelNamePrefix = + %% .rel, .script and .boot), and install the release under a path + %% which icludes unicode characters. + {RelNamePrefix,TargetDirName} = case file:native_name_encoding() of utf8 -> - "Unicode test αβ"; + {"Unicode test αβ","target_unicode_αβ"} ; latin1 -> - "Unicode test" + {"Unicode test","target_unicode"} end, %% Configure the server @@ -837,7 +838,7 @@ create_target_unicode(Config) -> ]}, %% Generate target file - TargetDir = filename:join([?WORK_DIR, "target_unicode"]), + TargetDir = filename:join([?WORK_DIR, TargetDirName]), ?m(ok, reltool_utils:recursive_delete(TargetDir)), ?m(ok, file:make_dir(TargetDir)), ?log("SPEC: ~p\n", [reltool:get_target_spec([{config, Sys}])]), |