diff options
47 files changed, 93 insertions, 461 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java index fb283ae746..0e4307716c 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java @@ -175,7 +175,6 @@ public class BuildView { "analysis_warnings_as_errors is now a no-op and will be removed in" + " an upcoming Blaze release", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.NO_OP}, help = "Treat visible analysis warnings as errors." @@ -185,7 +184,6 @@ public class BuildView { @Option( name = "discard_analysis_cache", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -197,7 +195,6 @@ public class BuildView { @Option( name = "experimental_extra_action_filter", defaultValue = "", - category = "experimental", converter = RegexFilter.RegexFilterConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -208,7 +205,6 @@ public class BuildView { @Option( name = "experimental_extra_action_top_level_only", defaultValue = "false", - category = "experimental", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Only schedules extra_actions for top level targets." @@ -231,7 +227,6 @@ public class BuildView { @Option( name = "experimental_interleave_loading_and_analysis", defaultValue = "true", - category = "experimental", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "No-op." diff --git a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java index dd8fff432d..08f7d28367 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/PlatformOptions.java @@ -48,7 +48,6 @@ public class PlatformOptions extends FragmentOptions { name = "host_platform_remote_properties_override", oldName = "experimental_remote_platform_override", defaultValue = "null", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -140,7 +139,6 @@ public class PlatformOptions extends FragmentOptions { name = "enabled_toolchain_types", defaultValue = "", converter = LabelListConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, help = "Signals that the given rule categories use platform-based toolchain resolution" diff --git a/src/main/java/com/google/devtools/build/lib/analysis/WorkspaceStatusAction.java b/src/main/java/com/google/devtools/build/lib/analysis/WorkspaceStatusAction.java index 547c6c7dfd..bd08e3e561 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/WorkspaceStatusAction.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/WorkspaceStatusAction.java @@ -60,7 +60,6 @@ public abstract class WorkspaceStatusAction extends AbstractAction { @Option( name = "embed_label", defaultValue = "", - category = "misc", valueHelp = "<string>", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -71,7 +70,6 @@ public abstract class WorkspaceStatusAction extends AbstractAction { @Option( name = "workspace_status_command", defaultValue = "", - category = "misc", converter = OptionsUtils.PathFragmentConverter.class, valueHelp = "<path>", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java index 56e54a37a9..26d6132b4f 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java @@ -407,10 +407,9 @@ public class BuildConfiguration { @Option( name = "experimental_separate_genfiles_directory", defaultValue = "true", - category = "semantics", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS }, - metadataTags = { OptionMetadataTag.EXPERIMENTAL }, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, + metadataTags = {OptionMetadataTag.EXPERIMENTAL}, help = "Whether to have a separate genfiles directory or fold it into the bin directory" ) public boolean separateGenfilesDirectory; @@ -419,10 +418,9 @@ public class BuildConfiguration { name = "define", converter = Converters.AssignmentConverter.class, defaultValue = "", - category = "semantics", allowMultiple = true, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS}, help = "Each --define option specifies an assignment for a build variable." ) public List<Map.Entry<String, String>> commandLineBuildVariables; @@ -430,10 +428,9 @@ public class BuildConfiguration { @Option( name = "cpu", defaultValue = "", - category = "semantics", converter = AutoCpuConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS}, help = "The target CPU." ) public String cpu; @@ -465,9 +462,8 @@ public class BuildConfiguration { @Option( name = "strict_filesets", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, - effectTags = { OptionEffectTag.BUILD_FILE_SEMANTICS, OptionEffectTag.EAGERNESS_TO_EXIT }, + effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS, OptionEffectTag.EAGERNESS_TO_EXIT}, help = "If this option is enabled, filesets crossing package boundaries are reported " + "as errors. It does not work when check_fileset_dependencies_recursively is " @@ -478,9 +474,8 @@ public class BuildConfiguration { @Option( name = "stamp", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "Stamp binaries with the date, username, hostname, workspace information, etc." ) public boolean stampBinaries; @@ -491,9 +486,8 @@ public class BuildConfiguration { name = "instrumentation_filter", converter = RegexFilter.RegexFilterConverter.class, defaultValue = "-/javatests[/:],-/test/java[/:]", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "When coverage is enabled, only rules with names included by the " + "specified regex-based filter will be instrumented. Rules prefixed " @@ -505,9 +499,8 @@ public class BuildConfiguration { @Option( name = "instrument_test_targets", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "When coverage is enabled, specifies whether to consider instrumenting test rules. " + "When set, test rules included by --instrumentation_filter are instrumented. " @@ -518,10 +511,9 @@ public class BuildConfiguration { @Option( name = "host_cpu", defaultValue = "", - category = "semantics", converter = AutoCpuConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS}, help = "The host CPU." ) public String hostCpu; @@ -531,7 +523,6 @@ public class BuildConfiguration { abbrev = 'c', converter = CompilationMode.Converter.class, defaultValue = "fastbuild", - category = "semantics", // Should this be "flags"? documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = { OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.ACTION_COMMAND_LINES }, help = "Specify the mode the binary will be built in. Values: 'fastbuild', 'dbg', 'opt'." @@ -542,7 +533,6 @@ public class BuildConfiguration { name = "host_compilation_mode", converter = CompilationMode.Converter.class, defaultValue = "opt", - category = "semantics", // Should this be "flags"? documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = { OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.ACTION_COMMAND_LINES }, help = "Specify the mode the tools used during the build will be built in. Values: " @@ -571,12 +561,11 @@ public class BuildConfiguration { @Option( name = "platform_suffix", defaultValue = "null", - category = "misc", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = { - OptionEffectTag.LOSES_INCREMENTAL_STATE, - OptionEffectTag.AFFECTS_OUTPUTS, - OptionEffectTag.LOADING_AND_ANALYSIS + OptionEffectTag.LOSES_INCREMENTAL_STATE, + OptionEffectTag.AFFECTS_OUTPUTS, + OptionEffectTag.LOADING_AND_ANALYSIS }, help = "Specifies a suffix to be added to the configuration directory." ) @@ -590,9 +579,8 @@ public class BuildConfiguration { converter = Converters.OptionalAssignmentConverter.class, allowMultiple = true, defaultValue = "", - category = "testing", documentationCategory = OptionDocumentationCategory.TESTING, - effectTags = { OptionEffectTag.TEST_RUNNER }, + effectTags = {OptionEffectTag.TEST_RUNNER}, help = "Specifies additional environment variables to be injected into the test runner " + "environment. Variables can be either specified by name, in which case its value " @@ -610,9 +598,8 @@ public class BuildConfiguration { converter = Converters.OptionalAssignmentConverter.class, allowMultiple = true, defaultValue = "", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.ACTION_COMMAND_LINES}, + effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, help = "Specifies the set of environment variables available to actions. " + "Variables can be either specified by name, in which case the value will be " @@ -626,9 +613,8 @@ public class BuildConfiguration { @Option( name = "collect_code_coverage", defaultValue = "false", - category = "testing", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "If specified, Bazel will instrument code (using offline instrumentation where " + "possible) and will collect coverage information during tests. Only targets that " @@ -638,12 +624,11 @@ public class BuildConfiguration { public boolean collectCodeCoverage; @Option( - name = "experimental_java_coverage", - defaultValue = "false", - category = "testing", - documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS }, - help = "If true Bazel will use a new way of computing code coverage for java targets." + name = "experimental_java_coverage", + defaultValue = "false", + documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, + help = "If true Bazel will use a new way of computing code coverage for java targets." ) public boolean experimentalJavaCoverage; @@ -651,12 +636,11 @@ public class BuildConfiguration { name = "coverage_support", converter = LabelConverter.class, defaultValue = "@bazel_tools//tools/test:coverage_support", - category = "testing", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { - OptionEffectTag.CHANGES_INPUTS, - OptionEffectTag.AFFECTS_OUTPUTS, - OptionEffectTag.LOADING_AND_ANALYSIS + OptionEffectTag.CHANGES_INPUTS, + OptionEffectTag.AFFECTS_OUTPUTS, + OptionEffectTag.LOADING_AND_ANALYSIS }, help = "Location of support files that are required on the inputs of every test action " @@ -668,12 +652,11 @@ public class BuildConfiguration { name = "coverage_report_generator", converter = LabelConverter.class, defaultValue = "@bazel_tools//tools/test:coverage_report_generator", - category = "testing", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { - OptionEffectTag.CHANGES_INPUTS, - OptionEffectTag.AFFECTS_OUTPUTS, - OptionEffectTag.LOADING_AND_ANALYSIS + OptionEffectTag.CHANGES_INPUTS, + OptionEffectTag.AFFECTS_OUTPUTS, + OptionEffectTag.LOADING_AND_ANALYSIS }, help = "Location of the binary that is used to generate coverage reports. This must " @@ -685,21 +668,17 @@ public class BuildConfiguration { @Option( name = "build_runfile_manifests", defaultValue = "true", - category = "strategy", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS }, - help = - "If true, write runfiles manifests for all targets. " - + "If false, omit them." + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, + help = "If true, write runfiles manifests for all targets. " + "If false, omit them." ) public boolean buildRunfilesManifests; @Option( name = "build_runfile_links", defaultValue = "true", - category = "strategy", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "If true, build runfiles symlink forests for all targets. " + "If false, write only manifests when possible." @@ -709,9 +688,8 @@ public class BuildConfiguration { @Option( name = "legacy_external_runfiles", defaultValue = "true", - category = "strategy", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "If true, build runfiles symlink forests for external repositories under " + ".runfiles/wsname/external/repo (in addition to .runfiles/repo)." @@ -721,11 +699,11 @@ public class BuildConfiguration { @Option( name = "check_fileset_dependencies_recursively", defaultValue = "true", - category = "semantics", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - deprecationWarning = "This flag is a no-op and fileset dependencies are always checked " - + "to ensure correctness of builds.", - effectTags = { OptionEffectTag.AFFECTS_OUTPUTS } + deprecationWarning = + "This flag is a no-op and fileset dependencies are always checked " + + "to ensure correctness of builds.", + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS} ) public boolean checkFilesetDependenciesRecursively; @@ -741,11 +719,10 @@ public class BuildConfiguration { @Option( name = "run_under", - category = "run", defaultValue = "null", converter = RunUnderConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.ACTION_COMMAND_LINES}, + effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, help = "Prefix to insert in front of command before running. " + "Examples:\n" @@ -761,12 +738,11 @@ public class BuildConfiguration { @Option( name = "distinct_host_configuration", defaultValue = "true", - category = "strategy", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = { - OptionEffectTag.LOSES_INCREMENTAL_STATE, - OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION, - OptionEffectTag.LOADING_AND_ANALYSIS, + OptionEffectTag.LOSES_INCREMENTAL_STATE, + OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION, + OptionEffectTag.LOADING_AND_ANALYSIS, }, help = "Build all the tools used during the build for a distinct configuration from that used " @@ -786,9 +762,8 @@ public class BuildConfiguration { @Option( name = "check_visibility", defaultValue = "true", - category = "checking", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, - effectTags = { OptionEffectTag.BUILD_FILE_SEMANTICS }, + effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, help = "If disabled, visibility errors are demoted to warnings." ) public boolean checkVisibility; @@ -799,9 +774,8 @@ public class BuildConfiguration { @Option( name = "check_licenses", defaultValue = "false", - category = "checking", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, - effectTags = { OptionEffectTag.BUILD_FILE_SEMANTICS }, + effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, help = "Check that licensing constraints imposed by dependent packages " + "do not conflict with distribution modes of the targets being built. " @@ -825,11 +799,10 @@ public class BuildConfiguration { name = "experimental_action_listener", allowMultiple = true, defaultValue = "", - category = "experimental", converter = LabelListConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.EXECUTION }, - metadataTags = { OptionMetadataTag.EXPERIMENTAL }, + effectTags = {OptionEffectTag.EXECUTION}, + metadataTags = {OptionMetadataTag.EXPERIMENTAL}, help = "Use action_listener to attach an extra_action to existing build actions." ) public List<Label> actionListeners; @@ -863,9 +836,8 @@ public class BuildConfiguration { name = "features", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = { OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS }, + effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS}, help = "The given features will be enabled or disabled by default for all packages. " + "Specifying -<feature> will disable the feature globally. " @@ -880,9 +852,8 @@ public class BuildConfiguration { converter = LabelListConverter.class, allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, - effectTags = { OptionEffectTag.CHANGES_INPUTS }, + effectTags = {OptionEffectTag.CHANGES_INPUTS}, help = "Declares this build's target environment. Must be a label reference to an " + "\"environment\" rule. If specified, all top-level targets must be " @@ -894,7 +865,6 @@ public class BuildConfiguration { name = "auto_cpu_environment_group", converter = EmptyToNullLabelConverter.class, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = {OptionMetadataTag.EXPERIMENTAL}, diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java index 1aa0706b65..c31d95e472 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestConfiguration.java @@ -47,7 +47,6 @@ public class TestConfiguration extends Fragment { name = "test_filter", allowMultiple = false, defaultValue = "null", - category = "testing", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -59,7 +58,6 @@ public class TestConfiguration extends Fragment { @Option( name = "cache_test_results", defaultValue = "auto", - category = "testing", abbrev = 't', // it's useful to toggle this on/off quickly documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -78,7 +76,6 @@ public class TestConfiguration extends Fragment { @Option( name = "test_result_expiration", defaultValue = "-1", // No expiration by defualt. - category = "testing", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "This option is deprecated and has no effect." @@ -89,7 +86,6 @@ public class TestConfiguration extends Fragment { name = "test_arg", allowMultiple = true, defaultValue = "", - category = "testing", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -103,7 +99,6 @@ public class TestConfiguration extends Fragment { @Option( name = "test_sharding_strategy", defaultValue = "explicit", - category = "testing", converter = TestActionBuilder.ShardingStrategyConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -121,7 +116,6 @@ public class TestConfiguration extends Fragment { name = "runs_per_test", allowMultiple = true, defaultValue = "1", - category = "testing", converter = RunsPerTestConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java b/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java index d6131ee995..c1cd9655a4 100644 --- a/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java +++ b/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java @@ -30,7 +30,6 @@ public class AuthAndTLSOptions extends OptionsBase { name = "google_default_credentials", oldName = "auth_enabled", defaultValue = "false", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -44,7 +43,6 @@ public class AuthAndTLSOptions extends OptionsBase { oldName = "auth_scope", defaultValue = "https://www.googleapis.com/auth/cloud-platform", converter = CommaSeparatedOptionListConverter.class, - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "A comma-separated list of Google Cloud authentication scopes." @@ -55,7 +53,6 @@ public class AuthAndTLSOptions extends OptionsBase { name = "google_credentials", oldName = "auth_credentials", defaultValue = "null", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -67,7 +64,6 @@ public class AuthAndTLSOptions extends OptionsBase { @Option( name = "tls_enabled", defaultValue = "false", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -79,7 +75,6 @@ public class AuthAndTLSOptions extends OptionsBase { @Option( name = "tls_certificate", defaultValue = "null", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Specify the TLS client certificate to use." @@ -89,7 +84,6 @@ public class AuthAndTLSOptions extends OptionsBase { @Option( name = "tls_authority_override", defaultValue = "null", - category = "remote", metadataTags = {OptionMetadataTag.HIDDEN}, documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java index bc8afde9ab..bde1dcce8c 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java @@ -44,7 +44,6 @@ public class BazelConfiguration extends Fragment { @Option( name = "experimental_strict_action_env", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, help = @@ -59,7 +58,6 @@ public class BazelConfiguration extends Fragment { name = "shell_executable", converter = PathFragmentConverter.class, defaultValue = "null", - category = "semantics", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, help = diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelStrategyModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelStrategyModule.java index 9d5206fbe2..e829da2048 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelStrategyModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelStrategyModule.java @@ -38,7 +38,6 @@ public class BazelStrategyModule extends BlazeModule { @Option( name = "spawn_strategy", defaultValue = "", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -52,7 +51,6 @@ public class BazelStrategyModule extends BlazeModule { @Option( name = "genrule_strategy", defaultValue = "", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -67,7 +65,6 @@ public class BazelStrategyModule extends BlazeModule { allowMultiple = true, converter = AssignmentConverter.class, defaultValue = "", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonConfiguration.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonConfiguration.java index bba2bd93db..d35b3d6ba7 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/BazelPythonConfiguration.java @@ -62,12 +62,12 @@ public class BazelPythonConfiguration extends BuildConfiguration.Fragment { @Option( name = "python2_path", defaultValue = "python", - category = "version", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, - metadataTags = { OptionMetadataTag.DEPRECATED }, - help = "Local path to the Python2 executable. " - + "Deprecated, please use python_path or python_top instead." + metadataTags = {OptionMetadataTag.DEPRECATED}, + help = + "Local path to the Python2 executable. " + + "Deprecated, please use python_path or python_top instead." ) public String python2Path; @@ -75,35 +75,31 @@ public class BazelPythonConfiguration extends BuildConfiguration.Fragment { name = "python3_path", converter = Python3PathConverter.class, defaultValue = "auto", - category = "version", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, - metadataTags = { OptionMetadataTag.DEPRECATED }, - help = "Local path to the Python3 executable. " - + "Deprecated, please use python_path or python_top instead." + metadataTags = {OptionMetadataTag.DEPRECATED}, + help = + "Local path to the Python3 executable. " + + "Deprecated, please use python_path or python_top instead." ) public String python3Path; @Option( - name = "python_top", - converter = LabelConverter.class, - defaultValue = "null", - category = "version", - documentationCategory = OptionDocumentationCategory.TOOLCHAIN, - effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, - help = - "The label of py_runtime rule used for the Python interpreter invoked by Bazel." + name = "python_top", + converter = LabelConverter.class, + defaultValue = "null", + documentationCategory = OptionDocumentationCategory.TOOLCHAIN, + effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, + help = "The label of py_runtime rule used for the Python interpreter invoked by Bazel." ) public Label pythonTop; @Option( - name = "python_path", - defaultValue = "python", - category = "version", - documentationCategory = OptionDocumentationCategory.TOOLCHAIN, - effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, - help = - "The absolute path of the Python interpreter invoked by Bazel." + name = "python_path", + defaultValue = "python", + documentationCategory = OptionDocumentationCategory.TOOLCHAIN, + effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, + help = "The absolute path of the Python interpreter invoked by Bazel." ) public String pythonPath; diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java index 87392b092e..42cbc43ed3 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java @@ -48,7 +48,6 @@ public class BuildRequestOptions extends OptionsBase { name = "jobs", abbrev = 'j', defaultValue = "auto", - category = "strategy", documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY, effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS, OptionEffectTag.EXECUTION}, converter = JobsConverter.class, @@ -66,7 +65,6 @@ public class BuildRequestOptions extends OptionsBase { @Option( name = "progress_report_interval", defaultValue = "0", - category = "verbosity", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, converter = ProgressReportIntervalConverter.class, @@ -79,7 +77,6 @@ public class BuildRequestOptions extends OptionsBase { @Option( name = "explain", defaultValue = "null", - category = "verbosity", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, converter = OptionsUtils.PathFragmentConverter.class, @@ -92,7 +89,6 @@ public class BuildRequestOptions extends OptionsBase { @Option( name = "verbose_explanations", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -105,7 +101,6 @@ public class BuildRequestOptions extends OptionsBase { name = "output_filter", converter = Converters.RegexPatternConverter.class, defaultValue = "null", - category = "flags", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "Only shows warnings for rules with a name matching the provided regular expression." @@ -216,7 +211,6 @@ public class BuildRequestOptions extends OptionsBase { @Option( name = "build", defaultValue = "true", - category = "what", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.EXECUTION, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -245,7 +239,6 @@ public class BuildRequestOptions extends OptionsBase { @Option( name = "show_result", defaultValue = "1", - category = "verbosity", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -275,7 +268,6 @@ public class BuildRequestOptions extends OptionsBase { @Option( name = "announce", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "Deprecated. No-op.", @@ -286,7 +278,6 @@ public class BuildRequestOptions extends OptionsBase { @Option( name = "symlink_prefix", defaultValue = "null", - category = "misc", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -301,7 +292,6 @@ public class BuildRequestOptions extends OptionsBase { converter = Converters.CommaSeparatedOptionListConverter.class, allowMultiple = true, defaultValue = "", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, metadataTags = {OptionMetadataTag.EXPERIMENTAL}, diff --git a/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java b/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java index c0bae8dca9..3c959b68bc 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java +++ b/src/main/java/com/google/devtools/build/lib/exec/ExecutionOptions.java @@ -54,7 +54,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "verbose_failures", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "If a command fails, print out the full command line." @@ -65,7 +64,6 @@ public class ExecutionOptions extends OptionsBase { name = "subcommands", abbrev = 's', defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Display the subcommands executed during a build." @@ -75,7 +73,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "check_up_to_date", defaultValue = "false", - category = "what", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -88,7 +85,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "check_tests_up_to_date", defaultValue = "false", - category = "testing", implicitRequirements = {"--check_up_to_date"}, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -103,7 +99,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "test_strategy", defaultValue = "", - category = "testing", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Specifies which strategy to use when running tests." @@ -113,7 +108,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "test_keep_going", defaultValue = "true", - category = "testing", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -125,7 +119,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "runs_per_test_detects_flakes", defaultValue = "false", - category = "testing", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -138,7 +131,6 @@ public class ExecutionOptions extends OptionsBase { name = "flaky_test_attempts", allowMultiple = true, defaultValue = "default", - category = "testing", converter = TestAttemptsConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -156,7 +148,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "test_tmpdir", defaultValue = "null", - category = "testing", converter = OptionsUtils.PathFragmentConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -167,7 +158,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "test_output", defaultValue = "summary", - category = "testing", converter = TestStrategy.TestOutputFormat.Converter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -183,7 +173,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "test_summary", defaultValue = "short", - category = "testing", converter = TestStrategy.TestSummaryFormat.Converter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -198,7 +187,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "test_timeout", defaultValue = "-1", - category = "testing", converter = TestTimeout.TestTimeoutConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -214,7 +202,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "resource_autosense", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "This flag has no effect, and is deprecated" @@ -224,7 +211,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "ram_utilization_factor", defaultValue = "67", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -243,7 +229,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "local_resources", defaultValue = "null", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -260,7 +245,6 @@ public class ExecutionOptions extends OptionsBase { @Option( name = "local_test_jobs", defaultValue = "0", - category = "testing", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/LocalExecutionOptions.java b/src/main/java/com/google/devtools/build/lib/exec/local/LocalExecutionOptions.java index 08aaa53e33..aa83c16400 100644 --- a/src/main/java/com/google/devtools/build/lib/exec/local/LocalExecutionOptions.java +++ b/src/main/java/com/google/devtools/build/lib/exec/local/LocalExecutionOptions.java @@ -28,7 +28,6 @@ public class LocalExecutionOptions extends OptionsBase { @Option( name = "local_termination_grace_seconds", oldName = "local_sigkill_grace_seconds", - category = "remote execution", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, defaultValue = "15", diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingOptions.java b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingOptions.java index dcc25cf749..3bc197ea6d 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingOptions.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/LoadingOptions.java @@ -30,7 +30,6 @@ public class LoadingOptions extends OptionsBase { @Option( name = "build_tests_only", defaultValue = "false", - category = "what", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -43,7 +42,6 @@ public class LoadingOptions extends OptionsBase { @Option( name = "compile_one_dependency", defaultValue = "false", - category = "what", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -60,7 +58,6 @@ public class LoadingOptions extends OptionsBase { name = "build_tag_filters", converter = CommaSeparatedOptionListConverter.class, defaultValue = "", - category = "what", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -76,7 +73,6 @@ public class LoadingOptions extends OptionsBase { name = "test_tag_filters", converter = CommaSeparatedOptionListConverter.class, defaultValue = "", - category = "what", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -91,7 +87,6 @@ public class LoadingOptions extends OptionsBase { name = "test_size_filters", converter = TestSize.TestSizeFilterConverter.class, defaultValue = "", - category = "what", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -106,7 +101,6 @@ public class LoadingOptions extends OptionsBase { name = "test_timeout_filters", converter = TestTimeout.TestTimeoutFilterConverter.class, defaultValue = "", - category = "what", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -122,7 +116,6 @@ public class LoadingOptions extends OptionsBase { name = "test_lang_filters", converter = CommaSeparatedOptionListConverter.class, defaultValue = "", - category = "what", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -138,7 +131,6 @@ public class LoadingOptions extends OptionsBase { @Option( name = "build_manual_tests", defaultValue = "false", - category = "what", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java index b23b1b31e9..3c7a3435ec 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java @@ -61,7 +61,6 @@ public class PackageCacheOptions extends OptionsBase { @Option( name = "package_path", defaultValue = "%workspace%", - category = "package loading", converter = Converters.ColonSeparatedOptionListConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -76,7 +75,6 @@ public class PackageCacheOptions extends OptionsBase { @Option( name = "show_package_location", defaultValue = "false", - category = "verbosity", deprecationWarning = "This flag is no longer supported and will go away soon.", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -89,7 +87,6 @@ public class PackageCacheOptions extends OptionsBase { @Option( name = "show_loading_progress", defaultValue = "true", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "If enabled, causes Blaze to print \"Loading package:\" messages." @@ -99,7 +96,6 @@ public class PackageCacheOptions extends OptionsBase { @Option( name = "deleted_packages", defaultValue = "", - category = "package loading", converter = CommaSeparatedPackageNameListConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, diff --git a/src/main/java/com/google/devtools/build/lib/query2/CommonQueryOptions.java b/src/main/java/com/google/devtools/build/lib/query2/CommonQueryOptions.java index 28272b4d54..3a258e84e3 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/CommonQueryOptions.java +++ b/src/main/java/com/google/devtools/build/lib/query2/CommonQueryOptions.java @@ -29,7 +29,6 @@ public class CommonQueryOptions extends OptionsBase { @Option( name = "output", defaultValue = "label", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = @@ -80,7 +79,6 @@ public class CommonQueryOptions extends OptionsBase { @Option( name = "implicit_deps", defaultValue = "true", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, help = diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/QueryOptions.java b/src/main/java/com/google/devtools/build/lib/query2/output/QueryOptions.java index 6e6ed07c1c..c3e3e52f5c 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/output/QueryOptions.java +++ b/src/main/java/com/google/devtools/build/lib/query2/output/QueryOptions.java @@ -43,7 +43,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "null", defaultValue = "null", - category = "query", expansion = {"--line_terminator_null=true"}, documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, @@ -54,7 +53,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "line_terminator_null", defaultValue = "false", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = "Whether each format is terminated with \0 instead of newline." @@ -64,7 +62,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "order_results", defaultValue = "null", - category = "query", deprecationWarning = "Please use --order_output=auto or --order_output=no instead of this flag", expansion = {"--order_output=auto"}, documentationCategory = OptionDocumentationCategory.QUERY, @@ -79,7 +76,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "noorder_results", defaultValue = "null", - category = "query", deprecationWarning = "Please use --order_output=no or --order_output=auto instead of this flag", expansion = {"--order_output=no"}, documentationCategory = OptionDocumentationCategory.QUERY, @@ -103,7 +99,6 @@ public class QueryOptions extends CommonQueryOptions { name = "order_output", converter = OrderOutputConverter.class, defaultValue = "auto", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = @@ -119,7 +114,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "graph:node_limit", defaultValue = "512", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = @@ -132,7 +126,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "graph:factored", defaultValue = "true", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = @@ -145,7 +138,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "proto:default_values", defaultValue = "true", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = @@ -158,7 +150,6 @@ public class QueryOptions extends CommonQueryOptions { name = "proto:output_rule_attrs", converter = CommaSeparatedOptionListConverter.class, defaultValue = "all", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = @@ -171,7 +162,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "xml:line_numbers", defaultValue = "true", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = @@ -183,7 +173,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "xml:default_values", defaultValue = "false", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = @@ -195,7 +184,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "strict_test_suite", defaultValue = "false", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS, OptionEffectTag.EAGERNESS_TO_EXIT}, help = @@ -207,7 +195,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "relative_locations", defaultValue = "false", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, help = @@ -222,7 +209,6 @@ public class QueryOptions extends CommonQueryOptions { name = "aspect_deps", converter = AspectResolutionModeConverter.class, defaultValue = "conservative", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, help = @@ -241,7 +227,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "query_file", defaultValue = "", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.CHANGES_INPUTS}, help = @@ -262,7 +247,6 @@ public class QueryOptions extends CommonQueryOptions { @Option( name = "proto:flatten_selects", defaultValue = "true", - category = "query", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, help = diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java index b60241d5c7..e6493f38de 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java +++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteOptions.java @@ -27,7 +27,6 @@ public final class RemoteOptions extends OptionsBase { name = "remote_http_cache", oldName = "remote_rest_cache", defaultValue = "null", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -39,7 +38,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "remote_rest_cache_pool_size", defaultValue = "20", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Size of the HTTP pool for making requests to the REST cache.", @@ -52,7 +50,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "remote_executor", defaultValue = "null", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "HOST or HOST:PORT of a remote execution endpoint." @@ -62,7 +59,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "remote_cache", defaultValue = "null", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "HOST or HOST:PORT of a remote caching endpoint." @@ -72,7 +68,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "remote_timeout", defaultValue = "60", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "The maximum number of seconds to wait for remote execution and cache calls." @@ -82,7 +77,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "remote_accept_cached", defaultValue = "true", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Whether to accept remotely cached action results." @@ -92,7 +86,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "remote_local_fallback", defaultValue = "false", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Whether to fall back to standalone local execution strategy if remote execution fails." @@ -102,7 +95,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "remote_upload_local_results", defaultValue = "true", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Whether to upload locally executed action results to the remote cache." @@ -112,7 +104,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "remote_instance_name", defaultValue = "", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Value to pass as instance_name in the remote execution API." @@ -122,7 +113,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_remote_retry", defaultValue = "true", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Whether to retry transient remote execution/cache errors." @@ -132,7 +122,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_remote_retry_start_delay_millis", defaultValue = "100", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "The initial delay before retrying a transient error." @@ -142,7 +131,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_remote_retry_max_delay_millis", defaultValue = "5000", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "The maximum delay before retrying a transient error." @@ -152,7 +140,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_remote_retry_max_attempts", defaultValue = "5", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "The maximum number of attempts to retry a transient error." @@ -162,7 +149,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_remote_retry_multiplier", defaultValue = "2", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "The multiplier by which to increase the retry delay on transient errors." @@ -172,7 +158,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_remote_retry_jitter", defaultValue = "0.1", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "The random factor to apply to retry delays on transient errors." @@ -182,11 +167,11 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_remote_spawn_cache", defaultValue = "false", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, - help = "Whether to use the experimental spawn cache infrastructure for remote caching. " - + "Enabling this flag makes Bazel ignore any setting for remote_executor." + help = + "Whether to use the experimental spawn cache infrastructure for remote caching. " + + "Enabling this flag makes Bazel ignore any setting for remote_executor." ) public boolean experimentalRemoteSpawnCache; @@ -194,7 +179,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_local_disk_cache", defaultValue = "false", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Whether to use the experimental local disk cache." @@ -204,7 +188,6 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_local_disk_cache_path", defaultValue = "null", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, converter = OptionsUtils.PathFragmentConverter.class, @@ -215,12 +198,12 @@ public final class RemoteOptions extends OptionsBase { @Option( name = "experimental_guard_against_concurrent_changes", defaultValue = "false", - category = "remote", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, - help = "Turn this off to disable checking the ctime of input files of an action before " - + "uploading it to a remote cache. There may be cases where the Linux kernel delays " - + "writing of files, which could cause false positives." + help = + "Turn this off to disable checking the ctime of input files of an action before " + + "uploading it to a remote cache. There may be cases where the Linux kernel delays " + + "writing of files, which could cause false positives." ) public boolean experimentalGuardAgainstConcurrentChanges; } diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index 845b540169..28aec1f271 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -290,7 +290,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "android_crosstool_top", defaultValue = "//external:android/crosstool", - category = "semantics", converter = EmptyToNullLabelConverter.class, documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { @@ -306,7 +305,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "android_cpu", defaultValue = "armeabi-v7a", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = { OptionEffectTag.AFFECTS_OUTPUTS, @@ -320,7 +318,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "android_compiler", defaultValue = "null", - category = "semantics", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { OptionEffectTag.AFFECTS_OUTPUTS, @@ -335,7 +332,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { name = "android_grte_top", defaultValue = "null", converter = LibcTopLabelConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { OptionEffectTag.CHANGES_INPUTS, @@ -369,7 +365,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "android_sdk", defaultValue = "@bazel_tools//tools/android:sdk", - category = "version", converter = LabelConverter.class, documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { @@ -386,7 +381,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { name = "fat_apk_cpu", converter = Converters.CommaSeparatedOptionListConverter.class, defaultValue = "armeabi-v7a", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = { OptionEffectTag.AFFECTS_OUTPUTS, @@ -449,7 +443,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "incremental_dexing", defaultValue = "true", - category = "semantics", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = { OptionEffectTag.AFFECTS_OUTPUTS, @@ -513,7 +506,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "experimental_android_use_parallel_dex2oat", - category = "experimental", defaultValue = "false", documentationCategory = OptionDocumentationCategory.TESTING, effectTags = { @@ -531,7 +523,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { name = "non_incremental_per_target_dexopts", converter = Converters.CommaSeparatedOptionListConverter.class, defaultValue = "--positions", - category = "semantics", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = { OptionEffectTag.LOADING_AND_ANALYSIS, @@ -629,7 +620,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "android_resource_shrinking", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = { OptionEffectTag.AFFECTS_OUTPUTS, @@ -642,7 +632,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "experimental_android_resource_cycle_shrinking", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = { OptionEffectTag.AFFECTS_OUTPUTS, @@ -658,7 +647,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "android_manifest_merger", defaultValue = "android", - category = "semantics", converter = AndroidManifestMergerConverter.class, documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { @@ -675,7 +663,6 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option( name = "android_aapt", defaultValue = "aapt", - category = "semantics", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { OptionEffectTag.AFFECTS_OUTPUTS, diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java b/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java index d9d108925a..1f995f140c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/WriteAdbArgsAction.java @@ -44,7 +44,6 @@ public final class WriteAdbArgsAction extends AbstractFileWriteAction { public static final class Options extends OptionsBase { @Option( name = "adb", - category = "mobile-install", defaultValue = "", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.CHANGES_INPUTS}, @@ -57,7 +56,6 @@ public final class WriteAdbArgsAction extends AbstractFileWriteAction { @Option( name = "adb_arg", - category = "mobile-install", allowMultiple = true, defaultValue = "", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, @@ -68,7 +66,6 @@ public final class WriteAdbArgsAction extends AbstractFileWriteAction { @Option( name = "device", - category = "mobile-install", defaultValue = "", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, @@ -78,7 +75,6 @@ public final class WriteAdbArgsAction extends AbstractFileWriteAction { @Option( name = "incremental_install_verbosity", - category = "mobile-install", defaultValue = "", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.BAZEL_MONITORING}, @@ -88,7 +84,6 @@ public final class WriteAdbArgsAction extends AbstractFileWriteAction { @Option( name = "start", - category = "mobile-install", converter = StartTypeConverter.class, defaultValue = "NO", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, @@ -101,7 +96,6 @@ public final class WriteAdbArgsAction extends AbstractFileWriteAction { @Option( name = "start_app", - category = "mobile-install", defaultValue = "null", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.EXECUTION}, @@ -112,7 +106,6 @@ public final class WriteAdbArgsAction extends AbstractFileWriteAction { @Option( name = "debug_app", - category = "mobile-install", defaultValue = "null", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.EXECUTION}, diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java index 09d8bfb14c..da57b6ae74 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/AppleCommandLineOptions.java @@ -53,7 +53,6 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "experimental_apple_mandatory_minimum_version", defaultValue = "false", - category = "experimental", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.BUILD_FILE_SEMANTICS}, help = "Whether Apple rules must have a mandatory minimum_os_version attribute." @@ -64,7 +63,6 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "experimental_objc_provider_from_linked", defaultValue = "true", - category = "experimental", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.BUILD_FILE_SEMANTICS}, help = @@ -77,7 +75,6 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "xcode_version", defaultValue = "null", - category = "build", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, help = @@ -90,7 +87,6 @@ public class AppleCommandLineOptions extends FragmentOptions { name = "ios_sdk_version", defaultValue = "null", converter = DottedVersionConverter.class, - category = "build", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, help = "Specifies the version of the iOS SDK to use to build iOS applications." @@ -101,7 +97,6 @@ public class AppleCommandLineOptions extends FragmentOptions { name = "watchos_sdk_version", defaultValue = "null", converter = DottedVersionConverter.class, - category = "build", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, help = "Specifies the version of the watchOS SDK to use to build watchOS applications." @@ -112,7 +107,6 @@ public class AppleCommandLineOptions extends FragmentOptions { name = "tvos_sdk_version", defaultValue = "null", converter = DottedVersionConverter.class, - category = "build", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, help = "Specifies the version of the tvOS SDK to use to build tvOS applications." @@ -123,7 +117,6 @@ public class AppleCommandLineOptions extends FragmentOptions { name = "macos_sdk_version", defaultValue = "null", converter = DottedVersionConverter.class, - category = "build", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, help = "Specifies the version of the macOS SDK to use to build macOS applications." @@ -133,7 +126,6 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "ios_minimum_os", defaultValue = "null", - category = "flags", converter = DottedVersionConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, @@ -144,7 +136,6 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "watchos_minimum_os", defaultValue = "null", - category = "flags", converter = DottedVersionConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, @@ -155,7 +146,6 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "tvos_minimum_os", defaultValue = "null", - category = "flags", converter = DottedVersionConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, @@ -166,7 +156,6 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "macos_minimum_os", defaultValue = "null", - category = "flags", converter = DottedVersionConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, @@ -192,7 +181,6 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "ios_cpu", defaultValue = DEFAULT_IOS_CPU, - category = "build", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.NO_OP}, metadataTags = {OptionMetadataTag.DEPRECATED}, @@ -203,7 +191,6 @@ public class AppleCommandLineOptions extends FragmentOptions { @Option( name = "apple_crosstool_top", defaultValue = "@bazel_tools//tools/cpp:toolchain", - category = "version", converter = LabelConverter.class, documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.CHANGES_INPUTS}, @@ -256,7 +243,6 @@ public class AppleCommandLineOptions extends FragmentOptions { name = "ios_multi_cpus", converter = CommaSeparatedOptionListConverter.class, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.LOADING_AND_ANALYSIS}, help = @@ -269,7 +255,6 @@ public class AppleCommandLineOptions extends FragmentOptions { name = "watchos_cpus", converter = CommaSeparatedOptionListConverter.class, defaultValue = DEFAULT_WATCHOS_CPU, - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.LOADING_AND_ANALYSIS}, help = "Comma-separated list of architectures for which to build Apple watchOS binaries." @@ -280,7 +265,6 @@ public class AppleCommandLineOptions extends FragmentOptions { name = "tvos_cpus", converter = CommaSeparatedOptionListConverter.class, defaultValue = DEFAULT_TVOS_CPU, - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.LOADING_AND_ANALYSIS}, help = "Comma-separated list of architectures for which to build Apple tvOS binaries." @@ -291,7 +275,6 @@ public class AppleCommandLineOptions extends FragmentOptions { name = "macos_cpus", converter = CommaSeparatedOptionListConverter.class, defaultValue = DEFAULT_MACOS_CPU, - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.LOADING_AND_ANALYSIS}, help = "Comma-separated list of architectures for which to build Apple macOS binaries." @@ -339,7 +322,6 @@ public class AppleCommandLineOptions extends FragmentOptions { converter = AppleBitcodeMode.Converter.class, // TODO(blaze-team): Default to embedded_markers when fully implemented. defaultValue = "none", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, help = diff --git a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java index 12bf90edad..35ddd09a68 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/apple/swift/SwiftCommandLineOptions.java @@ -28,7 +28,6 @@ public class SwiftCommandLineOptions extends FragmentOptions { name = "swiftcopt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, help = "Additional options to pass to Swift compilation." @@ -38,7 +37,6 @@ public class SwiftCommandLineOptions extends FragmentOptions { @Option( name = "swift_whole_module_optimization", defaultValue = "false", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, help = "Whether to enable Whole Module Optimization" diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java index c64b014693..849c614202 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java @@ -129,7 +129,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "crosstool_top", defaultValue = "@bazel_tools//tools/cpp:toolchain", - category = "version", converter = LabelConverter.class, documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { @@ -144,7 +143,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "compiler", defaultValue = "null", - category = "version", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.EXECUTION}, help = "The C++ compiler to use for compiling the target." @@ -157,7 +155,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "cc_output_directory_tag", defaultValue = "", - category = "misc", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "Specifies a suffix to be added to the configuration directory." @@ -167,7 +164,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "glibc", defaultValue = "null", - category = "version", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -181,7 +177,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "start_end_lib", defaultValue = "true", - category = "strategy", // but also adds edges to the action graph documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = { OptionEffectTag.LOADING_AND_ANALYSIS, @@ -196,7 +191,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "interface_shared_objects", defaultValue = "true", - category = "strategy", // but also adds edges to the action graph documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { OptionEffectTag.LOADING_AND_ANALYSIS, @@ -213,7 +207,6 @@ public class CppOptions extends FragmentOptions { name = "fission", defaultValue = "no", converter = FissionOptionConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = { OptionEffectTag.LOADING_AND_ANALYSIS, @@ -230,7 +223,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "build_test_dwp", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -243,7 +235,6 @@ public class CppOptions extends FragmentOptions { name = "dynamic_mode", defaultValue = "default", converter = DynamicModeConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -255,21 +246,19 @@ public class CppOptions extends FragmentOptions { public DynamicMode dynamicMode; @Option( - name = "experimental_drop_fully_static_linking_mode", - defaultValue = "false", - category = "semantics", - documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, - help = - "If enabled, bazel will not scan linkopts for -static. Rules have to define their fully" - + " static linking mode through 'link_fully_static_binary' feature." + name = "experimental_drop_fully_static_linking_mode", + defaultValue = "false", + documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, + effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, + help = + "If enabled, bazel will not scan linkopts for -static. Rules have to define their fully" + + " static linking mode through 'link_fully_static_binary' feature." ) public boolean dropFullyStaticLinkingMode; @Option( name = "experimental_link_compile_output_separately", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, metadataTags = {OptionMetadataTag.EXPERIMENTAL}, @@ -283,7 +272,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "force_pic", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -296,7 +284,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "force_ignore_dash_static", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, help = "If set, '-static' options in the linkopts of cc_* rules will be ignored." @@ -306,7 +293,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "process_headers_in_dependencies", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = {OptionEffectTag.EXECUTION}, help = @@ -319,7 +305,6 @@ public class CppOptions extends FragmentOptions { name = "copt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = "Additional options to pass to gcc." @@ -329,7 +314,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "cxxopt", defaultValue = "", - category = "flags", allowMultiple = true, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, @@ -341,7 +325,6 @@ public class CppOptions extends FragmentOptions { name = "conlyopt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = "Additional option to pass to gcc when compiling C source files." @@ -351,7 +334,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "linkopt", defaultValue = "", - category = "flags", allowMultiple = true, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, @@ -362,7 +344,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "ltoindexopt", defaultValue = "", - category = "flags", allowMultiple = true, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, @@ -373,7 +354,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "ltobackendopt", defaultValue = "", - category = "flags", allowMultiple = true, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, @@ -385,7 +365,6 @@ public class CppOptions extends FragmentOptions { name = "stripopt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = "Additional options to pass to strip when generating a '<name>.stripped' binary." @@ -395,7 +374,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "custom_malloc", defaultValue = "null", - category = "semantics", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -408,7 +386,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "experimental_shortened_obj_file_path", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -424,7 +401,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "legacy_whole_archive", defaultValue = "true", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -438,7 +414,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "strip", defaultValue = "sometimes", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -452,7 +427,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "fdo_instrument", defaultValue = "null", - category = "flags", implicitRequirements = {"--copt=-Wno-error"}, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, @@ -480,7 +454,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "fdo_optimize", defaultValue = "null", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -535,7 +508,6 @@ public class CppOptions extends FragmentOptions { name = "lipo", defaultValue = "off", converter = LipoModeConverter.class, - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -562,7 +534,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "lipo_context", defaultValue = "null", - category = "flags", converter = LabelConverter.class, implicitRequirements = {"--linkopt=-Wl,--warn-unresolved-symbols"}, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, @@ -652,7 +623,6 @@ public class CppOptions extends FragmentOptions { name = "experimental_stl", converter = LabelConverter.class, defaultValue = "null", - category = "version", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.ACTION_COMMAND_LINES}, metadataTags = {OptionMetadataTag.EXPERIMENTAL}, @@ -665,7 +635,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "save_temps", defaultValue = "false", - category = "what", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -680,7 +649,6 @@ public class CppOptions extends FragmentOptions { allowMultiple = true, converter = PerLabelOptions.PerLabelOptionsConverter.class, defaultValue = "", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -703,7 +671,6 @@ public class CppOptions extends FragmentOptions { allowMultiple = true, converter = PerLabelOptions.PerLabelOptionsConverter.class, defaultValue = "", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -724,7 +691,6 @@ public class CppOptions extends FragmentOptions { name = "host_crosstool_top", defaultValue = "null", converter = LabelConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = { OptionEffectTag.LOADING_AND_ANALYSIS, @@ -742,7 +708,6 @@ public class CppOptions extends FragmentOptions { name = "host_copt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = "Additional options to pass to gcc for host tools." @@ -753,7 +718,6 @@ public class CppOptions extends FragmentOptions { name = "host_cxxopt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = "Additional options to pass to gcc for host tools." @@ -761,31 +725,28 @@ public class CppOptions extends FragmentOptions { public List<String> hostCxxoptList; @Option( - name = "host_conlyopt", - allowMultiple = true, - defaultValue = "", - category = "flags", - documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, - help = "Additional option to pass to gcc when compiling C source files for host tools." + name = "host_conlyopt", + allowMultiple = true, + defaultValue = "", + documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, + effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, + help = "Additional option to pass to gcc when compiling C source files for host tools." ) public List<String> hostConlyoptList; @Option( - name = "host_linkopt", - defaultValue = "", - category = "flags", - allowMultiple = true, - documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, - effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, - help = "Additional option to pass to gcc when linking host tools." + name = "host_linkopt", + defaultValue = "", + allowMultiple = true, + documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, + effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, + help = "Additional option to pass to gcc when linking host tools." ) public List<String> hostLinkoptList; @Option( name = "grte_top", defaultValue = "null", // The default value is chosen by the toolchain. - category = "version", converter = LibcTopLabelConverter.class, documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, @@ -798,7 +759,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "host_grte_top", defaultValue = "null", // The default value is chosen by the toolchain. - category = "version", converter = LibcTopLabelConverter.class, documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, @@ -811,7 +771,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "output_symbol_counts", defaultValue = "false", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -823,7 +782,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "experimental_inmemory_dotd_files", defaultValue = "false", - category = "experimental", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = { OptionEffectTag.LOADING_AND_ANALYSIS, @@ -840,7 +798,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "prune_cpp_modules", defaultValue = "true", - category = "strategy", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = { OptionEffectTag.LOADING_AND_ANALYSIS, @@ -854,7 +811,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "parse_headers_verifies_modules", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.CHANGES_INPUTS}, help = @@ -866,7 +822,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "experimental_omitfp", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.AFFECTS_OUTPUTS}, metadataTags = {OptionMetadataTag.EXPERIMENTAL}, @@ -879,7 +834,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "share_native_deps", defaultValue = "true", - category = "strategy", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -891,7 +845,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "strict_system_includes", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.EAGERNESS_TO_EXIT}, help = @@ -915,7 +868,6 @@ public class CppOptions extends FragmentOptions { @Option( name = "experimental_use_llvm_covmap", defaultValue = "false", - category = "experimental", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = { OptionEffectTag.CHANGES_INPUTS, diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java index e55a8594b1..7e15a7e67f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java @@ -78,7 +78,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "javabase", defaultValue = "@bazel_tools//tools/jdk:jdk", - category = "version", converter = LabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -92,7 +91,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "java_toolchain", defaultValue = "@bazel_tools//tools/jdk:toolchain", - category = "version", converter = LabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -103,7 +101,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "host_java_toolchain", defaultValue = "@bazel_tools//tools/jdk:toolchain", - category = "version", converter = LabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -115,7 +112,6 @@ public class JavaOptions extends FragmentOptions { name = "host_javabase", defaultValue = "@bazel_tools//tools/jdk:host_jdk", converter = LabelConverter.class, - category = "version", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -128,7 +124,6 @@ public class JavaOptions extends FragmentOptions { name = "javacopt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Additional options to pass to javac." @@ -139,7 +134,6 @@ public class JavaOptions extends FragmentOptions { name = "jvmopt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -151,7 +145,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "use_ijars", defaultValue = "true", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -174,7 +167,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "java_header_compilation", defaultValue = "true", - category = "semantics", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Compile ijars directly from source.", @@ -196,7 +188,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "java_deps", defaultValue = "true", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Generate dependency information (for now, compile-time classpath) per Java target." @@ -208,7 +199,6 @@ public class JavaOptions extends FragmentOptions { allowMultiple = false, defaultValue = "javabuilder", converter = JavaClasspathModeConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Enables reduced classpaths for Java compilations.", @@ -219,7 +209,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "java_debug", defaultValue = "null", - category = "testing", expansion = { "--test_arg=--wrapper_script_flag=--debug", "--test_output=streamed", @@ -241,7 +230,6 @@ public class JavaOptions extends FragmentOptions { allowMultiple = false, defaultValue = "default", converter = StrictDepsConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS, OptionEffectTag.EAGERNESS_TO_EXIT}, help = @@ -266,7 +254,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "explicit_java_test_deps", defaultValue = "false", - category = "semantics", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -354,7 +341,6 @@ public class JavaOptions extends FragmentOptions { name = "host_java_launcher", defaultValue = "null", converter = LabelConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "The Java launcher used by tools that are executed during a build." @@ -365,7 +351,6 @@ public class JavaOptions extends FragmentOptions { name = "java_launcher", defaultValue = "null", converter = LabelConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -377,7 +362,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "proguard_top", defaultValue = "null", - category = "version", converter = LabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -418,7 +402,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "translations", defaultValue = "auto", - category = "semantics", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -429,7 +412,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "message_translations", defaultValue = "", - category = "semantics", allowMultiple = true, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -441,7 +423,6 @@ public class JavaOptions extends FragmentOptions { name = "check_constraint", allowMultiple = true, defaultValue = "", - category = "checking", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Check the listed constraint." @@ -544,7 +525,6 @@ public class JavaOptions extends FragmentOptions { @Option( name = "jplPropagateCcLinkParamsStore", defaultValue = "false", - category = "rollout", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, @@ -561,7 +541,6 @@ public class JavaOptions extends FragmentOptions { converter = LabelListConverter.class, allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Plugins to use in the build. Currently works with java_plugin." diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java index 2e0b812387..f9694db412 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java @@ -35,7 +35,6 @@ public class J2ObjcCommandLineOptions extends FragmentOptions { converter = Converters.CommaSeparatedOptionListConverter.class, allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Additional options to pass to the J2ObjC tool." @@ -68,7 +67,6 @@ public class J2ObjcCommandLineOptions extends FragmentOptions { @Option( name = "explicit_jre_deps", defaultValue = "true", - category = "flags", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "This flag is a noop and will be removed." @@ -78,7 +76,6 @@ public class J2ObjcCommandLineOptions extends FragmentOptions { @Option( name = "experimental_j2objc_header_map", defaultValue = "true", - category = "flags", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Whether to generate J2ObjC header map in parallel of J2ObjC transpilation." diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java index e7e5a1639d..3251d17f76 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java @@ -33,7 +33,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "ios_simulator_version", defaultValue = "9.3", - category = "run", converter = DottedVersionConverter.class, documentationCategory = OptionDocumentationCategory.TESTING, effectTags = {OptionEffectTag.TEST_RUNNER}, @@ -46,7 +45,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "ios_simulator_device", defaultValue = "iPhone 5s", - category = "run", documentationCategory = OptionDocumentationCategory.TESTING, effectTags = {OptionEffectTag.TEST_RUNNER}, help = @@ -59,7 +57,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "watchos_simulator_version", defaultValue = "2.0", - category = "run", converter = DottedVersionConverter.class, documentationCategory = OptionDocumentationCategory.TESTING, effectTags = {OptionEffectTag.TEST_RUNNER}, @@ -70,7 +67,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "watchos_simulator_device", defaultValue = "Apple Watch - 38mm", - category = "run", documentationCategory = OptionDocumentationCategory.TESTING, effectTags = {OptionEffectTag.TEST_RUNNER}, help = @@ -83,7 +79,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "tvos_simulator_version", defaultValue = "9.0", - category = "run", converter = DottedVersionConverter.class, documentationCategory = OptionDocumentationCategory.TESTING, effectTags = {OptionEffectTag.TEST_RUNNER}, @@ -94,7 +89,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "tvos_simulator_device", defaultValue = "Apple TV 1080p", - category = "run", documentationCategory = OptionDocumentationCategory.TESTING, effectTags = {OptionEffectTag.TEST_RUNNER}, help = @@ -107,7 +101,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "objc_generate_linkmap", defaultValue = "false", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "Specifies whether to generate a linkmap file." @@ -118,7 +111,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { name = "objccopt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, help = "Additional options to pass to Objective C compilation." @@ -128,7 +120,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "ios_memleaks", defaultValue = "false", - category = "misc", documentationCategory = OptionDocumentationCategory.TESTING, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, help = "Enable checking for memory leaks in ios_test targets." @@ -169,7 +160,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "objc_enable_binary_stripping", defaultValue = "false", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, help = @@ -182,7 +172,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "apple_generate_dsym", defaultValue = "false", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.ACTION_COMMAND_LINES}, help = "Whether to generate debug symbol(.dSYM) file(s)." @@ -192,7 +181,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "ios_signing_cert_name", defaultValue = "null", - category = "flags", documentationCategory = OptionDocumentationCategory.SIGNING, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, help = @@ -216,7 +204,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "extra_entitlements", defaultValue = "null", - category = "flags", converter = LabelConverter.class, documentationCategory = OptionDocumentationCategory.SIGNING, effectTags = {OptionEffectTag.CHANGES_INPUTS}, @@ -229,7 +216,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "device_debug_entitlements", defaultValue = "true", - category = "flags", documentationCategory = OptionDocumentationCategory.SIGNING, effectTags = {OptionEffectTag.CHANGES_INPUTS}, help = @@ -241,7 +227,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "objc_use_dotd_pruning", defaultValue = "true", - category = "flags", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, help = @@ -253,7 +238,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "enable_apple_binary_native_protos", defaultValue = "true", - category = "flags", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, @@ -264,7 +248,6 @@ public class ObjcCommandLineOptions extends FragmentOptions { @Option( name = "experimental_objc_header_thinning", defaultValue = "false", - category = "flags", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = {OptionEffectTag.CHANGES_INPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = {OptionMetadataTag.EXPERIMENTAL}, diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java index 1e2db33d31..295857633c 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoConfiguration.java @@ -54,7 +54,6 @@ public class ProtoConfiguration extends Fragment { name = "protocopt", allowMultiple = true, defaultValue = "", - category = "flags", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "Additional options to pass to the protobuf compiler." @@ -64,7 +63,6 @@ public class ProtoConfiguration extends Fragment { @Option( name = "experimental_proto_extra_actions", defaultValue = "false", - category = "experimental", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = {OptionMetadataTag.EXPERIMENTAL}, @@ -75,7 +73,6 @@ public class ProtoConfiguration extends Fragment { @Option( name = "proto_compiler", defaultValue = "@com_google_protobuf//:protoc", - category = "flags", converter = BuildConfiguration.LabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, @@ -86,7 +83,6 @@ public class ProtoConfiguration extends Fragment { @Option( name = "proto_toolchain_for_javalite", defaultValue = "@com_google_protobuf_javalite//:javalite_toolchain", - category = "flags", converter = BuildConfiguration.EmptyToNullLabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, @@ -97,7 +93,6 @@ public class ProtoConfiguration extends Fragment { @Option( name = "proto_toolchain_for_java", defaultValue = "@com_google_protobuf//:java_toolchain", - category = "flags", converter = BuildConfiguration.EmptyToNullLabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, @@ -108,7 +103,6 @@ public class ProtoConfiguration extends Fragment { @Option( name = "proto_toolchain_for_cc", defaultValue = "@com_google_protobuf//:cc_toolchain", - category = "flags", converter = BuildConfiguration.EmptyToNullLabelConverter.class, documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, @@ -120,7 +114,6 @@ public class ProtoConfiguration extends Fragment { name = "strict_proto_deps", defaultValue = "strict", converter = BuildConfiguration.StrictDepsConverter.class, - category = "semantics", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS, OptionEffectTag.EAGERNESS_TO_EXIT}, metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, @@ -133,7 +126,6 @@ public class ProtoConfiguration extends Fragment { @Option( name = "cc_proto_library_header_suffixes", defaultValue = ".pb.h", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, help = "Sets the prefixes of header files that a cc_proto_library creates.", @@ -144,7 +136,6 @@ public class ProtoConfiguration extends Fragment { @Option( name = "cc_proto_library_source_suffixes", defaultValue = ".pb.cc", - category = "semantics", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, help = "Sets the prefixes of source files that a cc_proto_library creates.", @@ -157,7 +148,6 @@ public class ProtoConfiguration extends Fragment { @Option( name = "correctRollupTransitiveProtoRuntimes", defaultValue = "true", - category = "rollout", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, @@ -169,7 +159,6 @@ public class ProtoConfiguration extends Fragment { @Option( name = "jplNonStrictDepsLikePl", defaultValue = "true", - category = "rollout", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, diff --git a/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java b/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java index 8138485d47..7632b776d4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/python/PythonOptions.java @@ -45,7 +45,6 @@ public class PythonOptions extends FragmentOptions { @Option( name = "force_python", defaultValue = "null", - category = "version", converter = PythonVersionConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, @@ -56,7 +55,6 @@ public class PythonOptions extends FragmentOptions { @Option( name = "host_force_python", defaultValue = "null", - category = "version", converter = PythonVersionConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java index ee72a4c838..7fcbbcd95a 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandEventHandler.java @@ -63,7 +63,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "show_progress", defaultValue = "true", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Display progress messages during a build." @@ -73,7 +72,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "show_task_finish", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Display progress messages when tasks complete, not just when they start." @@ -83,7 +81,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "show_progress_rate_limit", defaultValue = "0.2", // A nice middle ground; snappy but not too spammy in logs. - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Minimum number of seconds between progress messages in the output." @@ -94,7 +91,6 @@ public class BlazeCommandEventHandler implements EventHandler { name = "color", defaultValue = "auto", converter = UseColorConverter.class, - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Use terminal controls to colorize output." @@ -105,7 +101,6 @@ public class BlazeCommandEventHandler implements EventHandler { name = "curses", defaultValue = "auto", converter = UseCursesConverter.class, - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Use terminal cursor controls to minimize scrolling output" @@ -154,7 +149,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "show_timestamps", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Include timestamps in messages" @@ -164,7 +158,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "progress_in_terminal_title", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -176,7 +169,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "experimental_external_repositories", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Use external repositories for improved stability and speed when available." @@ -186,7 +178,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "force_experimental_external_repositories", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Forces --experimental_external_repositories." @@ -196,7 +187,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "experimental_ui", defaultValue = "true", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -218,7 +208,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "experimental_ui_actions_shown", defaultValue = "8", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -232,7 +221,6 @@ public class BlazeCommandEventHandler implements EventHandler { @Option( name = "experimental_ui_limit_console_output", defaultValue = "0", - category = "verbosity", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java index a640e6ff42..aaa7f05806 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java @@ -110,7 +110,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "output_base", defaultValue = "null", // NOTE: purely decorative! See class docstring. - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOSES_INCREMENTAL_STATE}, converter = OptionsUtils.PathFragmentConverter.class, @@ -131,7 +130,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "output_user_root", defaultValue = "null", // NOTE: purely decorative! See class docstring. - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOSES_INCREMENTAL_STATE}, converter = OptionsUtils.PathFragmentConverter.class, @@ -144,14 +142,13 @@ public class BlazeServerStartupOptions extends OptionsBase { public PathFragment outputUserRoot; /** - * Note: This option is only used by the C++ client, never by the Java server. - * It is included here to make sure that the option is documented in the help - * output, which is auto-generated by Java code. + * Note: This option is only used by the C++ client, never by the Java server. It is included here + * to make sure that the option is documented in the help output, which is auto-generated by Java + * code. */ @Option( name = "server_jvm_out", defaultValue = "null", // NOTE: purely decorative! See class docstring. - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOSES_INCREMENTAL_STATE}, converter = OptionsUtils.PathFragmentConverter.class, @@ -178,7 +175,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "max_idle_secs", defaultValue = "" + (3 * 3600), // NOTE: purely decorative! See class docstring. - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.EAGERNESS_TO_EXIT, OptionEffectTag.LOSES_INCREMENTAL_STATE}, valueHelp = "<integer>", @@ -191,7 +187,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "batch", defaultValue = "false", // NOTE: purely decorative! See class docstring. - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = { OptionEffectTag.LOSES_INCREMENTAL_STATE, @@ -206,7 +201,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "deep_execroot", defaultValue = "true", // NOTE: purely decorative! See class docstring. - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.EXECUTION}, help = @@ -218,7 +212,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "experimental_oom_more_eagerly", defaultValue = "false", // NOTE: purely decorative! See class docstring. - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.EAGERNESS_TO_EXIT}, help = @@ -232,7 +225,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "experimental_oom_more_eagerly_threshold", defaultValue = "100", // NOTE: purely decorative! See class docstring. - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.EAGERNESS_TO_EXIT}, help = @@ -245,7 +237,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "block_for_lock", defaultValue = "true", // NOTE: purely decorative! See class docstring. - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.EAGERNESS_TO_EXIT}, help = @@ -257,7 +248,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "io_nice_level", defaultValue = "-1", // NOTE: purely decorative! - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS}, valueHelp = "{-1,0,1,2,3,4,5,6,7}", @@ -272,7 +262,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "batch_cpu_scheduling", defaultValue = "false", // NOTE: purely decorative! - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS}, help = @@ -285,7 +274,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "blazerc", defaultValue = "null", // NOTE: purely decorative! - category = "misc", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.CHANGES_INPUTS}, valueHelp = "<path>", @@ -301,7 +289,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "master_blazerc", defaultValue = "true", // NOTE: purely decorative! - category = "misc", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.CHANGES_INPUTS}, help = "If this option is false, the master %{product}rc next to the binary is not read." @@ -333,7 +320,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "watchfs", defaultValue = "false", - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.UNKNOWN}, metadataTags = OptionMetadataTag.DEPRECATED, @@ -397,7 +383,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "client_debug", defaultValue = "false", // NOTE: purely decorative! - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING}, help = @@ -409,7 +394,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "connect_timeout_secs", defaultValue = "30", - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION}, help = "The amount of time the client waits for each attempt to connect to the server" @@ -419,7 +403,6 @@ public class BlazeServerStartupOptions extends OptionsBase { @Option( name = "expand_configs_in_place", defaultValue = "true", // NOTE: purely decorative! - category = "server startup", documentationCategory = OptionDocumentationCategory.BAZEL_CLIENT_OPTIONS, effectTags = {OptionEffectTag.BAZEL_INTERNAL_CONFIGURATION, OptionEffectTag.CHANGES_INPUTS}, metadataTags = {OptionMetadataTag.EXPERIMENTAL}, diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java index ea9c7fa057..4c37fab659 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/CommonCommandOptions.java @@ -40,7 +40,6 @@ public class CommonCommandOptions extends OptionsBase { @Option( name = "all_incompatible_changes", defaultValue = "null", - category = "misc", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, @@ -54,7 +53,6 @@ public class CommonCommandOptions extends OptionsBase { @Option( name = "config", defaultValue = "", - category = "misc", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, allowMultiple = true, @@ -71,7 +69,6 @@ public class CommonCommandOptions extends OptionsBase { @Option( name = "logging", defaultValue = "3", // Level.INFO - category = "verbosity", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, converter = Converters.LogLevelConverter.class, @@ -93,7 +90,6 @@ public class CommonCommandOptions extends OptionsBase { @Option( name = "announce_rc", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = "Whether to announce rc options." @@ -112,7 +108,6 @@ public class CommonCommandOptions extends OptionsBase { @Option( name = "allow_undefined_configs", defaultValue = "true", - category = "flags", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.EAGERNESS_TO_EXIT}, help = "Do not throw an error when the config is not defined." @@ -201,7 +196,6 @@ public class CommonCommandOptions extends OptionsBase { @Option( name = "profile", defaultValue = "null", - category = "misc", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING}, converter = OptionsUtils.PathFragmentConverter.class, @@ -293,7 +287,6 @@ public class CommonCommandOptions extends OptionsBase { @Option( name = "tool_tag", defaultValue = "", - category = "misc", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.BAZEL_MONITORING}, help = "A tool name to attribute this Blaze invocation to." diff --git a/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java index 3a6a3dde16..7e02b253ee 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/HostJvmStartupOptions.java @@ -32,7 +32,6 @@ public class HostJvmStartupOptions extends OptionsBase { @Option( name = "host_javabase", defaultValue = "", // NOTE: purely decorative! See BlazeServerStartupOptions. - category = "host jvm startup", valueHelp = "<jvm path>", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -43,7 +42,6 @@ public class HostJvmStartupOptions extends OptionsBase { @Option( name = "host_jvm_args", defaultValue = "", // NOTE: purely decorative! See BlazeServerStartupOptions. - category = "host jvm startup", allowMultiple = true, valueHelp = "<jvm_arg>", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, @@ -55,7 +53,6 @@ public class HostJvmStartupOptions extends OptionsBase { @Option( name = "host_jvm_profile", defaultValue = "", // NOTE: purely decorative! See BlazeServerStartupOptions. - category = "host jvm startup", valueHelp = "<profiler_name>", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, @@ -69,7 +66,6 @@ public class HostJvmStartupOptions extends OptionsBase { @Option( name = "host_jvm_debug", defaultValue = "null", // NOTE: purely decorative! See BlazeServerStartupOptions. - category = "host jvm startup", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = diff --git a/src/main/java/com/google/devtools/build/lib/runtime/KeepGoingOption.java b/src/main/java/com/google/devtools/build/lib/runtime/KeepGoingOption.java index bad70e2295..7468bb7507 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/KeepGoingOption.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/KeepGoingOption.java @@ -24,7 +24,6 @@ public class KeepGoingOption extends OptionsBase { name = "keep_going", abbrev = 'k', defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY, effectTags = {OptionEffectTag.EAGERNESS_TO_EXIT}, help = diff --git a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java index 4cf3567fc5..320cc54e64 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/TerminalTestResultNotifier.java @@ -55,7 +55,6 @@ public class TerminalTestResultNotifier implements TestResultNotifier { @Option( name = "verbose_test_summary", defaultValue = "true", - category = "verbosity", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -67,7 +66,6 @@ public class TerminalTestResultNotifier implements TestResultNotifier { @Option( name = "test_verbose_timeout_warnings", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, help = diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java index d17b281fbb..1a450b7fad 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java @@ -55,7 +55,6 @@ public final class CanonicalizeCommand implements BlazeCommand { @Option( name = "for_command", defaultValue = "build", - category = "misc", documentationCategory = OptionDocumentationCategory.GENERIC_INPUTS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.TERMINAL_OUTPUT}, help = "The command for which the options should be canonicalized." diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java index 368a5b362b..d848d47469 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java @@ -60,7 +60,6 @@ public final class CleanCommand implements BlazeCommand { @Option( name = "expunge", defaultValue = "false", - category = "clean", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS}, help = @@ -73,7 +72,6 @@ public final class CleanCommand implements BlazeCommand { @Option( name = "expunge_async", defaultValue = "null", - category = "clean", expansion = {"--expunge", "--async"}, documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS}, @@ -89,7 +87,6 @@ public final class CleanCommand implements BlazeCommand { @Option( name = "async", defaultValue = "false", - category = "clean", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS}, help = diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java index b7605e4b87..cadda32a2d 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/DumpCommand.java @@ -78,7 +78,6 @@ public class DumpCommand implements BlazeCommand { @Option( name = "packages", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.BAZEL_MONITORING}, help = "Dump package cache content." @@ -88,7 +87,6 @@ public class DumpCommand implements BlazeCommand { @Option( name = "action_cache", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.BAZEL_MONITORING}, help = "Dump action cache content." @@ -98,7 +96,6 @@ public class DumpCommand implements BlazeCommand { @Option( name = "action_graph", defaultValue = "null", - category = "verbosity", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.BAZEL_MONITORING}, help = "Dump action graph to the specified path." @@ -109,7 +106,6 @@ public class DumpCommand implements BlazeCommand { name = "action_graph:targets", converter = CommaSeparatedOptionListConverter.class, defaultValue = "...", - category = "verbosity", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.BAZEL_MONITORING}, help = @@ -121,7 +117,6 @@ public class DumpCommand implements BlazeCommand { @Option( name = "action_graph:include_cmdline", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.BAZEL_MONITORING}, help = @@ -133,7 +128,6 @@ public class DumpCommand implements BlazeCommand { @Option( name = "rule_classes", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.BAZEL_MONITORING}, help = "Dump rule classes." @@ -143,7 +137,6 @@ public class DumpCommand implements BlazeCommand { @Option( name = "rules", defaultValue = "false", - category = "verbosity", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.BAZEL_MONITORING}, help = "Dump rules, including counts and memory usage (if memory is tracked)." @@ -153,7 +146,6 @@ public class DumpCommand implements BlazeCommand { @Option( name = "skylark_memory", defaultValue = "null", - category = "verbosity", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.BAZEL_MONITORING}, help = @@ -165,7 +157,6 @@ public class DumpCommand implements BlazeCommand { @Option( name = "skyframe", defaultValue = "off", - category = "verbosity", converter = SkyframeDumpEnumConverter.class, documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.BAZEL_MONITORING}, diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java index 753f6def36..aa6cd6eaf4 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoCommand.java @@ -68,7 +68,6 @@ public class InfoCommand implements BlazeCommand { @Option( name = "show_make_env", defaultValue = "false", - category = "misc", documentationCategory = OptionDocumentationCategory.LOGGING, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.TERMINAL_OUTPUT}, help = "Include the \"Make\" environment in the output." diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java index c6eb0a3f9d..9b61941914 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/PrintActionCommand.java @@ -90,7 +90,6 @@ public final class PrintActionCommand implements BlazeCommand { name = "print_action_mnemonics", allowMultiple = true, defaultValue = "", - category = "print_action", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java index fea730fbdd..66b4e676e0 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/RunCommand.java @@ -110,9 +110,8 @@ public class RunCommand implements BlazeCommand { public static class RunOptions extends OptionsBase { @Option( name = "direct_run", - category = "run", defaultValue = "false", - documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, + documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.EXECUTION}, help = "If set, the 'run' command will execute the binary to be executed in the terminal " + "where the command was called. Otherwise, it'll be executed as a child of the server " @@ -123,7 +122,6 @@ public class RunCommand implements BlazeCommand { @Option( name = "script_path", - category = "run", defaultValue = "null", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.EXECUTION}, diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/ShutdownCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/ShutdownCommand.java index 4808b39b24..20476795b2 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/ShutdownCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/ShutdownCommand.java @@ -42,7 +42,6 @@ public final class ShutdownCommand implements BlazeCommand { @Option( name = "iff_heap_size_greater_than", defaultValue = "0", - category = "misc", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE, OptionEffectTag.EAGERNESS_TO_EXIT}, help = diff --git a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java index 8c8aa087a9..c65b401c12 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java @@ -112,7 +112,6 @@ public class MobileInstallCommand implements BlazeCommand { @Option( name = "split_apks", defaultValue = "false", - category = "mobile-install", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, help = @@ -124,10 +123,8 @@ public class MobileInstallCommand implements BlazeCommand { @Option( name = "incremental", - category = "mobile-install", defaultValue = "false", documentationCategory = OptionDocumentationCategory.OUTPUT_SELECTION, - effectTags = OptionEffectTag.LOADING_AND_ANALYSIS, help = "Whether to do an incremental install. If true, try to avoid unnecessary additional " @@ -139,7 +136,6 @@ public class MobileInstallCommand implements BlazeCommand { @Option( name = "mode", - category = "mobile-install", defaultValue = "classic", converter = ModeConverter.class, documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY, @@ -156,7 +152,6 @@ public class MobileInstallCommand implements BlazeCommand { @Option( name = "mobile_install_aspect", - category = "mobile-install", defaultValue = "@android_test_support//tools/android/mobile_install:mobile-install.bzl", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.CHANGES_INPUTS}, diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxOptions.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxOptions.java index faaaaa3f90..6a5b79f0fc 100644 --- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxOptions.java +++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxOptions.java @@ -77,7 +77,6 @@ public class SandboxOptions extends OptionsBase { @Option( name = "ignore_unsupported_sandboxing", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Do not print a warning when sandboxed execution is not supported on this system." @@ -87,7 +86,6 @@ public class SandboxOptions extends OptionsBase { @Option( name = "sandbox_debug", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -99,7 +97,6 @@ public class SandboxOptions extends OptionsBase { @Option( name = "experimental_sandbox_base", defaultValue = "", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -113,7 +110,6 @@ public class SandboxOptions extends OptionsBase { @Option( name = "sandbox_fake_hostname", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Change the current hostname to 'localhost' for sandboxed actions." @@ -123,7 +119,6 @@ public class SandboxOptions extends OptionsBase { @Option( name = "sandbox_fake_username", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Change the current username to 'nobody' for sandboxed actions." @@ -134,7 +129,6 @@ public class SandboxOptions extends OptionsBase { name = "sandbox_block_path", allowMultiple = true, defaultValue = "", - category = "config", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "For sandboxed actions, disallow access to this path." @@ -145,7 +139,6 @@ public class SandboxOptions extends OptionsBase { name = "sandbox_tmpfs_path", allowMultiple = true, defaultValue = "", - category = "config", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -158,7 +151,6 @@ public class SandboxOptions extends OptionsBase { name = "sandbox_writable_path", allowMultiple = true, defaultValue = "", - category = "config", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -172,7 +164,6 @@ public class SandboxOptions extends OptionsBase { allowMultiple = true, converter = MountPairConverter.class, defaultValue = "", - category = "config", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Add additional path pair to mount in sandbox." @@ -182,7 +173,6 @@ public class SandboxOptions extends OptionsBase { @Option( name = "experimental_use_sandboxfs", defaultValue = "false", - category = "config", documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -194,7 +184,6 @@ public class SandboxOptions extends OptionsBase { @Option( name = "experimental_sandboxfs_path", defaultValue = "sandboxfs", - category = "config", documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY, effectTags = {OptionEffectTag.UNKNOWN}, help = diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/LocalDiffAwareness.java b/src/main/java/com/google/devtools/build/lib/skyframe/LocalDiffAwareness.java index 76cfd37d8b..e75ffe785e 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/LocalDiffAwareness.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/LocalDiffAwareness.java @@ -50,7 +50,6 @@ public abstract class LocalDiffAwareness implements DiffAwareness { @Option( name = "watchfs", defaultValue = "false", - category = "server startup", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java index cf9bd2268c..1625b0f6a3 100644 --- a/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java +++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerOptions.java @@ -31,7 +31,6 @@ public class WorkerOptions extends OptionsBase { @Option( name = "experimental_persistent_javac", defaultValue = "null", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "Enable the experimental persistent Java compiler.", @@ -48,7 +47,6 @@ public class WorkerOptions extends OptionsBase { @Option( name = "worker_max_instances", defaultValue = "4", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -60,7 +58,6 @@ public class WorkerOptions extends OptionsBase { @Option( name = "worker_quit_after_build", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "If enabled, all workers quit after a build is done." @@ -70,7 +67,6 @@ public class WorkerOptions extends OptionsBase { @Option( name = "worker_verbose", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "If enabled, prints verbose messages when workers are started, shutdown, ..." @@ -81,7 +77,6 @@ public class WorkerOptions extends OptionsBase { name = "worker_extra_flag", converter = Converters.AssignmentConverter.class, defaultValue = "", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = @@ -94,7 +89,6 @@ public class WorkerOptions extends OptionsBase { @Option( name = "worker_sandboxing", defaultValue = "false", - category = "strategy", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, help = "If enabled, workers will be executed in a sandboxed environment." diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java index af23651dfd..06fabd6c51 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java @@ -79,7 +79,6 @@ public abstract class ConfigurationTestCase extends FoundationTestCase { documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.NO_OP}, defaultValue = "", - category = "semantics", help = "Additional target CPUs." ) public List<String> multiCpus; diff --git a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java index 85935efd55..a05bd37959 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java @@ -42,7 +42,6 @@ public class AbstractCommandTest { public static class FooOptions extends OptionsBase { @Option( name = "foo", - category = "one", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.NO_OP}, defaultValue = "0" @@ -53,7 +52,6 @@ public class AbstractCommandTest { public static class BarOptions extends OptionsBase { @Option( name = "bar", - category = "two", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.NO_OP}, defaultValue = "42" @@ -62,7 +60,6 @@ public class AbstractCommandTest { @Option( name = "baz", - category = "one", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.NO_OP}, defaultValue = "oops" diff --git a/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java b/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java index 2d7d2f75f9..4e8e8871d9 100644 --- a/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java +++ b/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java @@ -42,7 +42,6 @@ public class OptionsUtilsTest { public static class IntrospectionExample extends OptionsBase { @Option( name = "alpha", - category = "one", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.NO_OP}, defaultValue = "alpha" @@ -51,7 +50,6 @@ public class OptionsUtilsTest { @Option( name = "beta", - category = "one", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.NO_OP}, defaultValue = "beta" @@ -108,7 +106,6 @@ public class OptionsUtilsTest { public static class BooleanOpts extends OptionsBase { @Option( name = "b_one", - category = "xyz", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.NO_OP}, defaultValue = "true" @@ -117,7 +114,6 @@ public class OptionsUtilsTest { @Option( name = "b_two", - category = "123", // Not printed in usage messages! documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.NO_OP}, defaultValue = "false" |