Also symlink modulemap

Author: thiagohmcruz

rules/framework.bzl

@@ -46,14 +46,46 @@ def _find_framework_dir(outputs):
         return prefix + ".framework"
     return None
 
+def _framework_packaging_symlink_headers(ctx, inputs, outputs):
+    inputs_by_basename = {input.basename: input for input in inputs}
+
+    # If this check is true it means that multiple inputs have the same 'basename',
+    # an additional check is done to see if that was caused by 'action_inputs' containing
+    # two different paths to the same file
+    #
+    # In that case fails with a msg listing the differences found
+    if len(inputs_by_basename) < len(inputs):
+        inputs_by_basename_paths = [x.path for x in inputs_by_basename.values()]
+        inputs_with_duplicated_basename = [x for x in inputs if not x.path in inputs_by_basename_paths]
+        if len(inputs_with_duplicated_basename) > 0:
+            fail("""
+                [Error] Multiple files with the same name exists.\n
+                See below for the list of paths found for each basename:\n
+                {}
+            """.format({x.basename: (x.path, inputs_by_basename[x.basename].path) for x in inputs_with_duplicated_basename}))
+
+    # If no error occurs create symlinks for each output with
+    # each input as 'target_file'
+    output_input_dict = {output: inputs_by_basename[output.basename] for output in outputs}
+    for (output, input) in output_input_dict.items():
+        ctx.actions.symlink(output = output, target_file = input)
+
+def _framework_packaging_symlink_modulemap(ctx, inputs, outputs):
+    if len(inputs) != 1 or len(outputs) != 1:
+        fail("""
+        Multiple .modulemap files found, double check expected inputs and outputs:\n
+        inputs: {}\n
+        outputs: {}
+        """.format([x.path for x in inputs], [x.path for x in outputs]))
+    ctx.actions.symlink(output = outputs[0], target_file = inputs[0])
+
 def _framework_packaging(ctx, action, inputs, outputs, manifest = None):
     if not inputs:
         return []
     if inputs == [None]:
         return []
     if action in ctx.attr.skip_packaging:
         return []
-    actions_to_symlink = ["header", "private_header"]
     action_inputs = [manifest] + inputs if manifest else inputs
     outputs = [ctx.actions.declare_file(f) for f in outputs]
     framework_name = ctx.attr.framework_name
@@ -65,29 +97,10 @@ def _framework_packaging(ctx, action, inputs, outputs, manifest = None):
     args.add_all("--inputs", inputs)
     args.add_all("--outputs", outputs)
 
-    if action in actions_to_symlink:
-        inputs_by_basename = {input.basename: input for input in action_inputs}
-
-        # If this check is true it means that multiple inputs have the same 'basename',
-        # an additional check is done to see if that was caused by 'action_inputs' containing
-        # two different paths to the same file
-        #
-        # In that case fails with a msg listing the differences found
-        if len(inputs_by_basename) < len(action_inputs):
-            inputs_by_basename_paths = [x.path for x in inputs_by_basename.values()]
-            inputs_with_duplicated_basename = [x for x in action_inputs if not x.path in inputs_by_basename_paths]
-            if len(inputs_with_duplicated_basename) > 0:
-                fail("""
-                    [Error] Multiple files with the same name exists.\n
-                    See below for the list of paths found for each basename:\n
-                    {}
-                """.format({x.basename: (x.path, inputs_by_basename[x.basename].path) for x in inputs_with_duplicated_basename}))
-
-        # If no error occurs create symlinks for each output with
-        # each input as 'target_file'
-        output_input_dict = {output: inputs_by_basename[output.basename] for output in outputs}
-        for (output, input) in output_input_dict.items():
-            ctx.actions.symlink(output = output, target_file = input)
+    if action in ["header", "private_header"]:
+        _framework_packaging_symlink_headers(ctx, inputs, outputs)
+    elif action == "modulemap":
+        _framework_packaging_symlink_modulemap(ctx, inputs, outputs)
     else:
         ctx.actions.run(
             executable = ctx.executable._framework_packaging,

rules/framework/framework_packaging.py

@@ -42,18 +42,6 @@ def _merge_binaries(framework_root, framework_name, binary_in):
                     ] + binary_in
         subprocess.check_call(commands)
 
-
-def _copy_modulemap(framework_root, modulemap_path):
-    """Copy modulemaps to its destination.
-
-    Args:
-        framework_root: root folder of the framework
-        modulemap_path: path of the original modulemap
-    """
-    dest = os.path.join(framework_root, "Modules", "module.modulemap")
-    _mkdir(os.path.dirname(dest))
-    _cp(modulemap_path, dest)
-
 def _clean(framework_root, manifest_file, output_manifest_file):
     """Remove stale files from the framework root.
 
@@ -106,8 +94,6 @@ def main():
     actions = {
         "binary":
             lambda args: _merge_binaries(args.framework_root, args.framework_name, args.inputs),
-        "modulemap":
-            lambda args: _copy_modulemap(args.framework_root, args.input()),
         "swiftmodule":
             lambda args: _cp(args.input(), args.output()),
         "swiftdoc":