From 3a8d07d0e53742ce7937b332b09191cf83d4083b Mon Sep 17 00:00:00 2001 From: aiuto Date: Mon, 30 Aug 2021 14:16:59 -0700 Subject: [PATCH] Remove TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES tag from options. It us unused. Followup CLs: - remove use of TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES in non-Bazel test data - remove TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES from the remainder of Bazel - remove --all_incompatible_changes from any CI specifications - delete the option See: https://github.com/bazelbuild/bazel/issues/13892 RELNOTES: The --all_incompatible_changes flag is now a no-op PiperOrigin-RevId: 393851730 --- .../build/lib/analysis/PlatformOptions.java | 15 +-- .../lib/analysis/config/CoreOptions.java | 15 +-- .../lib/analysis/test/TestConfiguration.java | 5 +- .../bazel/rules/BazelRuleClassProvider.java | 5 +- .../lib/bazel/rules/BazelRulesModule.java | 118 +++-------------- .../lib/buildtool/BuildRequestOptions.java | 5 +- .../semantics/BuildLanguageOptions.java | 125 ++++-------------- .../build/lib/pkgcache/PackageOptions.java | 30 ++--- .../lib/query2/aquery/AqueryOptions.java | 1 - .../lib/query2/common/CommonQueryOptions.java | 5 +- .../lib/query2/query/output/QueryOptions.java | 5 +- .../lib/remote/options/RemoteOptions.java | 15 +-- .../rules/android/AndroidConfiguration.java | 10 +- .../build/lib/rules/cpp/CppOptions.java | 90 +++---------- .../build/lib/rules/java/JavaOptions.java | 15 +-- .../rules/objc/ObjcCommandLineOptions.java | 10 +- .../lib/rules/proto/ProtoConfiguration.java | 5 +- .../build/lib/rules/python/PythonOptions.java | 35 +---- .../build/lib/sandbox/SandboxOptions.java | 5 +- 19 files changed, 105 insertions(+), 409 deletions(-) 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 8ba1dc1b26cbbe..096856d9878ac1 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 @@ -165,10 +165,7 @@ public class PlatformOptions extends FragmentOptions { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, the host platform will be inherited from @local_config_platform//:host, " + "instead of being based on the --cpu (and --host_cpu) flags.") @@ -179,10 +176,7 @@ public class PlatformOptions extends FragmentOptions { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = OptionEffectTag.UNKNOWN, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "No-op. Kept here for backwards compatibility.") public boolean useToolchainResolutionForJavaRules; @@ -225,10 +219,7 @@ public class PlatformOptions extends FragmentOptions { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = OptionEffectTag.LOADING_AND_ANALYSIS, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, all rules will use the toolchain transition for toolchain dependencies.") public boolean overrideToolchainTransition; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java index 30e53782bfe452..296967ab99c13c 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java @@ -64,10 +64,7 @@ public class CoreOptions extends FragmentOptions implements Cloneable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, the genfiles directory is folded into the bin directory.") public boolean mergeGenfilesDirectory; @@ -76,10 +73,7 @@ public class CoreOptions extends FragmentOptions implements Cloneable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, constraint settings from @bazel_tools are removed.") public boolean usePlatformsRepoForConstraints; @@ -703,10 +697,7 @@ public OutputPathsConverter() { OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS }, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Use graphless query and disable output ordering for genquery.") public Void incompatibleUseGraphlessQuery; 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 dd87183c1b8c08..f2f5a7450cf3a7 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 @@ -284,10 +284,7 @@ public static class TestOptions extends FragmentOptions { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, exclusive tests will run with sandboxed strategy. Add 'local' tag to force " + "an exclusive test run locally") diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index d425a04145da7d..c8d0d85753a694 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -150,10 +150,7 @@ public static class StrictActionEnvOptions extends FragmentOptions { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, Bazel uses an environment with a static value for PATH and does not " + "inherit LD_LIBRARY_PATH or TMPDIR. Use --action_env=ENV_VARIABLE if you want to " diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java index 3d1b771dcbdf4c..3675bad0845450 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRulesModule.java @@ -57,10 +57,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.NO_OP}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean disableLegacyProtoProvider; @@ -69,10 +66,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.NO_OP}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean disableProtoSourceRoot; @@ -81,11 +75,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.NO_OP}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean doNotUseBuggyImportPath; @@ -96,7 +86,6 @@ public static class BuildGraveyardOptions extends OptionsBase { effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = { OptionMetadataTag.DEPRECATED, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, OptionMetadataTag.INCOMPATIBLE_CHANGE }, help = "Deprecated no-op.") @@ -108,10 +97,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean disableLegacyCrosstoolFields; @@ -120,11 +106,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean requireFeatureConfigurationForPic; @@ -133,11 +115,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean disableDepsetInUserFlags; @@ -147,11 +125,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean disableEmittingStaticLibgcc; @@ -160,11 +134,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean enableLinkoptsInUserLinkFlags; @@ -173,11 +143,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "false", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES, OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean disableRuntimesFilegroups; @@ -188,7 +154,6 @@ public static class BuildGraveyardOptions extends OptionsBase { effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = { OptionMetadataTag.DEPRECATED, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, OptionMetadataTag.INCOMPATIBLE_CHANGE }, help = "Deprecated no-op.") @@ -217,11 +182,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean disableSysrootFromConfiguration; @@ -230,11 +191,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean provideCcToolchainInfoFromCcToolchainSuite; @@ -243,11 +200,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.EAGERNESS_TO_EXIT}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean disableCcToolchainFromCrosstool; @@ -258,7 +211,6 @@ public static class BuildGraveyardOptions extends OptionsBase { effectTags = {OptionEffectTag.UNKNOWN}, metadataTags = { OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, OptionMetadataTag.DEPRECATED, }, help = "Deprecated no-op.") @@ -271,7 +223,6 @@ public static class BuildGraveyardOptions extends OptionsBase { effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, metadataTags = { OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, OptionMetadataTag.DEPRECATED }, help = @@ -286,7 +237,6 @@ public static class BuildGraveyardOptions extends OptionsBase { effectTags = {OptionEffectTag.UNKNOWN}, metadataTags = { OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, OptionMetadataTag.DEPRECATED }, help = "Obsolete, no effect.") @@ -299,7 +249,6 @@ public static class BuildGraveyardOptions extends OptionsBase { effectTags = {OptionEffectTag.UNKNOWN}, metadataTags = { OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, OptionMetadataTag.DEPRECATED }, help = "Obsolete, no effect.") @@ -310,11 +259,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.NO_OP}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "This option is deprecated and has no effect.") public boolean incompatibleDisableLateBoundOptionDefaults; @@ -333,10 +278,7 @@ public static class BuildGraveyardOptions extends OptionsBase { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "No-op.") public boolean enableProfileByDefault; @@ -368,10 +310,7 @@ public static final class BazelBuildGraveyardOptions extends BuildGraveyardOptio defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean loadPythonRulesFromBzl; @@ -380,10 +319,7 @@ public static final class BazelBuildGraveyardOptions extends BuildGraveyardOptio defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean loadProtoRulesFromBzl; @@ -392,10 +328,7 @@ public static final class BazelBuildGraveyardOptions extends BuildGraveyardOptio defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated no-op.") public boolean loadJavaRulesFromBzl; @@ -417,7 +350,6 @@ public static final class BazelBuildGraveyardOptions extends BuildGraveyardOptio oldName = "experimental_cc_coverage", metadataTags = { OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, OptionMetadataTag.DEPRECATED }, help = "Obsolete, no effect.") @@ -465,11 +397,7 @@ public static final class BazelBuildGraveyardOptions extends BuildGraveyardOptio defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.NO_OP}, - metadataTags = { - OptionMetadataTag.DEPRECATED, - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.DEPRECATED, OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "This option is deprecated and has no effect.") public boolean useNativePatch; @@ -486,10 +414,7 @@ public static final class BazelBuildGraveyardOptions extends BuildGraveyardOptio defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "No-op.") public boolean removeBinaryProfile; @@ -506,10 +431,7 @@ public static final class BazelBuildGraveyardOptions extends BuildGraveyardOptio defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "No-op") public boolean dontUseJavaSourceInfoProvider; } 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 89d6031fc88e58..44b713a838ade9 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 @@ -433,10 +433,7 @@ public boolean useTopLevelTargetsForSymlinks() { name = "incompatible_skip_genfiles_symlink", defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, effectTags = {OptionEffectTag.LOSES_INCREMENTAL_STATE}, help = "If set to true, the genfiles symlink will not be created. For more information, see " diff --git a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java index 480eac7875afd9..b5070bbd708613 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java +++ b/src/main/java/com/google/devtools/build/lib/packages/semantics/BuildLanguageOptions.java @@ -151,10 +151,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS, OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "This flag enables exports provider and JavaInfo.transitive_exports call.") public boolean incompatibleEnableExportsProvider; @@ -207,10 +204,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS, OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, rule create_linking_context will require linker_inputs instead of " + "libraries_to_link. The old getters of linking_context will also be disabled and " @@ -283,10 +277,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Disables the to_json and to_proto methods of struct, which pollute the struct field" + " namespace. Instead, use json.encode or json.encode_indent for JSON, or" @@ -298,10 +289,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Check the validity of elements added to depsets, in all constructors. Elements must be" + " immutable, but historically the depset(direct=...) constructor forgot to check." @@ -314,10 +302,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, disable the ability to access providers on 'target' objects via field " + "syntax. Use provider-key syntax instead. For example, instead of using " @@ -331,10 +316,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, disable the 'items' parameter of the depset constructor. Use " + "the 'transitive' and 'direct' parameters instead.") @@ -353,10 +335,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = OptionEffectTag.BUILD_FILE_SEMANTICS, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, disables all license checking logic") public boolean incompatibleDisableThirdPartyLicenseChecking; @@ -366,10 +345,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { category = "incompatible changes", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, the default value of the `allow_empty` argument of glob() is False.") public boolean incompatibleDisallowEmptyGlob; @@ -378,10 +354,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Deprecated. No-op.") // TODO(elenairina): Move option to graveyard after the flag is removed from the global blazerc. public boolean incompatibleDisallowLegacyJavaInfo; @@ -391,10 +364,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, rule implementation functions may not return a struct. They must " + "instead return a list of provider instances.") @@ -405,10 +375,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, the visibility of private rule attributes is checked with respect " + "to the rule definition, rather than the rule usage.") @@ -419,10 +386,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, the API to create actions is only available on `ctx.actions`, " + "not on `ctx`.") @@ -433,10 +397,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, disables the function `attr.license`.") public boolean incompatibleNoAttrLicense; @@ -446,10 +407,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { // TODO(aiuto): change to OptionDocumentationCategory.STARLARK_SEMANTICS, documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, enables the function `attr.applicable_licenses`.") public boolean incompatibleApplicableLicenses; @@ -458,10 +416,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set, (used) source files are are package private unless exported explicitly. See " + "https://github.com/bazelbuild/proposals/blob/master/designs/" @@ -473,10 +428,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, disables the `outputs` parameter of the `rule()` Starlark function.") public boolean incompatibleNoRuleOutputsParam; @@ -485,10 +437,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, the command parameter of actions.run_shell will only accept string") public boolean incompatibleRunShellCommandString; @@ -505,10 +454,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.BUILD_TIME_OPTIMIZATION, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "When true, Bazel no longer modifies command line flags used for linking, and also " + "doesn't selectively decide which flags go to the param file and which don't. " @@ -520,10 +466,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "When true, Bazel will no longer allow using cc_configure from @bazel_tools. " + "Please see https://github.com/bazelbuild/bazel/issues/10134 for details and " @@ -535,10 +478,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "When true, Bazel no longer returns a list from linking_context.libraries_to_link but " + "returns a depset instead.") @@ -549,10 +489,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, unknown string escapes like `\\a` become rejected.") public boolean incompatibleRestrictStringEscapes; @@ -561,10 +498,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true the default linkopts in the default toolchain are passed as linklibs " + "instead of linkopts to cc_toolchain_config") @@ -575,10 +509,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.BUILD_FILE_SEMANTICS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, the jar_file, and host_javabase parameters in pack_sources and " + "host_javabase in compile will all be removed.") @@ -608,10 +539,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { name = "incompatible_top_level_aspects_require_providers", defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, help = "If set to true, the top level aspect will honor its required providers and only run on" @@ -623,10 +551,7 @@ public class BuildLanguageOptions extends OptionsBase implements Serializable { name = "incompatible_top_level_aspects_dependency", defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, help = "If set to true, a dependency between the top level aspects will be built based on their" diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageOptions.java b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageOptions.java index df3450152aaa3a..ca6f59321831a1 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageOptions.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageOptions.java @@ -122,20 +122,16 @@ public ParallelismConverter() throws OptionsParsingException { ) public RuleVisibility defaultVisibility; - @Option( name = "incompatible_enforce_config_setting_visibility", defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, - help = "If true, enforce config_setting visibility restrictions. If false, every " - + "config_setting is visible to every target. See " - + "https://github.com/bazelbuild/bazel/issues/12932." - ) + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, + help = + "If true, enforce config_setting visibility restrictions. If false, every " + + "config_setting is visible to every target. See " + + "https://github.com/bazelbuild/bazel/issues/12932.") public boolean enforceConfigSettingVisibility; @Option( @@ -143,15 +139,13 @@ public ParallelismConverter() throws OptionsParsingException { defaultValue = "false", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, - help = "If incompatible_enforce_config_setting_visibility=false, this is a noop. Else, if " - + "this flag is false, any config_setting without an explicit visibility attribute is " - + "//visibility:public. If this flag is true, config_setting follows the same visibility " - + "logic as all other rules. See https://github.com/bazelbuild/bazel/issues/12933." - ) + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, + help = + "If incompatible_enforce_config_setting_visibility=false, this is a noop. Else, if this" + + " flag is false, any config_setting without an explicit visibility attribute is" + + " //visibility:public. If this flag is true, config_setting follows the same" + + " visibility logic as all other rules. See" + + " https://github.com/bazelbuild/bazel/issues/12933.") public boolean configSettingPrivateDefaultVisibility; @Option( diff --git a/src/main/java/com/google/devtools/build/lib/query2/aquery/AqueryOptions.java b/src/main/java/com/google/devtools/build/lib/query2/aquery/AqueryOptions.java index 83aac9956ed474..3e003f3ce341c1 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/aquery/AqueryOptions.java +++ b/src/main/java/com/google/devtools/build/lib/query2/aquery/AqueryOptions.java @@ -77,7 +77,6 @@ public class AqueryOptions extends CommonQueryOptions { effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, metadataTags = { OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, OptionMetadataTag.DEPRECATED, }, help = "No-op.") diff --git a/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java b/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java index 6497c2e6f46a80..7ff9e2309a0c17 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java +++ b/src/main/java/com/google/devtools/build/lib/query2/common/CommonQueryOptions.java @@ -165,10 +165,7 @@ public Set toSettings() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "False by default, displays the target of the source file. " + "If true, displays the location of line 1 of source files in location outputs. " diff --git a/src/main/java/com/google/devtools/build/lib/query2/query/output/QueryOptions.java b/src/main/java/com/google/devtools/build/lib/query2/query/output/QueryOptions.java index 97c587762e503f..75c54687eb7521 100644 --- a/src/main/java/com/google/devtools/build/lib/query2/query/output/QueryOptions.java +++ b/src/main/java/com/google/devtools/build/lib/query2/query/output/QueryOptions.java @@ -120,10 +120,7 @@ public enum OrderOutput { defaultValue = "true", documentationCategory = OptionDocumentationCategory.QUERY, effectTags = {OptionEffectTag.TERMINAL_OUTPUT}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If this option is set, sorts --order_output=auto output in lexicographical order.") public boolean lexicographicalOutput; diff --git a/src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java b/src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java index cb2f1639807279..9f087efe6f2ac7 100644 --- a/src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java +++ b/src/main/java/com/google/devtools/build/lib/remote/options/RemoteOptions.java @@ -261,10 +261,7 @@ public String getTypeDescription() { category = "remote", documentationCategory = OptionDocumentationCategory.REMOTE, effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, --noremote_upload_local_results and --noremote_accept_cached will not" + " apply to the disk cache. If a combined cache is used:\n" @@ -281,10 +278,7 @@ public String getTypeDescription() { defaultValue = "false", documentationCategory = OptionDocumentationCategory.REMOTE, effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, output paths are relative to input root instead of working directory.") public boolean incompatibleRemoteOutputPathsRelativeToInputRoot; @@ -352,10 +346,7 @@ public String getTypeDescription() { category = "remote", documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY, effectTags = {OptionEffectTag.EXECUTION}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, Bazel will represent symlinks in action outputs " + "in the remote caching/execution protocol as such. The " 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 ad27bfe44a0d24..b1822156352bd2 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 @@ -783,10 +783,7 @@ public static class Options extends FragmentOptions { effectTags = { OptionEffectTag.EAGERNESS_TO_EXIT, }, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If enabled, direct usage of the native Android rules is disabled. Please use the" + " Starlark Android rules from https://github.com/bazelbuild/rules_android") @@ -797,10 +794,7 @@ public static class Options extends FragmentOptions { defaultValue = "false", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Use toolchain resolution to select the Android SDK for android rules (Starlark and" + " native)") 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 53c1905bab7c13..72bcfb9ef2411d 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 @@ -235,10 +235,7 @@ public String getTypeDescription() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.OUTPUT_PARAMETERS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If enabled, all C++ dynamic linked libraries (DLLs) generated by cc_library on Windows " + "will be renamed to name_{hash}.dll where hash is calculated based on " @@ -766,10 +763,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, Bazel will not enable 'host' and 'nonhost' features in the c++ toolchain " + "(see https://github.com/bazelbuild/bazel/issues/7407 for more information).") @@ -780,10 +774,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, Bazel will not reuse C++ link action command lines for lto indexing command " + "lines (see https://github.com/bazelbuild/bazel/issues/6791 for more information).") @@ -794,10 +785,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, Bazel will require 'ctx' parameter in to cc_common.configure_features " + "(see https://github.com/bazelbuild/bazel/issues/7793 for more information).") @@ -808,10 +796,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, Bazel will also validate top level directory header inclusions " + "(see https://github.com/bazelbuild/bazel/issues/10047 for more information).") @@ -822,10 +807,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, Bazel will not link library dependencies as whole archive by default " + "(see https://github.com/bazelbuild/bazel/issues/7362 for migration instructions).") @@ -836,10 +818,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, Bazel will complain when cc_toolchain.cpu and cc_toolchain.compiler attributes " + "are set " @@ -851,10 +830,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.TOOLCHAIN, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, Bazel will not allow specifying expand_if_all_available in flag_sets" + "(see https://github.com/bazelbuild/bazel/issues/7008 for migration instructions).") @@ -877,10 +853,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, the legacy provider accessible by 'dep.cc.' is removed. See #7036.") // TODO(b/122328491): Document migration steps. See #7036. public boolean disableLegacyCcProvider; @@ -890,10 +863,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, cc rules use toolchain resolution to find the cc_toolchain.") public boolean enableCcToolchainResolution; @@ -911,10 +881,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Use cc toolchain's compiler_files, as_files, and ar_files as inputs to appropriate " + "actions. See https://github.com/bazelbuild/bazel/issues/8531") @@ -925,10 +892,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "@bazel_tools//tools/cpp:default-toolchain target was removed." + "See https://github.com/bazelbuild/bazel/issues/8546.") @@ -939,10 +903,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "When enabled, it removes nocopts attribute from C++ rules. See" + " https://github.com/bazelbuild/bazel/issues/8706 for details.") @@ -953,10 +914,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.ACTION_COMMAND_LINES}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "When enabled, it switches Crosstool to use feature 'is_cc_test' rather than" + " the link-time build variable of the same name.") @@ -967,10 +925,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "No-op flag. Will be removed in a future release.") public boolean loadCcRulesFromBzl; @@ -1006,10 +961,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.INPUT_STRICTNESS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.CHANGES_INPUTS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If enabled, set strict header checking in the Starlark API") public boolean forceStrictHeaderCheckFromStarlark; @@ -1026,10 +978,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.EXECUTION}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If enabled, give distinguishing mnemonic to header processing actions") public boolean useCppCompileHeaderMnemonic; @@ -1038,10 +987,7 @@ public Label getPropellerOptimizeLabel() { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Whether to explicitly set `-install_name` when creating dynamic libraries. " + "See https://github.com/bazelbuild/bazel/issues/12370") 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 a86fa8ce7ee4bd..84835083cdfc3f 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 @@ -480,10 +480,7 @@ public ImportDepsCheckingLevelConverter() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Disables the resource_jars attribute; use java_import and deps or runtime_deps instead.") public boolean disallowResourceJars; @@ -541,10 +538,7 @@ public ImportDepsCheckingLevelConverter() { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "This flag is a noop and scheduled for removal.") public boolean dontCollectDataLibraries; @@ -553,10 +547,7 @@ public ImportDepsCheckingLevelConverter() { defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.UNKNOWN}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "When enabled java_common.compile only accepts JavaPluginInfo for plugins.") public boolean requireJavaPluginInfo; 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 9ecf3270801a53..1abc99d7da7185 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 @@ -192,10 +192,7 @@ public class ObjcCommandLineOptions extends FragmentOptions { OptionEffectTag.EXECUTION, OptionEffectTag.ACTION_COMMAND_LINES, }, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "Prevents Bazel from adding compiler options to Objective-C compilation actions. Options" + " set in the crosstool are still applied.") @@ -208,10 +205,7 @@ public class ObjcCommandLineOptions extends FragmentOptions { effectTags = { OptionEffectTag.EAGERNESS_TO_EXIT, }, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If enabled, direct usage of the native apple_binary rule is disabled. Please use the" + " Starlark rule from https://github.com/bazelbuild/rules_apple instead.") 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 6965865fe36f2e..e8d2b90cbeed78 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 @@ -44,10 +44,7 @@ public static class Options extends FragmentOptions { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set, generated .proto files are put into a virtual import directory. For more " + "information, see https://github.com/bazelbuild/bazel/issues/9215") 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 cc93d3a2163bf4..599e30242fcdd1 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 @@ -80,10 +80,7 @@ public String getTypeDescription() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "No-op, will be removed soon.") public boolean incompatibleRemoveOldPythonVersionApi; @@ -98,10 +95,7 @@ public String getTypeDescription() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "No-op, will be removed soon.") public boolean incompatibleAllowPythonVersionTransitions; @@ -117,10 +111,7 @@ public String getTypeDescription() { OptionEffectTag.LOADING_AND_ANALYSIS, OptionEffectTag.AFFECTS_OUTPUTS // because of "-py2"/"-py3" output root }, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, `py_binary` and `py_test` targets that do not set their `python_version` (or " + "`default_python_version`) attribute will default to PY3 rather than to PY2. If " @@ -133,10 +124,7 @@ public String getTypeDescription() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.GENERIC_INPUTS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If true, targets built in the Python 2 configuration will appear under an output root " + "that includes the suffix '-py2', while targets built for Python 3 will appear " @@ -215,10 +203,7 @@ public String getTypeDescription() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.STARLARK_SEMANTICS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, native Python rules will neither produce nor consume the legacy \"py\" " + "provider. Use PyInfo instead. Under this flag, passing the legacy provider to a " @@ -231,10 +216,7 @@ public String getTypeDescription() { defaultValue = "true", documentationCategory = OptionDocumentationCategory.GENERIC_INPUTS, effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, executable native Python rules will use the Python runtime specified by " + "the Python toolchain, rather than the runtime given by legacy flags like " @@ -256,10 +238,7 @@ public String getTypeDescription() { defaultValue = "false", documentationCategory = OptionDocumentationCategory.GENERIC_INPUTS, effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "This flag changes the default behavior so that __init__.py files are no longer " + "automatically created in the runfiles of Python targets. Precisely, when a " 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 1d4248c3b35ff9..40e20fb129bdd7 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 @@ -350,10 +350,7 @@ public ImmutableSet getInaccessiblePaths(FileSystem fs) { defaultValue = "true", documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY, effectTags = {OptionEffectTag.EXECUTION}, - metadataTags = { - OptionMetadataTag.INCOMPATIBLE_CHANGE, - OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES - }, + metadataTags = {OptionMetadataTag.INCOMPATIBLE_CHANGE}, help = "If set to true, enables the legacy implicit fallback from sandboxed to local strategy." + " This flag will eventually default to false and then become a no-op. Use"