Merge pull request #292 from rabbitmq/escript_archive-allow-multiple-ebin-dirs

escript_archive allow multiple ebin dirs

Author: HoloRin

private/escript_archive.bzl

@@ -31,29 +31,22 @@ def _impl(ctx):
 
     entries = {}
     for f in ctx.files.srcs + ctx.files.hdrs + ctx.files.beam:
+        if f.basename in entries:
+            fail("Duplicate entry for %s: '%s'" % (f, f.basename))
         entries[f.basename] = f
     for dep in flat_deps([ctx.attr.app]):
         lib_info = dep[ErlangAppInfo]
         for src in lib_info.beam:
             if src.is_directory:
-                if ctx.attr.flat:
-                    archive_path = ""
-                else:
-                    archive_path = path_join(lib_info.app_name, "ebin")
+                archive_path = path_join(lib_info.app_name, "ebin")
             else:
-                if ctx.attr.flat:
-                    archive_path = src.basename
-                else:
-                    archive_path = path_join(lib_info.app_name, "ebin", src.basename)
-                if archive_path in entries:
-                    fail("Duplicate entry for %s: '%s'" % (src, archive_path))
+                archive_path = path_join(lib_info.app_name, "ebin", src.basename)
+            if archive_path in entries:
+                fail("Duplicate entry for %s: '%s'" % (src, archive_path))
             entries[archive_path] = src
         for src in ([] if ctx.attr.drop_hrl else lib_info.include) + lib_info.priv:
-            if ctx.attr.flat:
-                archive_path = src.basename
-            else:
-                rp = additional_file_dest_relative_path(dep.label, src)
-                archive_path = path_join(lib_info.app_name, rp)
+            rp = additional_file_dest_relative_path(dep.label, src)
+            archive_path = path_join(lib_info.app_name, rp)
             if archive_path in entries:
                 fail("Duplicate entry for %s: '%s'" % (src, archive_path))
             entries[archive_path] = src
@@ -89,13 +82,30 @@ def _impl(ctx):
     -noshell \\
     -eval 'io:format("Assembling {name} escript...~n", []),
 ContentsDir = "{contents_dir}",
-ArchiveEntries = filelib:fold_files(
+Entries = filelib:fold_files(
     ContentsDir, "", true,
     fun(Path, Entries) ->
-        Rel = string:prefix(Path, ContentsDir ++ "/"),
         {{ok, Bin}} = file:read_file(Path),
-        [{{Rel, Bin}} | Entries]
+        Rel = string:prefix(Path, ContentsDir ++ "/"),
+        Dest = case {flat} of
+                    true ->
+                        filename:basename(Path);
+                    false ->
+                        Rel
+               end,
+        [{{Dest, Rel, Bin}} | Entries]
     end, []),
+UniqueEntries = lists:foldr(
+    fun ({{Dest, Rel, Bin}}, Acc) ->
+        case Acc of
+            #{{Dest := _}} ->
+                io:format("   dropping ~s (conflicting entry at ~s)~n", [Rel, Dest]),
+                halt(1);
+            _ ->
+                Acc#{{Dest => Bin}}
+        end
+    end, #{{}}, Entries),
+ArchiveEntries = maps:to_list(UniqueEntries),
 ok = escript:create("{output}",
                     [{headers}
                      {{archive, ArchiveEntries, []}}]),
@@ -107,6 +117,7 @@ halt().
         erlang_home = erlang_home,
         contents_dir = contents_dir.path,
         name = name,
+        flat = str(ctx.attr.flat).lower(),
         headers = "".join(["{}, ".format(h) for h in ctx.attr.headers]),
         output = output.path,
     )