Merge branch 'rebarify-15688'

RJ · Nov 12, 2010 · b39bd09 · b39bd09
2 parents 80571b9 + cbc93be
commit b39bd09
Show file tree

Hide file tree

Showing 32 changed files with 225 additions and 630 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /ebin
 /doc
 /_test
+/.eunit
 /docs
diff --git a/Makefile b/Makefile
@@ -1,20 +1,29 @@
-all: ebin/
-	(cd src;$(MAKE) all)
+
+PREFIX:=../
+DEST:=$(PREFIX)$(PROJECT)
+
+REBAR=./rebar
+
+all:
+	@$(REBAR) get-deps compile
 
 edoc:
-	(cd src;$(MAKE) edoc)
+	@$(REBAR) doc
 
-test: ebin/
-	(cd src;$(MAKE) test)
+test:
+	@rm -rf .eunit
+	@mkdir -p .eunit
+	@$(REBAR) skip_deps=true eunit
 
 clean:
-	rm -rf ebin
+	@$(REBAR) clean
 
-clean_plt:
-	(cd src;$(MAKE) clean_plt)
+build_plt:
+	@$(REBAR) build_plt
 
 dialyzer:
-	(cd src;$(MAKE) dialyzer)
+	@$(REBAR) analyze
+
+app:
+	@$(REBAR) create template=mochiwebapp dest=$(DEST) appid=$(PROJECT)
 
-ebin/:
-	@mkdir -p ebin
diff --git a/README b/README
@@ -7,3 +7,9 @@ The master of MochiWeb is tested with R13B04 and later. A branch compatible
 with R12B is maintained separately at http://github.com/lemenkov/mochiweb
 The R12B branch of that repository is mirrored in the official repository
 occasionally for convenience.
+
+To create a new mochiweb using project:
+   make app PROJECT=project_name
+
+To create a new mochiweb using project in a specific directory:
+   make app PROJECT=project_name PREFIX=$HOME/projects/
diff --git a/priv/skel/Makefile b/priv/skel/Makefile
diff --git a/priv/skel/src/Makefile b/priv/skel/src/Makefile
diff --git a/priv/skel/src/skel.app b/priv/skel/src/skel.app
diff --git a/priv/skel/src/skel.erl b/priv/skel/src/skel.erl
diff --git a/priv/skel/src/skel.hrl b/priv/skel/src/skel.hrl
diff --git a/priv/skel/src/skel_app.erl b/priv/skel/src/skel_app.erl
diff --git a/priv/skel/src/skel_web.erl b/priv/skel/src/skel_web.erl
diff --git a/priv/skel/start-dev.sh b/priv/skel/start-dev.sh
diff --git a/priv/skel/start.sh b/priv/skel/start.sh
diff --git a/priv/skel/support/include.mk b/priv/skel/support/include.mk
diff --git a/priv/skel/support/run_tests.escript b/priv/skel/support/run_tests.escript
diff --git a/rebar b/rebar