ems:rebuild back working in console

Emakefile

@@ -0,0 +1,12 @@
+{"apps/amf/src/*", [debug_info, {outdir, "apps/amf/ebin"}, {i, "apps/amf/src"}]}.
+{"apps/erlmedia/src/gen_format.erl", [debug_info, {outdir, "apps/erlmedia/ebin"}, {i, "apps/erlmedia/src"}]}.
+{"apps/erlmedia/src/*", [debug_info, {outdir, "apps/erlmedia/ebin"}, {i, "apps/erlmedia/src"}]}.
+{"apps/erlyvideo/src/*", [debug_info, {outdir, "apps/erlyvideo/ebin"}, {i, "apps/erlyvideo/include"}, {i, ".."}]}.
+{"apps/erlyvideo/src/*/*", [debug_info, {outdir, "apps/erlyvideo/ebin"}, {i, "apps/erlyvideo/include"}, {i, ".."}]}.
+{"apps/ibrowse/src/*", [debug_info, {outdir, "apps/ibrowse/ebin"}, {i, "apps/ibrowse/src"}, {i, "deps"}]}.
+{"apps/log4erl/src/*", [debug_info, {outdir, "apps/log4erl/ebin"}, {i, "apps/log4erl/include"}]}.
+{"apps/mpegts/src/*", [debug_info, {outdir, "apps/mpegts/ebin"}, {i, "apps/mpegts/src"}, {i, "deps"},native,{hipe,o3}]}.
+{"apps/rtmp/src/*", [debug_info, {outdir, "apps/rtmp/ebin"}, {i, "apps/rtmp/src"},{i,"deps"}]}.
+{"apps/rtp/src/*", [debug_info, {outdir, "apps/rtp/ebin"}, {i, "apps/rtp/src"}, {i, "apps/rtp/include"}, {i, "deps"}]}.
+{"apps/rtsp/src/*", [debug_info, {outdir, "apps/rtsp/ebin"}, {i, "apps/rtsp/src"}, {i, "deps"}]}.
+% , bin_opt_info, 

Makefile

@@ -31,7 +31,7 @@ update:
 compile:
 	./rebar compile
 
-release:
+release: compile
 	./rebar generate force=1
 	chmod +x erlyvideo/bin/erlyvideo
 
@@ -41,6 +41,10 @@ ebin/mmap.so: src/core/mmap.c
 archive:
 	git archive --prefix=erlyvideo-$(VERSION)/ v$(VERSION) | gzip -9 > ../erlyvideo-$(VERSION).tar.gz
 
+tgz: release
+	tar zcvf erlyvideo-$(VERSION).tar.gz erlyvideo
+
+
 clean:
 	./rebar clean
 	rm -fv plugins/*/ebin/*.beam
@@ -52,39 +56,15 @@ clean-doc:
 	rm -fv doc/*.css
 
 
-run: priv/erlyvideo.conf priv/log4erl.conf
-	contrib/erlyctl run
+run: priv/erlyvideo.conf priv/log4erl.conf compile
+	ERL_LIBS=apps:.. erl -boot start_sasl -s erlyvideo
 
 priv/log4erl.conf: priv/log4erl.conf.sample
 	[ -f priv/log4erl.conf ] || cp priv/log4erl.conf.sample priv/log4erl.conf
 
 priv/erlyvideo.conf: priv/erlyvideo.conf.sample
 	[ -f priv/erlyvideo.conf ] || cp priv/erlyvideo.conf.sample priv/erlyvideo.conf
 
-start: priv/erlyvideo.conf
-	contrib/erlyctl start
-
-install: compile
-	mkdir -p $(DESTROOT)/var/lib/erlyvideo/movies
-	mkdir -p $(DESTROOT)/var/lib/erlyvideo/plugins
-	mkdir -p $(DESTROOT)$(ERLDIR)
-	cp -r ebin src include Emakefile $(DESTROOT)$(ERLDIR)/
-	mkdir -p $(DESTROOT)/usr/bin/
-	cp contrib/reverse_mpegts $(DESTROOT)/usr/bin/reverse_mpegts
-	cp contrib/erlyctl.debian $(DESTROOT)/usr/bin/erlyctl
-	mkdir -p $(DESTROOT)/etc/init.d/
-	ln -s /usr/bin/erlyctl $(DESTROOT)/etc/init.d/erlyvideo
-	cp -r wwwroot $(DESTROOT)/var/lib/erlyvideo/
-	mkdir -p $(DESTROOT)/var/log/erlyvideo
-	mkdir -p $(DESTROOT)/etc/erlyvideo
-	cp priv/erlyvideo.conf.debian $(DESTROOT)/etc/erlyvideo/erlyvideo.conf
-	cp priv/log4erl.conf.debian $(DESTROOT)/etc/erlyvideo/log4erl.conf
-	cp priv/production.config.debian $(DESTROOT)/etc/erlyvideo/production.config
-	mkdir -p $(DESTROOT)/var/cache/erlyvideo/licensed
-	chown erlyvideo.erlyvideo $(DESTROOT)/var/lib/erlyvideo/movies
-	chown erlyvideo.erlyvideo $(DESTROOT)/var/cache/erlyvideo/licensed
-	for i in deps/amf deps/log4erl deps/erlmedia deps/mpegts deps/rtmp deps/rtp deps/rtsp deps/ibrowse ; do (cd $$i; make DESTROOT=$(DESTROOT) ERLANG_ROOT=$(ERLANG_ROOT) VERSION=$(VERSION) install) ; done
-
 
 .PHONY: doc debian compile
 

apps/erlyvideo/src/erlyvideo.erl

@@ -124,6 +124,9 @@ vhosts() ->
 %%--------------------------------------------------------------------
 
 start() ->
+  application:load(erlyvideo),
+  {ok, Apps} = application:get_key(erlyvideo, applications),
+  [application:start(App) || App <- Apps],
 	application:start(erlyvideo).
 
 start_http() ->

reltool.config

@@ -30,5 +30,9 @@
            {copy, "files/vm.args", "etc/vm.args"},
            {copy, "wwwroot"},
            {copy, "priv/erlyvideo.conf.sample", "etc/erlyvideo.conf.sample"},
-           {copy, "priv/log4erl.conf.sample", "etc/log4erl.conf.sample"}
+           {copy, "priv/log4erl.conf.sample", "etc/log4erl.conf.sample"},
+           {copy, "contrib/reverse_mpegts", "bin/reverse_mpegts"},
+           {copy, "contrib/rtmp_bench", "bin/rtmp_bench"},
+           {copy, "contrib/rtmp_proxy", "bin/rtmp_proxy"},
+           {copy, "contrib/rtsp_test_client", "bin/rtsp_test_client"}
            ]}.