Created escript for simplified usage from makefiles

5 files changed, 333 insertions, 89 deletions

diff --git a/lib/reltool/bin/reltool.escript b/lib/reltool/bin/reltool.escript
new file mode 100644
index 0000000000..567cafbcad
--- /dev/null
+++ b/lib/reltool/bin/reltool.escript
@@ -0,0 +1,245 @@
+#!/usr/bin/env escript
+%% -*- erlang -*-
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009. 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
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+
+-include_lib("reltool/src/reltool.hrl").
+
+main(Args) ->
+    process_flag(trap_exit, true),
+    try
+	Tokens = scan_args(Args, [], []),
+	{Options, Actions} = parse_args(Tokens, []),
+	case invoke(Options, Actions) of
+	    ok ->
+		erlang:halt(0);
+	    {error, ReasonString} ->
+		fatal_error(ReasonString, 2)
+	end
+    catch
+	throw:usage ->
+	    usage(),
+	    erlang:halt(1);
+	exit:Reason ->
+	    String = lists:flatten(io_lib:format("EXIT: ~p", [Reason])),
+	    fatal_error(String, 3)
+    end.
+
+usage() ->
+    Usage =
+	[
+	 "[Config] [--window]",
+	 "[Config] --create_config [-defaults] [-derived] [ConfigFile]",
+	 "[Config] --create_rel RelName [RelFile]",
+	 "[Config] --create_script RelName [ScriptFile]",
+	 "[Config] --create_target TargetDir",
+	 "[Config] --create_target_spec [SpecFile]",
+	 "[Config] --eval_target_spec Spec TargetDir RootDir"
+	],
+    Script = script_name(),
+    String = lists:flatten([[Script, " ", U, "\n"] || U <- Usage]),
+    io:format("Erlang/OTP release management tool\n\n"
+	      "~s\nConfig = ConfigFile | '{sys, [sys()]}'\n"
+	      "Spec   = SpecFile   | '{spec, [target_spec()}']\n\n"
+	      "See User's guide and Reference manual for more info.\n",
+	      [String]).
+
+invoke(Options, Actions) ->
+    case Actions of
+	[] ->
+	    invoke(Options, [["--window"]]);
+	[["--window"]] ->
+	    start_window(Options);
+	[["--create_config" | OptArgs]] ->
+	    DefArg = "-defaults",
+	    DerivArg = "-derived",
+	    InclDef = lists:member(DefArg, OptArgs),
+	    InclDeriv = lists:member(DerivArg, OptArgs),
+	    case reltool:get_config(Options, InclDef, InclDeriv) of
+		{ok, Config} ->
+		    String = pretty("config", Config),
+		    case OptArgs -- [DefArg, DerivArg] of
+			[] ->
+			    format("~s", [String]);
+			[ConfigFile] ->
+			    write_file(ConfigFile, String);
+			_ ->
+			    throw(usage)
+		    end;
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	[["--create_rel", RelName | OptArgs]] ->
+	    case reltool:get_rel(Options, RelName) of
+		{ok, Rel} ->
+		    String = pretty("rel", Rel),
+		    case OptArgs of
+			[] ->
+			    format("~s", [String]);
+			[RelFile] ->
+			    write_file(RelFile, String);
+			_ ->
+			    throw(usage)
+		    end;
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	[["--create_script", RelName | OptArgs]] ->
+	    case reltool:get_script(Options, RelName) of
+		{ok, Script} ->
+		    String = pretty("script", Script),
+		    case OptArgs of
+			[] ->
+			    format("~s", [String]);
+			[ScriptFile] ->
+			    write_file(ScriptFile, String);
+			_ ->
+			    throw(usage)
+		    end;
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	[["--create_target", TargetDir]] ->
+	    reltool:create_target(Options, TargetDir);
+	[["--create_target_spec" | OptArgs]] ->
+	    case reltool:get_target_spec(Options) of
+		{ok, Script} ->
+		    String = pretty("target_spec", Script),
+		    case OptArgs of
+			[] ->
+			    format("~s", [String]);
+			[SpecFile] ->
+			    write_file(SpecFile, String);
+			_ ->
+			    throw(usage)
+		    end;
+		{error, Reason} ->
+		    {error, Reason}
+	    end;
+	[["--eval_target_spec", TargetSpec, TargetDir, RootDir]] ->
+	    try
+		{ok, Tokens, _} = erl_scan:string(TargetSpec ++ ". "),
+		{ok, {spec, Spec}} = erl_parse:parse_term(Tokens),
+		reltool:eval_target_spec(Spec, TargetDir, RootDir)
+	    catch
+		error:{badmatch, _} ->
+		    case file:consult(TargetSpec) of
+			{ok, Spec2} ->
+			    reltool:eval_target_spec(Spec2, TargetDir, RootDir);
+			{error, Reason} ->
+			    Text = file:format_error(Reason),
+			    {error, TargetSpec ++ ": " ++ Text}
+		    end
+	    end;
+	_ ->
+	    throw(usage)
+    end.
+
+start_window(Options) ->
+    case reltool:start_link(Options) of
+	{ok, WinPid} ->
+	    receive
+		{'EXIT', WinPid, shutdown} ->
+		    ok;
+		{'EXIT', WinPid, normal} ->
+		    ok;
+		{'EXIT', WinPid, Reason} ->
+		    exit(Reason)
+	    end;
+	{error, Reason} ->
+	    {error, Reason}
+    end.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Helpers
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+script_name() ->
+    filename:basename(escript:script_name(), ".escript").
+
+fatal_error(String, Code) ->
+    io:format(standard_error, "~s: ~s\n", [script_name(), String]),
+    erlang:halt(Code).
+
+write_file(File, IoList) ->
+    case file:write_file(File, IoList) of
+	ok ->
+	    ok;
+	{error, Reason} ->
+	    {error, file:format_error(Reason)}
+    end.
+
+format(Format, Args) ->
+    io:format(Format, Args),
+    %% Wait a while for the I/O to be processed
+    timer:sleep(timer:seconds(1)).
+
+pretty(Tag, Term) ->
+    lists:flatten(io_lib:format("%% ~s generated at ~w ~w\n~p.\n\n",
+				[Tag, date(), time(), Term])).
+
+scan_args([H | T], Single, Multi) ->
+    case H of
+	"--" ++ _ when Single =:= [] ->
+	    scan_args(T, [H], Multi);
+	"--" ++ _ ->
+	    scan_args(T, [H], [lists:reverse(Single) | Multi]);
+	_ ->
+	    scan_args(T, [H | Single], Multi)
+    end;
+scan_args([], [], Multi) ->
+    lists:reverse(Multi);
+scan_args([], Single, Multi) ->
+    lists:reverse([lists:reverse(Single) | Multi]).
+
+parse_args([H | T] = Args, Options) ->
+    case H of
+	["--wx_debug" | Levels] ->
+	    Dbg =
+		fun(L) ->
+			case catch list_to_integer(L) of
+			    {'EXIT', _} ->
+				case catch list_to_atom(L) of
+				    {'EXIT', _} ->
+					exit("Illegal wx debug level: " ++ L);
+				    Atom ->
+						Atom
+				end;
+			    Int ->
+				Int
+			end
+		end,
+	    Levels2 = lists:map(Dbg, Levels),
+	    parse_args(T, [{wx_debug, Levels2} | Options]);
+	["--" ++ _ | _] ->
+	    %% No more options
+	    {lists:reverse(Options), Args};
+	[Config] ->
+	    try
+		{ok, Tokens, _} = erl_scan:string(Config ++ ". "),
+		{ok, {sys, _} = Sys} = erl_parse:parse_term(Tokens),
+		parse_args(T, [{config, Sys} | Options])
+	    catch
+		error:{badmatch, _} ->
+		    parse_args(T, [{config, Config} | Options]);
+		X:Y ->
+		    io:format("\n\n~p\n\n", [{X, Y}])
+	    end
+    end;
+parse_args([], Options) ->
+    {lists:reverse(Options), []}.
diff --git a/lib/reltool/doc/src/reltool.xml b/lib/reltool/doc/src/reltool.xml
index 9786928ae8..15beec52d6 100644
--- a/lib/reltool/doc/src/reltool.xml
+++ b/lib/reltool/doc/src/reltool.xml
@@ -477,7 +477,9 @@ mod_name()          = atom()
 profile()           = development | embedded | standalone
 re_regexp()         = string()
 reason()            = string()
-regexps()           = [re_regexp()] | {add, [re_regexp()]} | {del, [re_regexp()]}
+regexps()           = [re_regexp()]
+                    | {add, [re_regexp()]}
+		    | {del, [re_regexp()]}
 rel_file()          = term()
 rel_name()          = string()
 rel_vsn()           = string()
@@ -487,7 +489,19 @@ script_file()       = term()
 server()            = server_pid() | options()
 server_pid()        = pid()
 target_dir()        = file()
-window_pid()        = pid()]]></code>
+window_pid()        = pid()
+base_dir()          = dir()
+base_file()         = file()
+top_dir()           = file()
+top_file()          = file()
+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()]}
+                    | {copy_file, base_file()}
+                    | {copy_file, base_file(), top_file()}
+                    | {write_file, base_file(), iolist()}
+                    | {strip_beam_file, base_file()}]]></code>
 
     <marker id="start"></marker>
   </section>
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} =