Fixing up bits and pieces to allow releases to build.

Author: archaelus

Makefile

@@ -12,7 +12,7 @@ D_INC_DIRS=$(subst lib/, -I lib/,$(wildcard lib/*/include))
 D_EBIN_DIRS=$(subst lib/, -pa lib/,$(wildcard lib/*/ebin))
 
 INCLUDE ?=-I ${ERLANG_ROOT}/lib/stdlib-*/include ${D_INC_DIRS} -I ${EUNIT_ROOT}/include -I include/
-CODEPATH ?=-pz lib/*/ebin/ -pz ebin/
+CODEPATH ?=-pz lib/*/ebin/ -pz ebin/ -pz ${EUNIT_ROOT}/ebin/
 CODEPATH_JUNGERL ?=-pz ${JUNGERL_ROOT}/lib/*/ebin/
 
 ERLC_CODEPATH ?=${D_EBIN_DIRS} -pz ${EUNIT_ROOT}/ebin -pz ebin
@@ -23,7 +23,7 @@ EXTRA_DIALYZER_BEAM_FILES ?=$(wildcard lib/oserl*/ebin/*.beam lib/common_lib*/eb
 
 NODE ?=-name ${APP_NAME}@127.0.0.1
 
-all: ${BEAM_FILES} src/TAGS
+all: ebin ${BEAM_FILES} src/TAGS
 
 release: ${BEAM_FILES} test xref dialyzer.report docs releases/${VSN}/${APP_NAME}.tar.gz
 
@@ -40,14 +40,15 @@ clean:
 	@rm -f ebin/*.beam priv/sasl/* priv/sasl.log priv/yaws/logs/*.{log,old,access}
 	@find src/ priv/ -iname \*~ | xargs rm -v
 
+ebin:
+	[ ! -d ebin ] && mkdir ebin
+
 ebin/%.beam: src/%.erl ${HRL_FILES}
 	@echo $@: erlc ${ERLC_FLAGS} ${ERLC_CODEPATH} ${ERLC_CODEPATH_JUNGERL} ${INCLUDE} $<
 	@erlc ${ERLC_FLAGS} ${ERLC_CODEPATH} ${ERLC_CODEPATH_JUNGERL} ${INCLUDE} $<
 
 docs: ${ERL_FILES}
 	erl -noshell -run edoc_run application "'$(APP_NAME)'" '"."' '[{def,{vsn,"$(VSN)"}}]'
-	rm -rf priv/yaws/docroot/doc
-	cp -r doc priv/yaws/docroot/
 
 test: ${BEAM_FILES}
 	erl $(CODEPATH) $(CODEPATH_JUNGERL) -config priv/${APP_NAME} -eval "lists:map(fun(A) -> {A,application:start(A)} end, [${APP_DEPS}]), application:load(${APP_NAME}), lists:foreach(fun (M) -> io:fwrite(\"Testing ~p:~n\", [M]), eunit:test(M) end, [`perl -e 'print join(",", qw(${MODULES}));'`])." -s init stop -noshell

doc/.git.notempty

@@ -0,0 +1,7 @@
+{release, 
+ {"SKEL", "0.1"},
+ {erts, "5.6.3"},
+ [{skel,"0.1"},
+  {stdlib,"1.15.3"},
+  {kernel,"2.12.3"}
+ ]}.

lib/.git.notempty

@@ -5,7 +5,7 @@
 %% @doc application skeleton 
 %% @end
 %%%-------------------------------------------------------------------
--module(skell_app).
+-module(skel_app).
 
 -behaviour(application).
 
@@ -26,12 +26,7 @@
 %% top supervisor of the tree.
 %%--------------------------------------------------------------------
 start(_Type, StartArgs) ->
-    case skel_sup:start_link(StartArgs) of
-        {ok, Pid} -> 
-            {ok, Pid};
-        Error ->
-            Error
-    end.
+    skel_sup:start_link(StartArgs).
 
 %%--------------------------------------------------------------------
 %% Function: stop(State) -> void()

releases/0.1/skel.rel

@@ -31,7 +31,7 @@
 %% does not return until Module:init/1 has returned.  
 %%--------------------------------------------------------------------
 start_link() ->
-    gen_fsm:start_link({local, ?SERVER}, ?MODULE, [], []).
+    gen_fsm:start_link({local, ?MODULE}, ?MODULE, [], []).
 
 %%====================================================================
 %% gen_fsm callbacks

src/skel_app.erl

@@ -10,7 +10,7 @@
 -behaviour(supervisor).
 
 %% API
--export([start_link/0]).
+-export([start_link/1]).
 
 %% Supervisor callbacks
 -export([init/1]).
@@ -21,11 +21,11 @@
 %% API functions
 %%====================================================================
 %%--------------------------------------------------------------------
-%% @spec start_link() -> {ok,Pid} | ignore | {error,Error}
+%% @spec start_link(Args::any()) -> {ok,Pid} | ignore | {error,Error}
 %% @doc: Starts the supervisor
 %% @end
 %%--------------------------------------------------------------------
-start_link() ->
+start_link(_) ->
     supervisor:start_link({local, ?SERVER}, ?MODULE, []).
 
 %%====================================================================
@@ -44,7 +44,7 @@ start_link() ->
 %%--------------------------------------------------------------------
 init([]) ->
     AChild = {"Skeleton Server",
-              {skel_server,start_link,[]},
+              {skel_srv,start_link,[]},
               permanent,2000,worker,
               [skel_server]},
     {ok,{{one_for_all,0,1}, [AChild]}}.