Remove output format flag in Skydoc binary Depends on CL/259742715 to be submitted. RELNOTES: None. PiperOrigin-RevId: 262218030
diff --git a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java index a31fce0..d7c54e4 100644 --- a/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java +++ b/src/main/java/com/google/devtools/build/skydoc/SkydocMain.java
@@ -68,7 +68,6 @@ import com.google.devtools.build.lib.syntax.SkylarkImport; import com.google.devtools.build.lib.syntax.StarlarkSemantics; import com.google.devtools.build.lib.syntax.UserDefinedFunction; -import com.google.devtools.build.skydoc.SkydocOptions.OutputFormat; import com.google.devtools.build.skydoc.fakebuildapi.FakeActionsInfoProvider; import com.google.devtools.build.skydoc.fakebuildapi.FakeBuildApiGlobals; import com.google.devtools.build.skydoc.fakebuildapi.FakeConfigApi; @@ -241,7 +240,6 @@ .filter(entry -> validSymbolName(symbolNames, entry.getKey())) .collect(ImmutableMap.toImmutableMap(Entry::getKey, Entry::getValue)); - if (skydocOptions.outputFormat == OutputFormat.PROTO) { try (BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(outputPath))) { new ProtoRenderer() .appendRuleInfos(filteredRuleInfos.values()) @@ -250,9 +248,6 @@ .appendAspectInfos(filteredAspectInfos.values()) .writeModuleInfo(out); } - } else if (skydocOptions.outputFormat == OutputFormat.MARKDOWN) { - throw new IllegalArgumentException("Skydoc Binary only outputs raw proto format."); - } } private static boolean validSymbolName(ImmutableSet<String> symbolNames, String symbolName) { @@ -267,8 +262,6 @@ } return false; } - - /** * Evaluates/interprets the skylark file at a given path and its transitive skylark dependencies * using a fake build API and collects information about all rule definitions made in the root
diff --git a/src/main/java/com/google/devtools/build/skydoc/SkydocOptions.java b/src/main/java/com/google/devtools/build/skydoc/SkydocOptions.java index 900355a..345ae1a 100644 --- a/src/main/java/com/google/devtools/build/skydoc/SkydocOptions.java +++ b/src/main/java/com/google/devtools/build/skydoc/SkydocOptions.java
@@ -14,7 +14,6 @@ package com.google.devtools.build.skydoc; -import com.google.devtools.common.options.EnumConverter; import com.google.devtools.common.options.Option; import com.google.devtools.common.options.OptionDocumentationCategory; import com.google.devtools.common.options.OptionEffectTag; @@ -49,15 +48,6 @@ public String outputFilePath; @Option( - name = "output_format", - defaultValue = "proto", - converter = OutputFormatConverter.class, - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = OptionEffectTag.UNKNOWN, - help = "The format choice for the output file (\"markdown\" or \"proto\").") - public OutputFormat outputFormat; - - @Option( name = "symbols", allowMultiple = true, defaultValue = "", @@ -78,21 +68,4 @@ effectTags = OptionEffectTag.UNKNOWN, help = "File path roots to search when resolving transitive bzl dependencies") public List<String> depRoots; - - /** Converter for {@link OutputFormat} */ - public static class OutputFormatConverter extends EnumConverter<OutputFormat> { - - public OutputFormatConverter() { - super(OutputFormat.class, "output format"); - } - } - - /** - * The possible values for the --output_format flag, which controls the format of Stardoc's output - * file. - */ - public enum OutputFormat { - MARKDOWN, - PROTO - } }