erlangr r14 & rebar compatibility

oscarh · Aug 15, 2010 · 1cd58a6 · 1cd58a6
1 parent 3f7bc80
commit 1cd58a6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -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 $<

diff --git a/src/lhttpc.app.src b/src/lhttpc.app.src
@@ -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}},

diff --git a/test/lhttpc_manager_tests.erl b/test/lhttpc_manager_tests.erl
@@ -37,6 +37,7 @@
 
 start_app() ->
     ok = application:start(crypto),
+    application:start(public_key),
     ok = application:start(ssl),
     ok = application:start(lhttpc).
 

diff --git a/test/lhttpc_tests.erl b/test/lhttpc_tests.erl
@@ -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().