Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

fixed compilation fail due to inets path mismatch on R14

  • Loading branch information...
commit 29b2bfbae2c206e015cd7540afb41c386af42fe8 1 parent 6786b23
Piotr Dorobisz authored
0  .gitignore 100644 → 100755
File mode changed
0  .hgignore 100644 → 100755
File mode changed
0  .hgtags 100644 → 100755
File mode changed
9 bin/compile.erl
@@ -47,14 +47,21 @@ make_basic() ->
47 47 [code:add_path("lib/" ++ D ++ "/ebin") || D <- Dir],
48 48
49 49 compile_e_annotation(),
  50 + Options = get_compiler_options(),
50 51
51   - case make:all() of
  52 + case make:all(Options) of
52 53 up_to_date ->
53 54 io:format("Compilation completed!~n");
54 55 error ->
55 56 io:format("There were errors during the compilation!~n")
56 57 end.
57 58
  59 +get_compiler_options() ->
  60 + case erlang:system_info(otp_release) > "R14" of
  61 + true -> [{d, r14}];
  62 + false -> []
  63 + end.
  64 +
58 65 compile_e_annotation() ->
59 66 application:load(eptic),
60 67 LibDir = code:lib_dir(eptic),
5 lib/eptic-1.4.1/src/e_mod_inets.erl
@@ -26,8 +26,11 @@
26 26
27 27 -export([cookie_up/1, cookie_bind/1, cleanup/0]).
28 28 -export([parse_post/1, parse_get/1, fetch_boundary/1, format_response/1]).
29   -
  29 +-ifdef(r14).
  30 +-include_lib("inets/src/http_server/httpd.hrl").
  31 +-else.
30 32 -include_lib("inets/src/httpd.hrl").
  33 +-endif.
31 34 -include_lib("eptic/include/eptic.hrl").
32 35
33 36 %%====================================================================
5 lib/eptic_fe-1.0/src/e_fe_mod_inets.erl
@@ -21,7 +21,12 @@
21 21
22 22 -export([do/1]).
23 23
  24 +-ifdef(r14).
  25 +-include_lib("inets/src/http_server/httpd.hrl").
  26 +-else.
24 27 -include_lib("inets/src/httpd.hrl").
  28 +-endif.
  29 +-include_lib("eptic/include/eptic.hrl").
25 30
26 31 do(#mod{parsed_header = Headers} = A) ->
27 32 e_logger:register_pid(self()),
4 lib/ewgi-0.2/src/ewgi_inets.erl
@@ -26,7 +26,11 @@
26 26
27 27 -export([do/1]).
28 28
  29 +-ifdef(r14).
  30 +-include_lib("inets/src/http_server/httpd.hrl").
  31 +-else.
29 32 -include_lib("inets/src/httpd.hrl").
  33 +-endif.
30 34 -include_lib("ewgi.hrl").
31 35
32 36 do(A) ->

0 comments on commit 29b2bfb

Please sign in to comment.
Something went wrong with that request. Please try again.