Created escript for simplified usage from makefiles

3 files changed, 72 insertions, 87 deletions

diff --git a/lib/reltool/src/reltool.erl b/lib/reltool/src/reltool.erl
index e6a8bca069..ff200d0eb8 100644
--- a/lib/reltool/src/reltool.erl
+++ b/lib/reltool/src/reltool.erl
@@ -20,7 +20,6 @@
 
 %% Public
 -export([
-         main/1, % Escript
          start/0, start/1, start_link/1, debug/0, % GUI
          start_server/1, get_server/1, stop/1,
          get_config/1, get_config/3, get_rel/2, get_script/2,
@@ -32,39 +31,26 @@
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%% Main function for escript
--spec main([escript_arg()]) -> ok.
-main(_) ->
-    process_flag(trap_exit, true),
-    {ok, WinPid} = start_link([]),
-    receive
-        {'EXIT', WinPid, shutdown} ->
-            ok;
-        {'EXIT', WinPid, normal} ->
-            ok;
-        {'EXIT', WinPid, Reason} ->
-            io:format("EXIT: ~p\n", [Reason]),
-            erlang:halt(1)
-    end.
-
 %% Start main window process
--spec start() -> {ok, window_pid()}.
+-spec start() -> {ok, window_pid()} | {error, reason()}.
 start() ->
     start([]).
 
 %% Start main window process
--spec start(options()) -> {ok, window_pid() | {error, reason()}}.
+-spec start(options()) -> {ok, window_pid()} | {error, reason()}.
 start(Options)when is_list(Options)  ->
-    {ok, WinPid} = start_link(Options),
-    unlink(WinPid),
-    {ok, WinPid}.
+    case start_link(Options) of
+	{ok, WinPid} ->
+	    unlink(WinPid),
+	    {ok, WinPid};
+	Other->
+	    Other
+    end.
 
 %% Start main window process with wx debugging enabled
--spec debug() -> {ok, window_pid()}.
+-spec debug() ->  {ok, window_pid()} | {error, reason()}.
 debug() ->
-    {ok, WinPid} = start_link([{wx_debug, 2}]),
-    unlink(WinPid),
-    {ok, WinPid}.
+    start([{wx_debug, 2}]).
 
 %% Start main window process with options
 -spec start_link(options()) -> {ok, window_pid() | {error, reason()}}.
diff --git a/lib/reltool/src/reltool.hrl b/lib/reltool/src/reltool.hrl
index 8a6a2142fd..d0a4c77657 100644
--- a/lib/reltool/src/reltool.hrl
+++ b/lib/reltool/src/reltool.hrl
@@ -104,7 +104,7 @@
 -type rel_file()         :: term().
 -type script_file()      :: term().
 -type reason()           :: string().
--type escript_arg()      :: string().
+
 -type base_dir()         :: dir().
 -type base_file()        :: file().
 -type top_dir()          :: file().
@@ -112,10 +112,7 @@
 -type target_spec()      :: [target_spec()]
                          | {create_dir, base_dir(), [target_spec()]}
                          | {create_dir, base_dir(), top_dir(), [target_spec()]}
-                         | {archive,
-			    base_file(),
-			    [archive_opt()],
-			    [target_spec()]}
+                         | {archive, base_file(), [archive_opt()], [target_spec()]}
                          | {copy_file, base_file()}
                          | {copy_file, base_file(), top_file()}
                          | {write_file, base_file(), iolist()}
@@ -139,57 +136,58 @@
 
 -record(mod,
         {%% Static
-          name :: mod_name(),
-          app_name :: app_name(),
-          incl_cond :: incl_cond() | undefined,
-          debug_info :: debug_info() | undefined,
-          is_app_mod :: boolean(),
+          name        :: mod_name(),
+          app_name    :: app_name(),
+          incl_cond   :: incl_cond() | undefined,
+          debug_info  :: debug_info() | undefined,
+          is_app_mod  :: boolean(),
           is_ebin_mod :: boolean(),
-          uses_mods :: [mod_name()],
-          exists :: boolean(),
+          uses_mods   :: [mod_name()],
+          exists      :: boolean(),
+
           %% Dynamic
-          status :: status(),
-          used_by_mods :: [mod_name()],
+          status          :: status(),
+          used_by_mods    :: [mod_name()],
           is_pre_included :: boolean() | undefined,
-          is_included :: boolean() | undefined
+          is_included     :: boolean() | undefined
          }).
 
 -record(app_info,
         {
-          description = "",
-          id = "",
-          vsn = "",
-          modules = [],
-          maxP = infinity,
-          maxT = infinity,
-          registered = [],
-          incl_apps = [],
-          applications = [],
-          env = [],
-          mod = undefined,
-          start_phases = undefined
+          description  = ""        :: string(),
+          id           = ""        :: string(),
+          vsn          = ""        :: app_vsn(),
+          modules      = []        :: [mod_name()],
+          maxP         = infinity  :: integer() | infinity,
+          maxT         = infinity  :: integer() | infinity,
+          registered   = []        :: [atom()],
+          incl_apps    = []        :: [app_name()],
+          applications = []        :: [app_name()],
+          env          = []        :: [{atom(), term()}],
+          mod          = undefined :: {mod_name(), [term()]} | undefined,
+          start_phases = undefined :: [{atom(), term()}] | undefined
          }).
 
 -record(app,
         {%% Static info
-          name :: app_name(),
-          is_escript :: boolean(),
+          name             :: app_name(),
+          is_escript       :: boolean(),
           use_selected_vsn :: boolean() | undefined,
-          active_dir :: dir(),
-          sorted_dirs :: [dir()],
-          vsn :: app_vsn(),
-          label :: app_label(),
-          info ::  #app_info{} | undefined,
-          mods :: [#mod{}],
+          active_dir       :: dir(),
+          sorted_dirs      :: [dir()],
+          vsn              :: app_vsn(),
+          label            :: app_label(),
+          info             ::  #app_info{} | undefined,
+          mods             :: [#mod{}],
 
           %% Static source cond
-          mod_cond :: mod_cond() | undefined,
+          mod_cond  :: mod_cond() | undefined,
           incl_cond :: incl_cond() | undefined,
 
           %% Static target cond
-          debug_info :: debug_info() | undefined,
-          app_file :: app_file() | undefined,
-          app_type :: app_type(),
+          debug_info            :: debug_info() | undefined,
+          app_file              :: app_file() | undefined,
+          app_type              :: app_type(),
           incl_app_filters      :: incl_app_filters(),
           excl_app_filters      :: excl_app_filters(),
           incl_archive_filters  :: incl_archive_filters(),
@@ -197,19 +195,19 @@
           archive_opts          :: [archive_opt()],
 
           %% Dynamic
-          status :: status(),
-          uses_mods :: [mod_name()],
-          used_by_mods :: [mod_name()],
-          uses_apps :: [app_name()],
-          used_by_apps :: [app_name()],
+          status          :: status(),
+          uses_mods       :: [mod_name()],
+          used_by_mods    :: [mod_name()],
+          uses_apps       :: [app_name()],
+          used_by_apps    :: [app_name()],
           is_pre_included :: boolean(),
-          is_included :: boolean()
+          is_included     :: boolean()
          }).
 
 -record(rel_app,
         {
-          name :: app_name(),
-          app_type :: app_type(),
+          name      :: app_name(),
+          app_type  :: app_type(),
           incl_apps :: [incl_app()]
         }).
 
@@ -231,21 +229,21 @@
           apps      :: [#app{}],
 
           %% Target cond
-          boot_rel :: boot_rel(),
-          rels     :: [#rel{}],
-          emu_name :: emu_name(),
-          profile  :: profile(),
-          incl_sys_filters :: incl_sys_filters(),
-          excl_sys_filters :: excl_sys_filters(),
-          incl_app_filters :: incl_app_filters(),
-          excl_app_filters :: excl_app_filters(),
+          boot_rel 	       :: boot_rel(),
+          rels     	       :: [#rel{}],
+          emu_name 	       :: emu_name(),
+          profile  	       :: profile(),
+          incl_sys_filters     :: incl_sys_filters(),
+          excl_sys_filters     :: excl_sys_filters(),
+          incl_app_filters     :: incl_app_filters(),
+          excl_app_filters     :: excl_app_filters(),
           incl_archive_filters :: incl_archive_filters(),
           excl_archive_filters :: excl_archive_filters(),
-          archive_opts :: [archive_opt()],
-          relocatable :: boolean(),
-          app_type :: app_type(),
-          app_file :: app_file(),
-          debug_info :: debug_info()
+          archive_opts         :: [archive_opt()],
+          relocatable          :: boolean(),
+          app_type             :: app_type(),
+          app_file             :: app_file(),
+          debug_info           :: debug_info()
          }).
 
 -record(regexp, {source, compiled}).
diff --git a/lib/reltool/src/reltool_server.erl b/lib/reltool/src/reltool_server.erl
index a7064f7651..a9985677ba 100644
--- a/lib/reltool/src/reltool_server.erl
+++ b/lib/reltool/src/reltool_server.erl
@@ -1093,8 +1093,9 @@ read_config(OldSys, Filename, Status) when is_list(Filename) ->
         {error, Reason} ->
             Text = file:format_error(Reason),
             {OldSys,
-	     reltool_utils:return_first_error(Status, "File access: " ++
-					      Text)}
+	     reltool_utils:return_first_error(Status,
+					      "Illegal config file " ++
+					      Filename ++ ": " ++ Text)}
     end;
 read_config(OldSys, {sys, KeyVals}, Status) ->
     {NewSys, Status2} =