From 59a0e4f10bf037dcd4f257b2e21573fa1b690e93 Mon Sep 17 00:00:00 2001 From: ccalvarin Date: Fri, 30 Jun 2017 16:01:36 +0200 Subject: Enforce the new category and effect tags. All options need to explicitly list their category and effect. If they are uncategorized, this makes the lack of information obvious. Remove defaults from the annotation to enforce this. Also enforce the sanity check that no option should have UNKNOWN or NO_OP effects listed with other effect tags. Includes some last default sets for options I missed in the previous mass-setting change, and some that were added since. PiperOrigin-RevId: 160641861 --- src/objc_tools/plmerge/BUILD | 2 ++ .../java/com/google/devtools/build/xcode/plmerge/PlMerge.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/objc_tools') diff --git a/src/objc_tools/plmerge/BUILD b/src/objc_tools/plmerge/BUILD index 49aafc28ca..acaeb9abf8 100644 --- a/src/objc_tools/plmerge/BUILD +++ b/src/objc_tools/plmerge/BUILD @@ -8,6 +8,7 @@ java_binary( deps = [ ":plmerge_lib", "//src/main/java/com/google/devtools/common/options", + "//src/main/protobuf:option_filters_java_proto", "//src/main/protobuf:plmerge_java_proto", "//third_party:guava", "//third_party/java/dd_plist", @@ -21,6 +22,7 @@ java_library( ), deps = [ "//src/main/java/com/google/devtools/common/options", + "//src/main/protobuf:option_filters_java_proto", "//src/main/protobuf:plmerge_java_proto", "//src/tools/xcode-common/java/com/google/devtools/build/xcode/common", "//src/tools/xcode-common/java/com/google/devtools/build/xcode/util", diff --git a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java index 8f9f558938..8b24917e32 100644 --- a/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java +++ b/src/objc_tools/plmerge/java/com/google/devtools/build/xcode/plmerge/PlMerge.java @@ -17,11 +17,12 @@ package com.google.devtools.build.xcode.plmerge; import com.google.common.base.Strings; import com.google.devtools.build.xcode.plmerge.proto.PlMergeProtos.Control; import com.google.devtools.common.options.Option; +import com.google.devtools.common.options.OptionDocumentationCategory; import com.google.devtools.common.options.Options; import com.google.devtools.common.options.OptionsBase; import com.google.devtools.common.options.OptionsParser; import com.google.devtools.common.options.OptionsParsingException; - +import com.google.devtools.common.options.proto.OptionFilters.OptionEffectTag; import java.io.IOException; import java.io.InputStream; import java.nio.file.FileSystem; @@ -44,6 +45,8 @@ public class PlMerge { @Option( name = "control", help = "Absolute path of the Control protobuf.", + documentationCategory = OptionDocumentationCategory.UNCATEGORIZED, + effectTags = {OptionEffectTag.UNKNOWN}, defaultValue = "null" ) public String controlPath; -- cgit v1.2.3