Use rebar for builds.

goj · Mar 20, 2011 · 45c9c57 · 45c9c57
1 parent fa28530
commit 45c9c57
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 42 deletions.
diff --git a/Emakefile b/Emakefile
@@ -1,4 +1 @@
-{"src/*", [debug_info, {outdir, "ebin"}]}.
-{"src/i18n/*", [debug_info, {outdir, "ebin"}]}.
-{"src/filter_lib/*", [debug_info, {outdir, "ebin"}]}.
 {"tests/src/*", [debug_info, {outdir, "ebintest"}]}.
diff --git a/Makefile b/Makefile
@@ -1,23 +1,17 @@
 ERL=erl
-ERLC=erlc
-
-PARSER=src/erlydtl_parser
+REBAR=./rebar
 
 
 all: compile
 
-compile: $(PARSER).erl
+compile: 
+	@$(REBAR) compile
+
+compile_test:
 	-mkdir -p ebintest
 	$(ERL) -make 
 
-$(PARSER).erl: $(PARSER).yrl
-	$(ERLC) -o src src/erlydtl_parser.yrl
-
-run: compile
-	$(ERL) -pa ebin
-
-
-test: compile
+test: compile compile_test
 	$(ERL) -noshell -pa ebin -pa ebintest \
 		-s erlydtl_functional_tests run_tests \
 		-s erlydtl_dateformat_tests run_tests \
@@ -26,7 +20,7 @@ test: compile
 		-s init stop
 
 clean:
-	rm -fv ebin/*.beam
+	@$(REBAR) clean
 	rm -fv ebintest/*
-	rm -fv erl_crash.dump $(PARSER).erl
+	rm -fv erl_crash.dump
 	rm -fv tests/output/*
diff --git a/ebin/erlydtl.app b/ebin/erlydtl.app
diff --git a/rebar b/rebar
diff --git a/rebar.config b/rebar.config
@@ -0,0 +1 @@
+{erl_opts, [debug_info]}.
diff --git a/src/erlydtl.app.src b/src/erlydtl.app.src
@@ -0,0 +1,9 @@
+%% -*- mode: erlang -*-
+{application, erlydtl,
+ [{description, "ErlyDTL compiles the Django Template Language to Erlang bytecode"},
+  {vsn, "0.7.0"},
+  {modules, [
+            ]},
+  {applications, [kernel, stdlib]},
+  {registered, []}
+ ]}.
diff --git a/tests/input/ssi b/tests/input/ssi
@@ -0,0 +1 @@
+{% ssi path %}
diff --git a/tests/input/ssi_include.html b/tests/input/ssi_include.html
@@ -0,0 +1 @@
+{{ "Don't evaluate me!" }}