merged from basho

src/rebar_app_utils.erl

@@ -27,7 +27,11 @@
 -module(rebar_app_utils).
 
 -export([is_app_dir/0, is_app_dir/1,
-         load_app_file/1]).
+         app_name/1,
+         app_applications/1,
+         app_vsn/1]).
+
+-export([load_app_file/1]). % TEMPORARY
 
 -include("rebar.hrl").
 
@@ -47,14 +51,51 @@ is_app_dir(Dir) ->
             false
     end.
 
+app_name(AppFile) ->
+    case load_app_file(AppFile) of
+        {ok, AppName, _} ->
+            AppName;
+        {error, Reason} ->
+            ?ABORT("Failed to extract name from ~s: ~p\n",
+                   [AppFile, Reason])
+    end.
+
+app_applications(AppFile) ->
+    case load_app_file(AppFile) of
+        {ok, _, AppInfo} ->
+            proplists:get_value(applications, AppInfo);
+        {error, Reason} ->
+            ?ABORT("Failed to extract applications from ~s: ~p\n",
+                   [AppFile, Reason])
+    end.
+
+app_vsn(AppFile) ->
+    case load_app_file(AppFile) of
+        {ok, _, AppInfo} ->
+            proplists:get_value(vsn, AppInfo);
+        {error, Reason} ->
+            ?ABORT("Failed to extract vsn from ~s: ~p\n",
+                   [AppFile, Reason])
+    end.
+
+
+
+%% ===================================================================
+%% Internal functions
+%% ===================================================================
+
 load_app_file(Filename) ->
+    case erlang:get({app_file, Filename}) of
+        undefined ->
             case file:consult(Filename) of
                 {ok, [{application, AppName, AppData}]} ->
+                    erlang:put({app_file, Filename}, {AppName, AppData}),
                     {ok, AppName, AppData};
                 {error, Reason} ->
-            ?ERROR("Failed to load app file from ~s: ~p\n", [Filename, Reason]),
-            ?FAIL;
+                    {error, Reason};
                 Other ->
-            ?ERROR("Unexpected terms from app file ~s: ~p\n", [Filename, Other]),
-            ?FAIL
+                    {error, {unexpected_terms, Other}}
+            end;
+        {AppName, AppData} ->
+            {ok, AppName, AppData}
     end.

src/rebar_deps.erl

@@ -195,9 +195,9 @@ is_app_available(App, VsnRegex) ->
 is_app_available(App, VsnRegex, Path) ->
     case rebar_app_utils:is_app_dir(Path) of
         {true, AppFile} ->
-            case rebar_app_utils:load_app_file(AppFile) of
-                {ok, App, AppData} ->
-                    {vsn, Vsn} = lists:keyfind(vsn, 1, AppData),
+            case rebar_app_utils:app_name(AppFile) of
+                App ->
+                    Vsn = rebar_app_utils:app_vsn(AppFile),
                     ?INFO("Looking for ~s-~s ; found ~s-~s at ~s\n",
                           [App, VsnRegex, App, Vsn, Path]),
                     case re:run(Vsn, VsnRegex, [{capture, none}]) of
@@ -208,11 +208,9 @@ is_app_available(App, VsnRegex, Path) ->
                                   [AppFile, Vsn, VsnRegex]),
                             false
                     end;
-                {ok, OtherApp, _} ->
+                OtherApp ->
                     ?WARN("~s has application id ~p; expected ~p\n", [AppFile, OtherApp, App]),
-                    false;
-                {error, Reason} ->
-                    ?ABORT("Failed to parse ~s: ~p\n", [AppFile, Reason])
+                    false
             end;
         false ->
             ?WARN("Expected ~s to be an app dir (containing ebin/*.app), but no .app found.\n",

src/rebar_dialyzer.erl

@@ -85,8 +85,7 @@ analyze(Config, File) ->
 build_plt(Config, File) ->
     Plt = plt_path(Config, File),
 
-    {ok, _AppName, AppData} = rebar_app_utils:load_app_file(File),
-    Apps = proplists:get_value(applications, AppData),
+    Apps = rebar_app_utils:app_applications(File),
 
     Warnings = dialyzer:run([{analysis_type, plt_build},
                              {files_rec, app_dirs(Apps)},
@@ -140,7 +139,7 @@ output_warnings(Warnings) ->
 %% @spec plt_path(Config::#config{}, File::string()) -> string()
 -spec(plt_path(Config::#config{}, File::string()) -> string()).
 plt_path(Config, File) ->
-    {ok, AppName, _AppData} = rebar_app_utils:load_app_file(File),
+    AppName = rebar_app_utils:app_name(File),
     DialyzerOpts = rebar_config:get(Config, dialyzer_opts, []),
     case proplists:get_value(plt, DialyzerOpts) of
         undefined ->

src/rebar_escripter.erl

@@ -37,7 +37,7 @@
 escriptize(_Config, AppFile) ->
     %% Extract the application name from the archive -- this will be be what
     %% we call the output script
-    {ok, AppName, _AppData} = rebar_app_utils:load_app_file(AppFile),
+    AppName = rebar_app_utils:app_name(AppFile),
 
     %% Construct the archive of everything in ebin/ dir -- put it on the
     %% top-level of the zip file so that code loading works properly.

src/rebar_port_compiler.erl

@@ -310,7 +310,8 @@ os_env() ->
     [list_to_tuple(re:split(S, "=", [{return, list}, {parts, 2}])) || S <- os:getenv()].
 
 default_env() ->
-    [{"CC", "gcc"},
+    [
+     {"CC", "gcc"},
      {"CXX", "g++"},
      {"ERL_CFLAGS", lists:concat([" -I", code:lib_dir(erl_interface, include),
                                   " -I", filename:join(erts_dir(), include),
@@ -321,7 +322,17 @@ default_env() ->
      {"DRV_LDFLAGS", "-shared $ERL_LDFLAGS"},
      {"darwin", "DRV_LDFLAGS", "-bundle -flat_namespace -undefined suppress $ERL_LDFLAGS"},
      {"ERLANG_ARCH", integer_to_list(8 * erlang:system_info(wordsize))},
-     {"ERLANG_TARGET", rebar_utils:get_arch()}].
+     {"ERLANG_TARGET", rebar_utils:get_arch()},
+
+     {"solaris.*-64$", "CFLAGS", "-D_REENTRANT -m64"}, % Solaris specific flags
+     {"solaris.*-64$", "LDFLAGS", "-m64"},
+
+     {"darwin9.*-64$", "CFLAGS", "-m64"}, % OS X Leopard flags for 64-bit
+     {"darwin9.*-64$", "LDFLAGS", "-arch x86_64"},
+
+     {"darwin10.*-32", "CFLAGS", "-m32"}, % OS X Snow Leopard flags for 32-bit
+     {"darwin10.*-32", "LDFLAGS", "-arch i386"}
+    ].