Changeset 93

Timestamp:

01/29/10 07:56:02 (2 years ago)

Author:

dom

Message:

Include directories can be given to compiler

Location:

trunk

Files:

• doc/TODO (modified) (1 diff)
• src/compiler.erl (modified) (5 diffs)
• src/compiler_test.erl (modified) (3 diffs)
• src/directory_tester.erl (modified) (2 diffs)
• src/modules.erl (modified) (2 diffs)

trunk/doc/TODO

@@ -13 +13 @@
 
 - detect -include dependencies and recompile all when .hrl changes
-- allow giving additional include directories (for 3rd party libraries)
 - run tests in parallel
 - run a single (specific) test

trunk/src/compiler.erl

@@ -5 +5 @@
 -module (compiler).
 -export ([init/2]).
+-export ([init/3]).
 
 init (Notify, Dir) ->
+    init (Notify, Dir, []).
+
+init (Notify, Dir, Options) ->
     Args = [Dir, notify_me ()],
     Watcher = spawn_link (directory_watcher, init_recursive, Args),
-    State = {dict: new (), [], []},
+    State = {dict: new (), [], [], Options},
     loop (Notify, Watcher, State).
 
@@ -16 +20 @@
         check ->
             Watcher ! check,
-            {Modules, Binaries, Removed} = State,
+            {Modules, Binaries, Removed, Options} = State,
             case receive_files (Watcher, Modules) of
                 Modules ->
                     loop (Notify, Watcher, State);
                 Changed ->
-                    New_state = {Changed, Binaries, Removed},
+                    New_state = {Changed, Binaries, Removed, Options},
                     compile (Notify, Watcher, New_state)
             end;
@@ -39 +43 @@
 
 compile (Notify, Watcher, State) ->
-    {Modules, _, _} = State,
+    {Modules, _, _, _} = State,
     Notify (totals (Modules)),
     Process = process_fun (Notify),
@@ -48 +52 @@
 process_fun (Notify) ->
     fun (File, Event, Acc) when Event == found; Event == changed ->
-            {Modules, Binaries, Removed} = Acc,
-            Result = modules: compile (File),
+            {Modules, Binaries, Removed, Options} = Acc,
+            Result = modules: compile (File, Options),
             notify_result (Result, Notify),
             New_modules = dict: store (File, Result, Modules),
             Notify (totals (New_modules)),
             New_binaries = binaries (Result, Binaries),
-            {New_modules, New_binaries, Removed};
+            {New_modules, New_binaries, Removed, Options};
         (File, Event, Acc) when Event == lost ->
-            {Modules, Binaries, Removed} = Acc,
+            {Modules, Binaries, Removed, Options} = Acc,
             New_modules = dict: erase (File, Modules),
             New_removed = [modules: module_name (File) | Removed],
-            {New_modules, Binaries, New_removed};
+            {New_modules, Binaries, New_removed, Options};
         (_, _, Acc) ->
             Acc
@@ -93 +97 @@
 
 notify_end (Notify, State) ->
-    {Modules, _, _} = State,
+    {Modules, _, _, _} = State,
     notify_end (Notify, totals (Modules), State).
 
-notify_end (Notify, {N, N, N}, {Modules, Binaries, Removed}) ->
+notify_end (Notify, {N, N, N}, {Modules, Binaries, Removed, Options}) ->
     Notify ({{binaries, Binaries}, {removed, Removed}}),
-    {Modules, [], []};
+    {Modules, [], [], Options};
 notify_end (_, _, State) ->
     State.

trunk/src/compiler_test.erl

@@ -13 +13 @@
 -export ([notifies_removed_files_even_if_never_compiled/0]).
 -export ([provides_all_binaries_not_just_latest_when_all_compiled/0]).
+-export ([can_be_given_include_directories/0]).
 -include_lib("stdlib/include/ms_transform.hrl").
 
@@ -63 +64 @@
     ok = fixtures: use_tree (Tree, F).
 
+can_be_given_include_directories () ->
+    Src = "-module(inc).\n-include(\"inc.hrl\").",
+    Inc = "-define(yo,\"YO\").",
+    Tree = [{directory, "include", [{file, "inc.hrl", Inc}]},
+            {directory, "src", [{file, "inc.erl", Src}]}],
+    ok = fixtures: use_tree (Tree, fun include_no_directory/2),
+    ok = fixtures: use_tree (Tree, fun include_with_directory/2).
+
 provides_binaries_when_all_compiled (Root, _) ->
     Compiler = spawn_link (compiler, init, [notify_me (), Root]),
@@ -136 +145 @@
     ok.
 
+include_no_directory (Root, _) ->
+    Src = filename: join (Root, "src"),
+    Compiler = spawn_link (compiler, init, [notify_me (), Src]),
+    Compiler ! check,
+    [{1, 0, 0}, {_, _}, {1, 1, 0}] = receive_all (),
+    Compiler ! {self (), stop},
+    ok.
+
+include_with_directory (Root, _) ->
+    Src = filename: join (Root, "src"),
+    Inc = filename: join (Root, "include"),
+    Compiler = spawn_link (compiler, init, [notify_me (), Src, [{i, Inc}]]),
+    Compiler ! check,
+    [{1, 0, 0}, {1, 1, 1}, {{binaries, _}, _}] = receive_all (),
+    Compiler ! {self (), stop},
+    ok.
+    
 check ([{Total, 0, 0} | _] = Xs, unknown) ->
     check (Xs, Total);

trunk/src/directory_tester.erl

@@ -4 +4 @@
 
 -module (directory_tester).
--export ([init/1, init/2]).
--export ([run_once/1, run_once/2]).
+-export ([init/1, init/3]).
+-export ([run_once/1, run_once/3]).
 
-run_once ([Directory, Node]) when is_list (Node) ->
-    run_once (Directory, list_to_atom (Node)).
+run_once ([Directory, Node | Include_directories]) when is_list (Node) ->
+    Options = [{i, I} || I <- Include_directories],
+    run_once (Directory, list_to_atom (Node), [{compiler, Options}]).
 
-run_once (Directory, Node) ->
-    run (start (Directory, Node)).
+run_once (Directory, Node, Options) ->
+    run (start (Directory, Node, Options)).
 
-init ([Directory, Node]) when is_list (Node) ->
-    init (Directory, list_to_atom (Node)).
+init ([Directory, Node | Include_directories]) when is_list (Node) ->
+    Options = [{i, I} || I <- Include_directories],
+    init (Directory, list_to_atom (Node), [{compiler, Options}]).
     
-init (Directory, Node) ->
-    loop (start (Directory, Node)).
+init (Directory, Node, Options) ->
+    loop (start (Directory, Node, Options)).
 
-start (Directory, Node) ->
-    Compiler = spawn_link (compiler, init, [notify_me (compiler), Directory]),
+start (Directory, Node, Options) ->
+    Compiler_options = options (compiler, Options),
+    Compiler_args = [notify_me (compiler), Directory, Compiler_options],
+    Compiler = spawn_link (compiler, init, Compiler_args),
     Tester = spawn_link (tester, init, [notify_me (tester), Node]),
     Compiler ! check,
@@ -76 +80 @@
     Tester ! {run, Binaries}.
 
+options (Key, List) ->
+    lists: concat (proplists: get_all_values (Key, List)).

trunk/src/modules.erl

@@ -7 +7 @@
 -export ([to_file_name/2]).
 -export ([forms_to_binary/1]).
--export ([compile/1]).
+-export ([compile/2, compile/1]).
 -export ([module_name/1]).
 -export ([locate/2]).
 
 to_binary (File_name) ->
-    {ok, _, Binary, _} = compile (fun compile: file/2, File_name),
+    {ok, _, Binary, _} = compile (fun compile: file/2, File_name, []),
     Binary.
 
@@ -20 +20 @@
     
 forms_to_binary (Forms) ->
-    {ok, _, Binary, _} = compile (fun compile: forms/2, Forms),
+    {ok, _, Binary, _} = compile (fun compile: forms/2, Forms, []),
     Binary.
 
-compile (Fun, Parameter) ->
-    Options = [binary, return, warn_unused_import, debug_info],
+compile (Fun, Parameter, User_options) ->
+    Options = [binary, return, warn_unused_import, debug_info | User_options],
     Fun (Parameter, Options).
 
+compile (File, Options) ->
+    compile (fun compile: file/2, File, Options).
+
 compile (File) ->
-    compile (fun compile: file/2, File).
+    compile (File, []).
 
 module_name (Filename) ->