[jsonnet] Update to Jsonnet 0.8.1 RELNOTES: [jsonnet] Update to Jsonnet 0.8.1. -- MOS_MIGRATED_REVID=105303487
diff --git a/tools/build_defs/jsonnet/jsonnet.bzl b/tools/build_defs/jsonnet/jsonnet.bzl index 3a0e477..91f371f 100644 --- a/tools/build_defs/jsonnet/jsonnet.bzl +++ b/tools/build_defs/jsonnet/jsonnet.bzl
@@ -75,14 +75,7 @@ output_json_files = [ctx.new_file(ctx.configuration.bin_dir, out.name) for out in ctx.attr.outs] outputs += output_json_files - command += ["-m", ctx.file.src.path] - # Currently, jsonnet -m creates the output files in the current working - # directory. Append mv commands to move the output files into their - # correct output directories. - # TODO(dzc): Remove this hack when jsonnet supports a flag for setting - # an output directory. - for json_file in output_json_files: - command += ["; mv %s %s" % (json_file.basename, json_file.path)] + command += ["-m", output_json_files[0].dirname, ctx.file.src.path] else: if len(ctx.attr.outs) > 1: fail("Only one file can be specified in outs if multiple_outputs is " + @@ -91,7 +84,7 @@ compiled_json = ctx.new_file(ctx.configuration.bin_dir, ctx.attr.outs[0].name) outputs += [compiled_json] - command += [ctx.file.src.path, "> %s" % compiled_json.path] + command += [ctx.file.src.path, "-o", compiled_json.path] compile_inputs = ( [ctx.file.src, ctx.file._jsonnet, ctx.file._std] +