From 3be0d3b94e5119be49946636413accccbe0614ed Mon Sep 17 00:00:00 2001
From: James Sharpe <james.sharpe@zenotech.com>
Date: Tue, 16 Feb 2021 15:58:16 +0000
Subject: [PATCH] Move location of generated logs and scripts (#503)

* Don't include log files in default outputs

* Remove logs from install directory

* Rename directory for build script output
---
 tools/build_defs/framework.bzl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/build_defs/framework.bzl b/tools/build_defs/framework.bzl
index 9e6fd88f..9b3b7df3 100644
--- a/tools/build_defs/framework.bzl
+++ b/tools/build_defs/framework.bzl
@@ -416,7 +416,7 @@ def cc_external_rule_impl(ctx, attrs):
     output_groups[attrs.configure_name + "_logs"] = wrapped_files
     return [
         DefaultInfo(
-            files = depset(direct = rule_outputs + wrapped_files),
+            files = depset(direct = rule_outputs),
             runfiles = runfiles,
         ),
         OutputGroupInfo(**output_groups),
@@ -443,13 +443,13 @@ WrappedOutputs = provider(
 
 # buildifier: disable=function-docstring
 def wrap_outputs(ctx, lib_name, configure_name, script_text):
-    build_script_file = ctx.actions.declare_file("{}/logs/{}_script.sh".format(lib_name, configure_name))
+    build_script_file = ctx.actions.declare_file("{}_scripts/{}_script.sh".format(lib_name, configure_name))
     ctx.actions.write(
         output = build_script_file,
         content = script_text,
         is_executable = True,
     )
-    build_log_file = ctx.actions.declare_file("{}/logs/{}.log".format(lib_name, configure_name))
+    build_log_file = ctx.actions.declare_file("{}_logs/{}.log".format(lib_name, configure_name))
 
     cleanup_on_success_function = create_function(
         ctx,