Evan Miller 14 лет назад
Родитель
Сommit
45c9c57b39
8 измененных файлов с 20 добавлено и 42 удалено
  1. 0 3
      Emakefile
  2. 8 14
      Makefile
  3. 0 25
      ebin/erlydtl.app
  4. BIN
      rebar
  5. 1 0
      rebar.config
  6. 9 0
      src/erlydtl.app.src
  7. 1 0
      tests/input/ssi
  8. 1 0
      tests/input/ssi_include.html

+ 0 - 3
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"}]}.

+ 8 - 14
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/*

+ 0 - 25
ebin/erlydtl.app

@@ -1,25 +0,0 @@
-%% -*- mode: erlang -*-
-{application, erlydtl,
- [{description, "ErlyDTL implements most but not all of the Django Template Language"},
-  {vsn, "0.7.0"},
-  {modules, [
-             erlydtl,
-             erlydtl_compiler,
-             erlydtl_dateformat,
-             erlydtl_deps,
-             erlydtl_filters,
-             erlydtl_parser,
-             erlydtl_runtime,
-             erlydtl_scanner,
-             erlydtl_slice,
-             erlydtl_i18n,
-             i18n_manager,
-             po_generator,
-             po_scanner,
-             sources_parser,
-             gettext,
-             sources_parser_unittests
-            ]},
-  {applications, [kernel, stdlib]},
-  {registered, []}
- ]}.


+ 1 - 0
rebar.config

@@ -0,0 +1 @@
+{erl_opts, [debug_info]}.

+ 9 - 0
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, []}
+ ]}.

+ 1 - 0
tests/input/ssi

@@ -0,0 +1 @@
+{% ssi path %}

+ 1 - 0
tests/input/ssi_include.html

@@ -0,0 +1 @@
+{{ "Don't evaluate me!" }}