Permalink
Browse files

update makefiles, convert to eunit, clean up ebin

  • Loading branch information...
1 parent 1e01c6b commit 8a85ea61eca9cf9e2d32e8bbb320da42a358e04d @etrepum etrepum committed Jun 18, 2010
View
@@ -0,0 +1,4 @@
+/ebin
+/doc
+/_test
+/priv
View
@@ -1,8 +1,20 @@
-all:
- (cd src;$(MAKE))
+all: ebin/
+ (cd src;$(MAKE) all)
-local:
- (cd src;$(MAKE) local)
+edoc:
+ (cd src;$(MAKE) edoc)
+
+test: ebin/
+ (cd src;$(MAKE) test)
clean:
(cd src;$(MAKE) clean)
+
+clean_plt:
+ (cd src;$(MAKE) clean_plt)
+
+dialyzer:
+ (cd src;$(MAKE) dialyzer)
+
+ebin/:
+ @mkdir -p ebin
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -1,11 +1,33 @@
include ../support/include.mk
-all: $(EBIN_FILES)
+APPLICATION=mochiweb
+DOC_OPTS={dir,\"../doc\"}
+TEST_PLT=$(TEST_DIR)/dialyzer_plt
-local: $(ERL_OBJECTS_LOCAL)
+all: $(EBIN_FILES)
debug:
$(MAKE) DEBUG=-DDEBUG
clean:
rm -rf $(EBIN_FILES)
+
+edoc:
+ $(ERL) -noshell -pa ../ebin \
+ -eval "edoc:application($(APPLICATION), \".\", [$(DOC_OPTS)])" \
+ -s init stop
+
+test: $(EBIN_FILES)
+ mkdir -p $(TEST_DIR);
+ @../support/run_tests.escript $(EBIN_DIR) | tee $(TEST_DIR)/test.log
+
+$(TEST_PLT):
+ mkdir -p $(TEST_DIR)
+ cp $(DIALYZER_PLT) $(TEST_PLT)
+ dialyzer --plt $(TEST_PLT) --add_to_plt
+
+clean_plt:
+ rm $(TEST_PLT)
+
+dialyzer: $(TEST_PLT)
+ dialyzer --src --plt $(TEST_PLT) -DNOTEST -DDIALYZER -c ../src | tee $(TEST_DIR)/dialyzer.log
View
@@ -1,8 +0,0 @@
-{application,egeoip,
- [{description,"geolocation by IP"},
- {vsn,"0.01"},
- {modules,[egeoip, egeoip_app, egeoip_sup]},
- {registered, []},
- {env, [{dbfile, city}]},
- {mod, {egeoip_app, []}},
- {applications,[kernel,stdlib]}]}.
@@ -1,7 +1,7 @@
{application,egeoip,
[{description,"geolocation by IP"},
- {vsn,"0.01"},
- {modules,[egeoip, egeoip_app, egeoip_sup]},
+ {vsn,"1.0"},
+ {modules,[]},
{registered, []},
{env, [{dbfile, city}]},
{mod, {egeoip_app, []}},
Oops, something went wrong.

0 comments on commit 8a85ea6

Please sign in to comment.