From 574ba5f626b357fb15ce046666ee646f4da000f2 Mon Sep 17 00:00:00 2001 From: Pascal Muetschard Date: Thu, 20 Jun 2019 12:30:49 -0700 Subject: [PATCH] Stop using the deprecated `ctx.new_file` function. See https://github.com/bazelbuild/bazel/issues/5825 --- gapidapk/android/apk/rules.bzl | 2 +- tools/build/rules/apic.bzl | 6 +++--- tools/build/rules/cc.bzl | 4 ++-- tools/build/rules/common.bzl | 6 +++--- tools/build/rules/embed.bzl | 2 +- tools/build/rules/lingo.bzl | 2 +- tools/build/rules/stringgen.bzl | 6 +++--- tools/build/rules/zip.bzl | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gapidapk/android/apk/rules.bzl b/gapidapk/android/apk/rules.bzl index 9987a969ea..a38364ebd7 100644 --- a/gapidapk/android/apk/rules.bzl +++ b/gapidapk/android/apk/rules.bzl @@ -19,7 +19,7 @@ def _strip_impl(ctx): outs = [] cc_toolchain = find_cpp_toolchain(ctx) if cc_toolchain.cpu == ctx.attr.abi: - out = ctx.new_file("lib/{}/{}".format(ctx.attr.abi, ctx.file.lib.basename)) + out = ctx.actions.declare_file("lib/{}/{}".format(ctx.attr.abi, ctx.file.lib.basename)) ctx.actions.run( executable = cc_toolchain.strip_executable(), arguments = ["--strip-unneeded", "-o", out.path, ctx.file.lib.path], diff --git a/tools/build/rules/apic.bzl b/tools/build/rules/apic.bzl index a0cea449a8..e2eef877f4 100644 --- a/tools/build/rules/apic.bzl +++ b/tools/build/rules/apic.bzl @@ -32,7 +32,7 @@ def _apic_binary_impl(ctx): apilist = api.includes.to_list() generated = depset() - outputs = [ctx.new_file(ctx.label.name + ".bapi")] + outputs = [ctx.actions.declare_file(ctx.label.name + ".bapi")] generated += outputs ctx.actions.run( @@ -85,7 +85,7 @@ def _apic_compile_impl(ctx): cc_toolchain = find_cpp_toolchain(ctx) target = cc_toolchain.cpu - outputs = [ctx.new_file(ctx.label.name + ".o")] + outputs = [ctx.actions.declare_file(ctx.label.name + ".o")] ctx.actions.run( inputs = apilist, @@ -177,7 +177,7 @@ def _apic_template_impl(ctx): for template in ctx.attr.templates: template = template[ApicTemplate] templatelist = template.uses.to_list() - outputs = [ctx.new_file(out.format(api = apiname)) for out in template.outputs] + outputs = [ctx.actions.declare_file(out.format(api = apiname)) for out in template.outputs] generated += outputs ctx.actions.run( inputs = apilist + templatelist, diff --git a/tools/build/rules/cc.bzl b/tools/build/rules/cc.bzl index efae41561f..e0b8f45272 100644 --- a/tools/build/rules/cc.bzl +++ b/tools/build/rules/cc.bzl @@ -46,7 +46,7 @@ def _strip_impl(ctx): extension = "." + extension if ctx.label.name.endswith(extension): extension = "" - out = ctx.new_file(ctx.label.name + extension) + out = ctx.actions.declare_file(ctx.label.name + extension) flags = [] cc_toolchain = find_cpp_toolchain(ctx) @@ -92,7 +92,7 @@ strip = rule( # a symbol dump file that can be uploaded to the crash server to symbolize # stack traces of uploaded crash dumps. def _symbols_impl(ctx): - out = ctx.new_file(ctx.label.name) + out = ctx.actions.declare_file(ctx.label.name) bin = ctx.file.src cc_toolchain = find_cpp_toolchain(ctx) if cc_toolchain.cpu.startswith("darwin"): diff --git a/tools/build/rules/common.bzl b/tools/build/rules/common.bzl index 75afa79bdb..3bc36c28f5 100644 --- a/tools/build/rules/common.bzl +++ b/tools/build/rules/common.bzl @@ -59,7 +59,7 @@ def _copy_to_impl(ctx): outs = [] for src in filtered: dstname = ctx.attr.rename.get(src.basename, default = src.basename) - dst = ctx.new_file(ctx.bin_dir, ctx.attr.to + "/" + dstname) + dst = ctx.actions.declare_file(ctx.attr.to + "/" + dstname) outs += [dst] _copy(ctx, src, dst) @@ -91,7 +91,7 @@ def _copy_tree_impl(ctx): path = path[len(ctx.attr.strip):] if ctx.attr.to: path = ctx.attr.to + "/" + path - dst = ctx.new_file(ctx.bin_dir, path) + dst = ctx.actions.declare_file(path) outs += [dst] _copy(ctx, src, dst) @@ -122,7 +122,7 @@ def _copy_exec_impl(ctx): extension = "." + extension if ctx.label.name.endswith(extension): extension = "" - out = ctx.new_file(ctx.label.name + extension) + out = ctx.actions.declare_file(ctx.label.name + extension) _copy(ctx, src, out) diff --git a/tools/build/rules/embed.bzl b/tools/build/rules/embed.bzl index 854c6a6942..187ed4f88c 100644 --- a/tools/build/rules/embed.bzl +++ b/tools/build/rules/embed.bzl @@ -13,7 +13,7 @@ # limitations under the License. def _embed_impl(ctx): - out = ctx.new_file(ctx.label.name + ".go") + out = ctx.actions.declare_file(ctx.label.name + ".go") args = ["--out", out.path] if ctx.attr.package: args += ["--package", ctx.attr.package] diff --git a/tools/build/rules/lingo.bzl b/tools/build/rules/lingo.bzl index f92816e20f..fa0826369d 100644 --- a/tools/build/rules/lingo.bzl +++ b/tools/build/rules/lingo.bzl @@ -13,7 +13,7 @@ # limitations under the License. def _lingo_impl(ctx): - outs = [ctx.new_file(src.basename[:-6]+".go") for src in ctx.files.srcs] + outs = [ctx.actions.declare_file(src.basename[:-6]+".go") for src in ctx.files.srcs] ctx.actions.run( inputs = ctx.files.srcs, outputs = outs, diff --git a/tools/build/rules/stringgen.bzl b/tools/build/rules/stringgen.bzl index 3b2a81e768..1e30655a2d 100644 --- a/tools/build/rules/stringgen.bzl +++ b/tools/build/rules/stringgen.bzl @@ -13,9 +13,9 @@ # limitations under the License. def _stringgen_impl(ctx): - go = ctx.new_file(ctx.label.name+".go") - api = ctx.new_file(ctx.label.name+".api") - table = ctx.new_file("en-us.stb") + go = ctx.actions.declare_file(ctx.label.name+".go") + api = ctx.actions.declare_file(ctx.label.name+".api") + table = ctx.actions.declare_file("en-us.stb") ctx.actions.run( inputs = [ctx.file.input], outputs = [go, api, table], diff --git a/tools/build/rules/zip.bzl b/tools/build/rules/zip.bzl index 3516162796..145119acc8 100644 --- a/tools/build/rules/zip.bzl +++ b/tools/build/rules/zip.bzl @@ -18,7 +18,7 @@ def _extract_impl(ctx): if ctx.attr.dir: base = ctx.attr.dir + "/" for entry in ctx.attr.entries: - out = ctx.new_file(ctx.bin_dir, base + entry) + out = ctx.actions.declare_file(base + entry) to = out.path[:-len(entry)] outs += [out] ctx.actions.run_shell(