Merge branch 'siri/sasl/unicode/OTP-10782'

* siri/sasl/unicode/OTP-10782:
  [sasl] Add unicode test for systools:make_script
  [sasl] Adapt release handling mechanisms to unicode

9 files changed, 158 insertions, 88 deletions

diff --git a/lib/sasl/src/release_handler.erl b/lib/sasl/src/release_handler.erl
index 1ff3eb96eb..c1b715b970 100644
--- a/lib/sasl/src/release_handler.erl
+++ b/lib/sasl/src/release_handler.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -41,7 +41,8 @@
 %% Internal exports, a client release_handler may call this functions.
 -export([do_write_release/3, do_copy_file/2, do_copy_files/2,
 	 do_copy_files/1, do_rename_files/1, do_remove_files/1,
-	 remove_file/1, do_write_file/2, do_ensure_RELEASES/1]).
+	 remove_file/1, do_write_file/2, do_write_file/3,
+	 do_ensure_RELEASES/1]).
 
 -record(state, {unpurged = [],
 		root,
@@ -254,7 +255,7 @@ check_timeout(_Else) -> false.
 new_emulator_upgrade(Vsn, Opts) ->
     Result = call({install_release, Vsn, reboot, Opts}),
     error_logger:info_msg(
-      "~p:install_release(~p,~p) completed after node restart "
+      "~w:install_release(~p,~p) completed after node restart "
       "with new emulator version~nResult: ~p~n",[?MODULE,Vsn,Opts,Result]),
     Result.
 
@@ -1128,7 +1129,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) ->
 	    {ok,[FC]} ->
 		FC;
 	    {error,Error1} ->
-		io:format("Warning: ~p can not read ~p: ~p~n",
+		io:format("Warning: ~w can not read ~p: ~p~n",
 			  [?MODULE,FromFile,Error1]),
 		[]
 	end,
@@ -1138,7 +1139,7 @@ new_emulator_make_hybrid_config(CurrentVsn,ToVsn,TmpVsn,RelDir,Masters) ->
 	    {ok,[ToConfig]} ->
 		[lists:keyfind(App,1,ToConfig) || App <- [kernel,stdlib,sasl]];
 	    {error,Error2} ->
-		io:format("Warning: ~p can not read ~p: ~p~n",
+		io:format("Warning: ~w can not read ~p: ~p~n",
 			  [?MODULE,ToFile,Error2]),
 		[false,false,false]
 	end,
@@ -1597,7 +1598,9 @@ remove_file(File) ->
     end.
 
 do_write_file(File, Str) ->
-    case file:open(File, [write]) of
+    do_write_file(File, Str, []).
+do_write_file(File, Str, FileOpts) ->
+    case file:open(File, [write | FileOpts]) of
 	{ok, Fd} ->
 	    io:put_chars(Fd, Str),
 	    file:close(Fd),
diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl
index 93d12cf609..b37ae2f944 100644
--- a/lib/sasl/src/release_handler_1.erl
+++ b/lib/sasl/src/release_handler_1.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -624,7 +624,7 @@ get_proc_state(Proc) ->
 
 maybe_supervisor_which_children(suspended, Name, Pid) ->
     error_logger:error_msg("release_handler: a which_children call"
-                           " to ~p (~p) was avoided. This supervisor"
+                           " to ~p (~w) was avoided. This supervisor"
                            " is suspended and should likely be upgraded"
                            " differently. Exiting ...~n", [Name, Pid]),
     error(suspended_supervisor);
@@ -635,7 +635,7 @@ maybe_supervisor_which_children(State, Name, Pid) ->
             Res;
         Other ->
             error_logger:error_msg("release_handler: ~p~nerror during"
-                                   " a which_children call to ~p (~p)."
+                                   " a which_children call to ~p (~w)."
                                    " [State: ~p] Exiting ... ~n",
                                    [Other, Name, Pid, State]),
             error(which_children_failed)
@@ -647,7 +647,7 @@ maybe_get_dynamic_mods(Name, Pid) ->
             Res;
         Other ->
             error_logger:error_msg("release_handler: ~p~nerror during a"
-                                   " get_modules call to ~p (~p),"
+                                   " get_modules call to ~p (~w),"
                                    " there may be an error in it's"
                                    " childspec. Exiting ...~n",
                                    [Other, Name, Pid]),
diff --git a/lib/sasl/src/systools_lib.erl b/lib/sasl/src/systools_lib.erl
index 1b6ea125d9..6618baa2aa 100644
--- a/lib/sasl/src/systools_lib.erl
+++ b/lib/sasl/src/systools_lib.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -42,7 +42,11 @@ file_term2binary(FileIn, FileOut) ->
 
 %%______________________________________________________________________    
 %% read_term(File) -> {ok, Term} | Error
-	
+%%
+%% This is really an own implementation of file:consult/1, except it
+%% returns one term and not a list of terms. Keeping the function
+%% instead of using file:consult - for backwards compatibility with
+%% error reasons.
 read_term(File) ->
     case file:open(File, [read]) of
 	{ok, Stream} ->
@@ -54,6 +58,7 @@ read_term(File) ->
     end.
 
 read_term_from_stream(Stream, File) ->
+    _ = epp:set_encoding(Stream),
     R = io:request(Stream, {get_until,'',erl_scan,tokens,[1]}),
     case R of
 	{ok,Toks,_EndLine} ->
@@ -176,11 +181,11 @@ add_dirs(RegName, Dirs, Root) ->
 regexp_match(RegName, D0, Root) ->
     case file:list_dir(D0) of
 	{ok, Files} when length(Files) > 0 ->
-	    case re:compile(RegName) of
+	    case re:compile(RegName,[unicode]) of
 		{ok, MP} ->
 		    FR = fun(F) ->
-				 case re:run(F, MP) of
-				     {match,[{0,N}]} when N == length(F) ->
+				 case re:run(F, MP, [{capture,first,list}]) of
+				     {match,[F]} -> % All of F matches
 					 DirF = join(D0, F, Root),
 					 case dir_p(DirF) of
 					     true ->
diff --git a/lib/sasl/src/systools_make.erl b/lib/sasl/src/systools_make.erl
index 9b2e2c809b..193dbb64bf 100644
--- a/lib/sasl/src/systools_make.erl
+++ b/lib/sasl/src/systools_make.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -156,10 +156,10 @@ return(ok,Warnings,Flags) ->
 	_ ->
 	    case member(warnings_as_errors,Flags) of
 		true ->
-		    io:format("~s",[format_warning(Warnings, true)]),
+		    io:format("~ts",[format_warning(Warnings, true)]),
 		    error;
 		false ->
-		    io:format("~s",[format_warning(Warnings)]),
+		    io:format("~ts",[format_warning(Warnings)]),
 		    ok
 	    end
     end;
@@ -168,7 +168,7 @@ return({error,Mod,Error},_,Flags) ->
 	true ->
 	    {error,Mod,Error};
 	_ ->
-	    io:format("~s",[Mod:format_error(Error)]),
+	    io:format("~ts",[Mod:format_error(Error)]),
 	    error
     end.
 
@@ -1970,17 +1970,11 @@ is_app_type(_) -> false.
 
 % check if a term is a string.
 
-string_p([H|T]) when is_integer(H), H >= $ , H < 255 ->
-    string_p(T);
-string_p([$\n|T]) -> string_p(T);
-string_p([$\r|T]) -> string_p(T);
-string_p([$\t|T]) -> string_p(T);
-string_p([$\v|T]) -> string_p(T);
-string_p([$\b|T]) -> string_p(T);
-string_p([$\f|T]) -> string_p(T);
-string_p([$\e|T]) -> string_p(T);
-string_p([]) -> true;
-string_p(_) ->  false.
+string_p(S) ->
+    case unicode:characters_to_list(S) of
+	S -> true;
+	_ -> false
+    end.
 
 % check if a term is a list of two tuples with the first
 % element as an atom.
@@ -2203,31 +2197,31 @@ format_error({illegal_applications,Names}) ->
     io_lib:format("Illegal applications in the release file: ~p~n",
 		  [Names]);
 format_error({missing_mandatory_app,Name}) ->
-    io_lib:format("Mandatory application ~p must be specified in the release file~n",
+    io_lib:format("Mandatory application ~w must be specified in the release file~n",
 		  [Name]);
 format_error({mandatory_app,Name,Type}) ->
-    io_lib:format("Mandatory application ~p must be of type 'permanent' in the release file. Is '~p'.~n",
+    io_lib:format("Mandatory application ~w must be of type 'permanent' in the release file. Is '~p'.~n",
 		  [Name,Type]);
 format_error({duplicate_register,Dups}) ->
-    io_lib:format("Duplicated register names: ~n~s",
+    io_lib:format("Duplicated register names: ~n~ts",
 		  [map(fun({{Reg,App1,_,_},{Reg,App2,_,_}}) ->
-			       io_lib:format("\t~p registered in ~p and ~p~n",
+			       io_lib:format("\t~w registered in ~w and ~w~n",
 					     [Reg,App1,App2])
 		       end, Dups)]);
 format_error({undefined_applications,Apps}) ->
     io_lib:format("Undefined applications: ~p~n",[Apps]);
 format_error({duplicate_modules,Dups}) ->
-    io_lib:format("Duplicated modules: ~n~s",
+    io_lib:format("Duplicated modules: ~n~ts",
 		  [map(fun({{Mod,_,App1,_,_},{Mod,_,App2,_,_}}) ->
-			       io_lib:format("\t~p specified in ~p and ~p~n",
+			       io_lib:format("\t~w specified in ~w and ~w~n",
 					     [Mod,App1,App2])
 		       end, Dups)]);
 format_error({included_and_used, Dups}) ->
     io_lib:format("Applications both used and included: ~p~n",[Dups]);
 format_error({duplicate_include, Dups}) ->
-    io_lib:format("Duplicated application included: ~n~s",
+    io_lib:format("Duplicated application included: ~n~ts",
 		  [map(fun({{Name,App1,_,_},{Name,App2,_,_}}) ->
-			       io_lib:format("\t~p included in ~p and ~p~n",
+			       io_lib:format("\t~w included in ~w and ~w~n",
 					     [Name,App1,App2])
 		       end, Dups)]);
 format_error({modules,ModErrs}) ->
@@ -2238,11 +2232,11 @@ format_error({not_found,File}) ->
     io_lib:format("File not found: ~p~n",[File]);
 format_error({parse,File,{Line,Mod,What}}) ->
     Str = Mod:format_error(What),
-    io_lib:format("~s:~p: ~s\n",[File, Line, Str]);
+    io_lib:format("~ts:~w: ~ts\n",[File, Line, Str]);
 format_error({read,File}) ->
     io_lib:format("Cannot read ~p~n",[File]);
 format_error({open,File,Error}) ->
-    io_lib:format("Cannot open ~p - ~s~n",
+    io_lib:format("Cannot open ~p - ~ts~n",
 		  [File,file:format_error(Error)]);
 format_error({tar_error,What}) ->
     form_tar_err(What);
@@ -2258,24 +2252,21 @@ format_errors(ListOfErrors) ->
 form_err({bad_application_name,{Name,Found}}) ->
     io_lib:format("~p: Mismatched application id: ~p~n",[Name,Found]);
 form_err({error_reading, {Name, What}}) ->
-    io_lib:format("~p: ~s~n",[Name,form_reading(What)]);
+    io_lib:format("~p: ~ts~n",[Name,form_reading(What)]);
 form_err({module_not_found,App,Mod}) ->
-    io_lib:format("~p: Module (~p) not found~n",[App,Mod]);
-form_err({{vsn_diff,File},{Mod,Vsn,App,_,_}}) ->
-    io_lib:format("~p: Module (~p) version (~p) differs in file ~p~n",
-		  [App,Mod,Vsn,File]);
+    io_lib:format("~w: Module (~w) not found~n",[App,Mod]);
 form_err({error_add_appl, {Name, {tar_error, What}}}) ->
-    io_lib:format("~p: ~s~n",[Name,form_tar_err(What)]);
+    io_lib:format("~p: ~ts~n",[Name,form_tar_err(What)]);
 form_err(E) ->
     io_lib:format("~p~n",[E]).
 
 form_reading({not_found,File}) ->
     io_lib:format("File not found: ~p~n",[File]);
 form_reading({application_vsn, {Name,Vsn}}) ->
-    io_lib:format("Application ~s with version ~p not found~n",[Name, Vsn]);
+    io_lib:format("Application ~ts with version ~p not found~n",[Name, Vsn]);
 form_reading({parse,File,{Line,Mod,What}}) ->
     Str = Mod:format_error(What),
-    io_lib:format("~s:~p: ~s\n",[File, Line, Str]);
+    io_lib:format("~ts:~w: ~ts\n",[File, Line, Str]);
 form_reading({read,File}) ->
     io_lib:format("Cannot read ~p~n",[File]);
 form_reading({{bad_param, P},_}) ->
@@ -2291,15 +2282,15 @@ form_reading({no_valid_version, {{_, SVsn}, {_, File, FVsn}}}) ->
     io_lib:format("No valid version (~p) of .app file found. Found file ~p with version ~p~n", 
 		  [SVsn, File, FVsn]);
 form_reading({parse_error, {File, Line, Error}}) ->
-    io_lib:format("Parse error in file: ~p.  Line: ~p  Error: ~p; ~n", [File, Line, Error]);
+    io_lib:format("Parse error in file: ~p.  Line: ~w  Error: ~p; ~n", [File, Line, Error]);
 form_reading(W) ->
     io_lib:format("~p~n",[W]).
 
 form_tar_err({open, File, Error}) ->
-    io_lib:format("Cannot open tar file ~s - ~p~n",
+    io_lib:format("Cannot open tar file ~ts - ~ts~n",
 		  [File, erl_tar:format_error(Error)]);
 form_tar_err({add, File, Error}) ->
-    io_lib:format("Cannot add file ~s to tar file - ~s~n",
+    io_lib:format("Cannot add file ~ts to tar file - ~ts~n",
 		  [File, erl_tar:format_error(Error)]).
 
 %% Format warning
@@ -2317,23 +2308,23 @@ format_warning(Warnings, Werror) ->
     map(fun({warning,W}) -> form_warn(Prefix, W) end, Warnings).
 
 form_warn(Prefix, {source_not_found,{Mod,_,App,_,_}}) ->
-    io_lib:format("~s~p: Source code not found: ~p.erl~n",
+    io_lib:format("~ts~w: Source code not found: ~w.erl~n",
 		  [Prefix,App,Mod]);
 form_warn(Prefix, {{parse_error, File},{_,_,App,_,_}}) ->
-    io_lib:format("~s~p: Parse error: ~p~n",
+    io_lib:format("~ts~w: Parse error: ~p~n",
 		  [Prefix,App,File]);
 form_warn(Prefix, {obj_out_of_date,{Mod,_,App,_,_}}) ->
-    io_lib:format("~s~p: Object code (~p) out of date~n",
+    io_lib:format("~ts~w: Object code (~w) out of date~n",
 		  [Prefix,App,Mod]);
 form_warn(Prefix, {exref_undef, Undef}) ->
     F = fun({M,F,A}) ->
-		io_lib:format("~sUndefined function ~p:~p/~p~n",
+		io_lib:format("~tsUndefined function ~w:~w/~w~n",
 			      [Prefix,M,F,A])
 	end,
     map(F, Undef);
 form_warn(Prefix, missing_sasl) ->
-    io_lib:format("~s: Missing application sasl. "
+    io_lib:format("~ts: Missing application sasl. "
 		  "Can not upgrade with this release~n",
 		  [Prefix]);
 form_warn(Prefix, What) ->
-    io_lib:format("~s ~p~n", [Prefix,What]).
+    io_lib:format("~ts ~p~n", [Prefix,What]).
diff --git a/lib/sasl/src/systools_rc.erl b/lib/sasl/src/systools_rc.erl
index cf5cca7cb3..54c327410d 100644
--- a/lib/sasl/src/systools_rc.erl
+++ b/lib/sasl/src/systools_rc.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -904,7 +904,7 @@ format_error({bad_op_before_point_of_no_return, Instruction}) ->
     io_lib:format("Bad instruction ~p~nbefore point_of_no_return~n",
 		  [Instruction]);
 format_error({no_object_code, Mod}) ->
-    io_lib:format("No load_object_code found for module: ~p~n", [Mod]);
+    io_lib:format("No load_object_code found for module: ~w~n", [Mod]);
 format_error({suspended_not_resumed, Mods}) ->
     io_lib:format("Suspended but not resumed: ~p~n", [Mods]);
 format_error({resumed_not_suspended, Mods}) ->
@@ -916,19 +916,19 @@ format_error({start_not_stop, Mods}) ->
 format_error({stop_not_start, Mods}) ->
     io_lib:format("Stopped but not started: ~p~n", [Mods]);
 format_error({no_such_application, App}) ->
-    io_lib:format("Started undefined application: ~p~n", [App]);
+    io_lib:format("Started undefined application: ~w~n", [App]);
 format_error({removed_application_present, App}) ->
-    io_lib:format("Removed application present: ~p~n", [App]);
+    io_lib:format("Removed application present: ~w~n", [App]);
 format_error(dup_mnesia_backup) ->
     io_lib:format("Duplicate mnesia_backup~n", []);
 format_error(bad_mnesia_backup) ->
     io_lib:format("mnesia_backup in bad position~n", []);
 format_error({conflicting_versions, Lib, V1, V2}) ->
-    io_lib:format("Conflicting versions for ~p, ~p and ~p~n", [Lib, V1, V2]);
+    io_lib:format("Conflicting versions for ~w, ~ts and ~ts~n", [Lib, V1, V2]);
 format_error({no_appl_vsn, Appl}) ->
-    io_lib:format("No version specified for application: ~p~n", [Appl]);
+    io_lib:format("No version specified for application: ~w~n", [Appl]);
 format_error({no_such_module, Mod}) ->
-    io_lib:format("No such module: ~p~n", [Mod]);
+    io_lib:format("No such module: ~w~n", [Mod]);
 format_error(too_many_point_of_no_return) ->
     io_lib:format("Too many point_of_no_return~n", []);
 
diff --git a/lib/sasl/src/systools_relup.erl b/lib/sasl/src/systools_relup.erl
index 7048184426..716dc2b5ff 100644
--- a/lib/sasl/src/systools_relup.erl
+++ b/lib/sasl/src/systools_relup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1996-2012. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2013. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -494,21 +494,18 @@ get_script_from_appup(Mode, TopApp, BaseVsn, Ws, RUs) ->
 	    throw({error, ?MODULE, {no_relup, FName, TopApp, BaseVsn}})
     end.
 
-appup_search_for_version(BaseVsn, VsnRUs) ->
-    appup_search_for_version(BaseVsn, length(BaseVsn), VsnRUs).
-
-appup_search_for_version(BaseVsn,_,[{BaseVsn,RU}|_]) ->
+appup_search_for_version(BaseVsn,[{BaseVsn,RU}|_]) ->
     {ok,RU};
-appup_search_for_version(BaseVsn,Size,[{Vsn,RU}|VsnRUs]) when is_binary(Vsn) ->
-    case re:run(BaseVsn,Vsn,[unicode,{capture,first,index}]) of
-	{match,[{0,Size}]} ->
+appup_search_for_version(BaseVsn,[{Vsn,RU}|VsnRUs]) when is_binary(Vsn) ->
+    case re:run(BaseVsn,Vsn,[unicode,{capture,first,list}]) of
+	{match,[BaseVsn]} ->
 	    {ok, RU};
 	_ ->
-	    appup_search_for_version(BaseVsn,Size,VsnRUs)
+	    appup_search_for_version(BaseVsn,VsnRUs)
     end;
-appup_search_for_version(BaseVsn,Size,[_|VsnRUs]) ->
-    appup_search_for_version(BaseVsn,Size,VsnRUs);
-appup_search_for_version(_,_,[]) ->
+appup_search_for_version(BaseVsn,[_|VsnRUs]) ->
+    appup_search_for_version(BaseVsn,VsnRUs);
+appup_search_for_version(_,[]) ->
     error.
 
 
@@ -603,14 +600,15 @@ print_error(Other) ->
 format_error({file_problem, {"relup", _Posix}}) ->
     io_lib:format("Could not open file relup~n", []);
 format_error({file_problem, {File, What}}) ->
-    io_lib:format("Could not ~p file ~p~n", [get_reason(What), File]);
+    io_lib:format("Could not ~w file ~ts~n", [get_reason(What), File]);
 format_error({no_relup, File, App, Vsn}) ->
-    io_lib:format("No release upgrade script entry for ~p-~s to ~p-~s "
-		  "in file ~p~n",
+    io_lib:format("No release upgrade script entry for ~w-~ts to ~w-~ts "
+		  "in file ~ts~n",
 		  [App#application.name, App#application.vsn, 
 		   App#application.name, Vsn, File]);
 format_error({missing_sasl,Release}) ->
-    io_lib:format("No sasl application in release ~p, ~p. Can not be upgraded.",
+    io_lib:format("No sasl application in release ~ts, ~ts. "
+		  "Can not be upgraded.",
 		  [Release#release.name, Release#release.vsn]);
 format_error(Error) ->
     io:format("~p~n", [Error]).
@@ -629,16 +627,16 @@ print_warning(W, Opts) ->
 		     "*WARNING* "
 	     end,
     S = format_warning(Prefix, W),
-    io:format("~s", [S]).
+    io:format("~ts", [S]).
 
 format_warning(W) ->
     format_warning("*WARNING* ", W).
 
 format_warning(Prefix, {erts_vsn_changed, {Rel1, Rel2}}) ->
-    io_lib:format("~sThe ERTS version changed between ~p and ~p~n",
+    io_lib:format("~tsThe ERTS version changed between ~p and ~p~n",
 		  [Prefix, Rel1, Rel2]);
 format_warning(Prefix, What) ->
-    io_lib:format("~s~p~n",[Prefix, What]).
+    io_lib:format("~ts~p~n",[Prefix, What]).
 
 
 get_reason({error, {open, _, _}}) -> open;
diff --git a/lib/sasl/test/systools_SUITE.erl b/lib/sasl/test/systools_SUITE.erl
index 878d582e6b..367cab1d77 100644
--- a/lib/sasl/test/systools_SUITE.erl
+++ b/lib/sasl/test/systools_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2012. All Rights Reserved.
+%% Copyright Ericsson AB 2012-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -40,7 +40,8 @@
 
 -export([all/0,suite/0,groups/0,init_per_group/2,end_per_group/2]).
 
--export([script_options/1, normal_script/1, no_mod_vsn_script/1,
+-export([script_options/1, normal_script/1, unicode_script/1,
+	 unicode_script/2, no_mod_vsn_script/1,
 	 wildcard_script/1, variable_script/1, no_sasl_script/1,
 	 abnormal_script/1, src_tests_script/1, crazy_script/1,
 	 included_script/1, included_override_script/1,
@@ -75,7 +76,7 @@ all() ->
 
 groups() -> 
     [{script, [],
-      [script_options, normal_script, no_mod_vsn_script,
+      [script_options, normal_script, unicode_script, no_mod_vsn_script,
        wildcard_script, variable_script, abnormal_script,
        no_sasl_script, src_tests_script, crazy_script,
        included_script, included_override_script,
@@ -250,6 +251,62 @@ normal_script(Config) when is_list(Config) ->
     ok.
 
 
+%% make_script: Test make_script with unicode .app file
+unicode_script(Config) when is_list(Config) ->
+    UnicodeStr = [945,946], % alhpa beta in greek letters
+
+    {LatestDir, LatestName} = create_script({unicode,UnicodeStr},Config),
+
+    DataDir = filename:absname(?copydir),
+    UnicodeApp = fname([DataDir, "d_unicode", "lib", "ua-1.0"]),
+    TarFile = fname(?privdir, "unicode_app.tgz"),
+    {ok, Tar} = erl_tar:open(TarFile, [write, compressed]),
+    ok = erl_tar:add(Tar, UnicodeApp, "ua-1.0", [compressed]),
+    ok = erl_tar:close(Tar),
+
+    UnicodeLibDir = fname([DataDir, "d_unicode", UnicodeStr]),
+    P1 = fname([UnicodeLibDir, "ua-1.0", "ebin"]),
+
+    %% Need to do this on a separate node to make sure it has unicode
+    %% filename mode (+fnu*)
+    {ok,HostStr} = inet:gethostname(),
+    Host = list_to_atom(HostStr),
+    {ok,Node} = ct_slave:start(Host,unicode_script_node,[{erl_flags,"+fnui"}]),
+
+    ok = rpc:call(Node,erl_tar,extract,
+		  [TarFile, [{cwd,UnicodeLibDir},compressed]]),
+
+    true = rpc:call(Node,code,add_patha,[P1]),
+
+    ok = rpc:call(Node,file,set_cwd,[LatestDir]),
+
+    ok = rpc:call(Node,systools,make_script,[filename:basename(LatestName),
+					     [local]]),
+
+    {ok, Script} = rpc:call(Node,file,consult,[LatestName++".script"]),
+
+    %% For debug purpose - print script to log
+    io:format("~tp~n",[Script]),
+
+    %% check that script contains unicode strings in
+    %% 1. release version (set in ?MODULE:do_create_script)
+    [{script,{"Test release",UnicodeStr},Instr}] = Script,
+
+    %% 2. application description (set in ua.app in data dir)
+    [AppInfo] = [X || {apply,{application,load,[{application,ua,X}]}} <- Instr],
+    {description,UnicodeStr} = lists:keyfind(description,1,AppInfo),
+
+    %% 3. path (directory name where unicode_app.tgz is extracted)
+    true = lists:member({path,[P1]},Instr),
+
+    ok.
+
+unicode_script(cleanup,Config) ->
+    _ = ct_slave:stop(unicode_script_node),
+    file:delete(fname(?privdir, "unicode_app.tgz")),
+    ok.
+
+
 %% make_script:
 %% Modules specified without version in .app file (db-3.1).
 %% Note that this is now the normal way - i.e. systools now ignores
@@ -2090,15 +2147,20 @@ create_script(current_all_future_erts,Config) ->
     do_create_script(current_all_future_erts,Config,"99.99",Apps);
 create_script(current_all_future_sasl,Config) ->
     Apps = [{kernel,current},{stdlib,current},{sasl,"9.9"},{db,"2.1"},{fe,"3.1"}],
-    do_create_script(current_all_future_sasl,Config,current,Apps).
+    do_create_script(current_all_future_sasl,Config,current,Apps);
+create_script({unicode,RelVsn},Config) ->
+    Apps = core_apps(current) ++ [{ua,"1.0"}],
+    do_create_script(unicode,RelVsn,Config,current,Apps).
 
 
 do_create_script(Id,Config,ErtsVsn,AppVsns) ->
+    do_create_script(Id,string:to_upper(atom_to_list(Id)),Config,ErtsVsn,AppVsns).
+do_create_script(Id,RelVsn,Config,ErtsVsn,AppVsns) ->
     PrivDir = ?privdir,
     Name = fname(PrivDir, Id),
     {ok,Fd} = file:open(Name++".rel",write),
     RelfileContent =
-	{release,{"Test release", string:to_upper(atom_to_list(Id))},
+	{release,{"Test release", RelVsn},
 	 {erts,erts_vsn(ErtsVsn)},
 	 app_vsns(AppVsns)},
     io:format(Fd,"~p.~n",[RelfileContent]),
diff --git a/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app b/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app
new file mode 100644
index 0000000000..3d38a3dde4
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/ebin/ua.app
@@ -0,0 +1,9 @@
+%% -*- coding: utf-8 -*-
+{application, ua,
+   [{description, "αβ"},
+    {vsn, "1.0"},
+    {modules, [ua1]},
+    {registered, []},
+    {applications, []},
+    {env, []},
+    {start, {ua1, start, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/src/ua1.erl b/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/src/ua1.erl
new file mode 100644
index 0000000000..e988e80f3d
--- /dev/null
+++ b/lib/sasl/test/systools_SUITE_data/d_unicode/lib/ua-1.0/src/ua1.erl
@@ -0,0 +1,2 @@
+-module(ua1).
+-vsn("1.0").