./web_app issue

doc/index.tex

@@ -95,7 +95,7 @@ just having a single copy of mad.
 \end{lstlisting}
 \vspace{1\baselineskip}
 
-After that you can just run ./web_app under Windows, Linux and
+After that you can just run escript web_app under Windows, Linux and
 Mac and open \footahref{http://localhost:8000}{http://localhost:8000}.
 
 \vspace{1\baselineskip}

src/mad.erl

@@ -63,6 +63,14 @@ lib(Cwd,ConfigFileName,Config,Params) ->
     io:format("Create Lib Params: ~p~n",[Params]),
     mad_create:lib(Params).
 
+start(Cwd,ConfigFileName,Config,Params) ->
+    io:format("Start Params: ~p~n",[Params]),
+    mad_run:start(Params).
+
+attach(Cwd,ConfigFileName,Config,Params) ->
+    io:format("Attach Params: ~p~n",[Params]),
+    mad_run:attach(Params).
+
 help(Reason, Data) -> help(io_lib:format("~s ~p", [Reason, Data])).
 help(Msg) -> io:format("Error: ~s~n~n", [Msg]), help().
 help() ->

src/mad_attach.erl

@@ -1,4 +0,0 @@
--module(mad_attach).
--compile(export_all).
-
-%	to_erl $(RUN_DIR)/

src/mad_plan.erl

@@ -6,7 +6,6 @@ main(AppList) ->
     Relconfig = {sys, [{lib_dirs,["apps","deps"]},
                        {rel,"node","1",AppList}, {boot_rel,"node"} ]},
     {ok, Server} = reltool:start_server([{config, Relconfig}]),
-    io:format("Reltool Server: ~p~n\r",[Server]),
     {ok, {release, _Node, _Erts, Apps}} = reltool_server:get_rel(Server, "node"),
     Ordered = [element(1, A) || A <- Apps] -- mad_repl:disabled(),
     io:format("Ordered: ~p~n\r",[Ordered]),

src/mad_run.erl

@@ -0,0 +1,15 @@
+-module(mad_run).
+-compile(export_all).
+
+start(Params) ->
+    {Res,Status,X} = sh:run("run_erl",["-daemon",".devbox/",".devbox/logs/","exec mad rep"],
+      binary,".",
+        [{"RUN_ERL_LOG_GENERATIONS","1000"},
+         {"RUN_ERL_LOG_MAXSIZE","20000000"},
+         {"ERL_LIBS","apps:deps"}]),
+    case Status == 0 of
+         true -> skip;
+         false -> io:format("Shell Error: ~s~n\r",[binary_to_list(X)]) end.
+
+attach(Params) ->
+    os:cmd("sh -c \"exec to_erl .devbox/\"").

src/mad_start.erl

@@ -1,8 +0,0 @@
--module(mad_start).
--compile(export_all).
-
-main(Params) ->
-    sh:run("run_erl",9).
-
-%	RUN_ERL_LOG_GENERATIONS=1000 RUN_ERL_LOG_MAXSIZE=20000000 \
-%	ERL_LIBS=$(ERL_LIBS) run_erl -daemon $(RUN_DIR)/ $(LOG_DIR)/ "exec $(MAKE) console"

src/mad_utils.erl

@@ -72,6 +72,8 @@ atomize("dep"++_) -> deps;
 atomize("pla"++_) -> plan;
 atomize("app"++_) -> app;
 atomize("lib"++_) -> lib;
+atomize("sta"++_) -> start;
+atomize("att"++_) -> attach;
 atomize(Else) -> Else.
 
 atomize_params_commands(Params) -> atomize_params_commands(Params,[]).