Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #8 from richcarl/klarna-fixes

some fixes from us at Klarna
  • Loading branch information...
commit 6cdd25cf2e67c209e2079171171044dd19ba02c9 2 parents 4bbeacf + 1c75452
@filippo authored
View
6 .gitignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+include.mk
+config*
View
11 Makefile
@@ -23,7 +23,7 @@ DOCDIR = doc
all: conf compile
-compile:
+compile: conf
mkdir -p ebin/
cd src && $(MAKE)
@@ -37,10 +37,11 @@ conf_clean:
test: conf compile
cd test/src&& $(MAKE)
-docs: $(SRC_FILES)
- erl -noshell -run edoc_run files \
- ["'src/sgte.erl', 'src/sgte_parse.erl', 'src/sgte_render.erl', 'src/sgte_gettext.erl', 'src/sgte_dict.erl'"] \
- '[{dir,"$(DOCDIR)"}]' -s init stop
+docs: $(DOCDIR)/index.html
+
+$(DOCDIR)/index.html: $(SRC_FILES)
+ erl -noshell -run edoc_run application "sgte" '"."' '[]'
+
tags: src/*.erl
cd src/ && $(TAG_CMD) $(TAG_FLAGS) $(TAG_FILES)
View
4 doc/.gitignore
@@ -0,0 +1,4 @@
+edoc-info
+erlang.png
+stylesheet.css
+*.html
View
1  ebin/.gitignore
@@ -0,0 +1 @@
+*.beam
View
2  src/sgte.erl
@@ -192,8 +192,6 @@ gettext_strings(FileName) ->
%%--------------------------------------------------------------------
%% @spec gettext_strings(T::template(), {encoding, Enc::encoding}) -> [gettext_tuple()]
%%
-%% @type gettext_tuple() = {Key, LineNo}
-%%
%% @doc Extracts from template T the list of gettext keys
%% with associated line numbers.
%% This is a utility function to use in cojunction with gettext
View
4 src/sgte_parse.erl
@@ -461,8 +461,6 @@ until(P, [H|T], Line, Parsed) ->
%%--------------------------------------------------------------------
%% @spec until_space(predicate()) -> parsed()|{error, Reason}
%%
-%% @type predicate() = funfunction(template()).
-%%
%% @doc until predicate P: output whatever it gets
%% until P(H) is true without stripping white spaces.
%% @end
@@ -489,8 +487,6 @@ until_space(P, [H|T], Line, Parsed) ->
%%--------------------------------------------------------------------
%% @spec until_greedy(predicate()) -> parsed()|{error, Reason}
%%
-%% @type predicate() = function(template()).
-%%
%% @doc until Greedy version:
%% output whatever it gets until a $ is reached
%% @end
Please sign in to comment.
Something went wrong with that request. Please try again.