diff --git a/doc/BUILD.bazel b/doc/BUILD.bazel index 5bc32ba45..ead87c37d 100644 --- a/doc/BUILD.bazel +++ b/doc/BUILD.bazel @@ -79,11 +79,11 @@ proto_plugin( proto_plugin( name = "template_plugin", out = "{name}", - separate_options_flag = True, quirks = [ "QUIRK_OUT_PASS_ROOT", "QUIRK_DIRECT_MODE", ], + separate_options_flag = True, tool = select({ "@bazel_tools//src/conditions:darwin_x86_64": "@protoc_gen_doc_darwin_x86_64//:protoc-gen-doc", "@bazel_tools//src/conditions:linux_x86_64": "@protoc_gen_doc_linux_x86_64//:protoc-gen-doc", diff --git a/doc/doc_template_compile.bzl b/doc/doc_template_compile.bzl index e468b0d3b..6eda2a7e6 100644 --- a/doc/doc_template_compile.bzl +++ b/doc/doc_template_compile.bzl @@ -6,7 +6,7 @@ load( "proto_compile_attrs", "proto_compile_impl", ) -load("//internal:compile.bzl", "proto_compile",) +load("//internal:compile.bzl", "proto_compile") # Create compile rule def doc_template_compile_impl(ctx): @@ -21,7 +21,8 @@ def doc_template_compile_impl(ctx): # Mutate args with template options["*"] = [ - ctx.file.template.path, ctx.attr.name + ctx.file.template.path, + ctx.attr.name, ] extra_protoc_files += [ctx.file.template] diff --git a/docs/lang/android.rst b/docs/lang/android.rst index b3eb19d9a..8035253ea 100644 --- a/docs/lang/android.rst +++ b/docs/lang/android.rst @@ -108,6 +108,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -212,6 +217,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -330,6 +340,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. * - ``deps`` - ``label_list`` - false @@ -444,6 +459,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. * - ``deps`` - ``label_list`` - false diff --git a/docs/lang/c.rst b/docs/lang/c.rst index 43a52777e..dbfe99665 100644 --- a/docs/lang/c.rst +++ b/docs/lang/c.rst @@ -110,6 +110,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -203,6 +208,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. * - ``deps`` - ``label_list`` - false diff --git a/docs/lang/cpp.rst b/docs/lang/cpp.rst index 5944ab57a..29b8a936f 100644 --- a/docs/lang/cpp.rst +++ b/docs/lang/cpp.rst @@ -108,6 +108,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -198,6 +203,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -292,6 +302,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. * - ``deps`` - ``label_list`` - false @@ -428,6 +443,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. * - ``deps`` - ``label_list`` - false diff --git a/docs/lang/csharp.rst b/docs/lang/csharp.rst index 36b5b2f44..cd99bd903 100644 --- a/docs/lang/csharp.rst +++ b/docs/lang/csharp.rst @@ -126,6 +126,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -233,6 +238,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -345,6 +355,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. * - ``deps`` - ``label_list`` - false @@ -453,6 +468,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. * - ``deps`` - ``label_list`` - false diff --git a/docs/lang/d.rst b/docs/lang/d.rst index f6f91886d..5837059bf 100644 --- a/docs/lang/d.rst +++ b/docs/lang/d.rst @@ -110,6 +110,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -207,3 +212,8 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. diff --git a/docs/lang/doc.rst b/docs/lang/doc.rst index edf3417e6..e92df9419 100644 --- a/docs/lang/doc.rst +++ b/docs/lang/doc.rst @@ -110,6 +110,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -201,6 +206,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -292,6 +302,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -383,6 +398,11 @@ Attributes - false - ``[]`` - List of labels that provide extra files to be available during protoc execution + * - ``output_mode`` + - ``string`` + - false + - ``PREFIXED`` + - The output mode for the target. PREFIXED will output to a directory named by the target, NO_PREFIX will output to the current package. Plugins ******* @@ -420,7 +440,8 @@ Full example project can be found `here