Permalink
Browse files

erlangr r14 & rebar compatibility

  • Loading branch information...
1 parent 3f7bc80 commit 1cd58a679bf8e0103a88869d92495d6c05807d7f benoitc committed Aug 15, 2010
Showing with 6 additions and 4 deletions.
  1. +2 −2 Makefile
  2. +2 −2 src/lhttpc.app.src
  3. +1 −0 test/lhttpc_manager_tests.erl
  4. +1 −0 test/lhttpc_tests.erl
View
@@ -33,9 +33,9 @@ test/%.beam: test/%.erl
@echo Compiling $<
@erlc +debug_info -o test/ $<
-$(APP_FILE): src/$(APPLICATION).app.src vsn.mk
+$(APP_FILE): src/$(APPLICATION).app.src
@echo Generating $@
- @sed -e 's/@MODULES@/$(MODULELIST)/' -e 's/@VSN@/$(VSN)/' $< > $@
+ @sed -e 's/{modules, \[\]}/{modules, \[$(MODULELIST)\]}/' $< > $@
ebin/%.beam: src/%.erl $(HEADERS) $(filter-out $(wildcard ebin), ebin)
@echo Compiling $<
View
@@ -29,8 +29,8 @@
%%% @end
{application, lhttpc,
[{description, "Lightweight HTTP Client"},
- {vsn, "@VSN@"},
- {modules, [@MODULES@]},
+ {vsn, "1.2.5"},
+ {modules, []},
{registered, [lhttpc_manager]},
{applications, [kernel, stdlib, ssl, crypto]},
{mod, {lhttpc, nil}},
@@ -37,6 +37,7 @@
start_app() ->
ok = application:start(crypto),
+ application:start(public_key),
ok = application:start(ssl),
ok = application:start(lhttpc).
View
@@ -100,6 +100,7 @@ test_no(N, Tests) ->
start_app() ->
ok = application:start(crypto),
+ application:start(public_key),
ok = application:start(ssl),
ok = lhttpc:start().

0 comments on commit 1cd58a6

Please sign in to comment.