From 16181c6f7a6d3664f16e6ada818b710e43828db3 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Mon, 4 Feb 2013 18:59:23 +0100
Subject: [reltool] Write erl.ini as UTF-8

Since file names on windows are unicode, and erl.ini contains paths to
'Bindir' and 'Rootdir', this file is now encoded in UTF-8.
---
 lib/reltool/src/reltool_target.erl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'lib/reltool')

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);
 		_ ->
-- 
cgit v1.2.3


From f5592219f5fb7f69b94b8c60e0cdf4a503a5899b Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Tue, 14 May 2013 17:58:09 +0200
Subject: [reltool] Use unicode characters in work dir for unicode test

---
 lib/reltool/test/reltool_server_SUITE.erl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/reltool')

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}])]),
-- 
cgit v1.2.3