Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed compilation fail due to inets path mismatch on R14

  • Loading branch information...
commit 29b2bfbae2c206e015cd7540afb41c386af42fe8 1 parent 6786b23
Piotr Dorobisz authored
View
0  .gitignore 100644 → 100755
File mode changed
View
0  .hgignore 100644 → 100755
File mode changed
View
0  .hgtags 100644 → 100755
File mode changed
View
9 bin/compile.erl
@@ -47,14 +47,21 @@ make_basic() ->
[code:add_path("lib/" ++ D ++ "/ebin") || D <- Dir],
compile_e_annotation(),
+ Options = get_compiler_options(),
- case make:all() of
+ case make:all(Options) of
up_to_date ->
io:format("Compilation completed!~n");
error ->
io:format("There were errors during the compilation!~n")
end.
+get_compiler_options() ->
+ case erlang:system_info(otp_release) > "R14" of
+ true -> [{d, r14}];
+ false -> []
+ end.
+
compile_e_annotation() ->
application:load(eptic),
LibDir = code:lib_dir(eptic),
View
5 lib/eptic-1.4.1/src/e_mod_inets.erl
@@ -26,8 +26,11 @@
-export([cookie_up/1, cookie_bind/1, cleanup/0]).
-export([parse_post/1, parse_get/1, fetch_boundary/1, format_response/1]).
-
+-ifdef(r14).
+-include_lib("inets/src/http_server/httpd.hrl").
+-else.
-include_lib("inets/src/httpd.hrl").
+-endif.
-include_lib("eptic/include/eptic.hrl").
%%====================================================================
View
5 lib/eptic_fe-1.0/src/e_fe_mod_inets.erl
@@ -21,7 +21,12 @@
-export([do/1]).
+-ifdef(r14).
+-include_lib("inets/src/http_server/httpd.hrl").
+-else.
-include_lib("inets/src/httpd.hrl").
+-endif.
+-include_lib("eptic/include/eptic.hrl").
do(#mod{parsed_header = Headers} = A) ->
e_logger:register_pid(self()),
View
4 lib/ewgi-0.2/src/ewgi_inets.erl
@@ -26,7 +26,11 @@
-export([do/1]).
+-ifdef(r14).
+-include_lib("inets/src/http_server/httpd.hrl").
+-else.
-include_lib("inets/src/httpd.hrl").
+-endif.
-include_lib("ewgi.hrl").
do(A) ->
Please sign in to comment.
Something went wrong with that request. Please try again.