From beb660aa59a8d9cd7f65b8b91dc5dd9bc74015e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 6 Dec 2012 12:24:15 +0100
Subject: edoc: Remove support for packages

---
 lib/edoc/src/edoc_lib.erl | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'lib/edoc/src/edoc_lib.erl')

diff --git a/lib/edoc/src/edoc_lib.erl b/lib/edoc/src/edoc_lib.erl
index 942715b8ee..3d193c4bfa 100644
--- a/lib/edoc/src/edoc_lib.erl
+++ b/lib/edoc/src/edoc_lib.erl
@@ -269,6 +269,10 @@ is_name_1(_) -> false.
 
 to_atom(A) when is_atom(A) -> A;
 to_atom(S) when is_list(S) -> list_to_atom(S).
+
+to_list(A) when is_atom(A) -> atom_to_list(A);
+to_list(S) when is_list(S) -> S.
+
     
 %% @private
 unique([X | Xs]) -> [X | unique(Xs, X)];
@@ -695,8 +699,7 @@ write_file(Text, Dir, Name, Package) ->
     write_file(Text, Dir, Name, Package, [{encoding,latin1}]).
 
 write_file(Text, Dir, Name, Package, Options) ->
-    Dir1 = filename:join([Dir | packages:split(Package)]),
-    File = filename:join(Dir1, Name),
+    File = filename:join([Dir, to_list(Package), Name]),
     ok = filelib:ensure_dir(File),
     case file:open(File, [write] ++ Options) of
 	{ok, FD} ->
@@ -836,7 +839,7 @@ find_sources(Path, Pkg, Rec, Ext, Opts) ->
     lists:flatten(find_sources_1(Path, to_atom(Pkg), Rec, Ext, Skip)).
 
 find_sources_1([P | Ps], Pkg, Rec, Ext, Skip) ->
-    Dir = filename:join(P, filename:join(packages:split(Pkg))),
+    Dir = filename:join(P, atom_to_list(Pkg)),
     Fs1 = find_sources_1(Ps, Pkg, Rec, Ext, Skip),
     case filelib:is_dir(Dir) of
 	true ->
@@ -862,9 +865,9 @@ find_sources_2(Dir, Pkg, Rec, Ext, Skip) ->
 	    []
     end.
 
-find_sources_3(Es, Dir, Pkg, Rec, Ext, Skip) ->
+find_sources_3(Es, Dir, '', Rec, Ext, Skip) ->
     [find_sources_2(filename:join(Dir, E),
-		    to_atom(packages:concat(Pkg, E)), Rec, Ext, Skip)
+		    to_atom(E), Rec, Ext, Skip)
      || E <- Es, is_package_dir(E, Dir)].
 
 is_source_file(Name, Ext) ->
@@ -876,16 +879,16 @@ is_package_dir(Name, Dir) ->
 	andalso filelib:is_dir(filename:join(Dir, Name)).
 
 %% @private
-find_file([P | Ps], Pkg, Name) ->
-    Dir = filename:join(P, filename:join(packages:split(Pkg))),
-    File = filename:join(Dir, Name),
+find_file([P | Ps], []=Pkg, Name) ->
+    Pkg = [],
+    File = filename:join(P, Name),
     case filelib:is_file(File) of
 	true ->
 	    File;    
 	false ->
 	    find_file(Ps, Pkg, Name)
     end;    
-find_file([], _Pkg, _Name) ->
+find_file([], [], _Name) ->
     "".
 
 %% @private
-- 
cgit v1.2.3