Mark config options as deprecated

Author: peterebden

.plzconfig

@@ -92,3 +92,6 @@ accept = notice
 
 [remote]
 url =
+
+[featureflags]
+hidedeprecatedconfigoptions = true

plugins/BUILD

@@ -7,13 +7,13 @@ plugin_repo(
 plugin_repo(
     name = "cc",
     plugin = "cc-rules",
-    revision = "v0.3.2",
+    revision = "v0.4.0",
 )
 
 plugin_repo(
     name = "shell",
     plugin = "shell-rules",
-    revision = "v0.1.1",
+    revision = "v0.2.0",
 )
 
 plugin_repo(

src/core/config.go

@@ -79,6 +79,9 @@ func allConfigHelp(config *core.Configuration) helpSection {
 						help += fmt.Sprintf("\nThis variable is exposed to BUILD rules via the variable ${BOLD_CYAN}CONFIG.%s${RESET},\n"+
 							"and can be overridden package-locally via ${GREEN}package${RESET}(${YELLOW}%s${RESET}='${GREY}<value>${RESET}').\n", v, strings.ToLower(v))
 					}
+					if subt.Tag.Get("deprecated") == "true" {
+						help += "\n${BOLD_RED}This config option is deprecated and will be removed at the next Please major version.${RESET}\n"
+					}
 					sect.Topics[name] = help
 					sect.Topics[sectname+"."+name] = help
 					subfields = append(subfields, "  "+name)

src/help/config.go

@@ -38,12 +38,15 @@ func newConfig(state *core.BuildState) *pyConfig {
 	base := make(pyDict, 100)
 
 	v := reflect.ValueOf(state.Config).Elem()
+	emitDeprecated := !state.Config.FeatureFlags.HideDeprecatedConfigOptions
 	for i := 0; i < v.NumField(); i++ {
 		if field := v.Field(i); field.Kind() == reflect.Struct {
 			for j := 0; j < field.NumField(); j++ {
 				subfieldType := field.Type().Field(j)
 				if varName := subfieldType.Tag.Get("var"); varName != "" {
-					base[varName] = valueToPyObject(field.Field(j))
+					if subfieldType.Tag.Get("deprecated") != "true" || emitDeprecated {
+						base[varName] = valueToPyObject(field.Field(j))
+					}
 				}
 			}
 		}

src/parse/asp/config.go

@@ -25,12 +25,6 @@ filegroup(
     ],
 )
 
-filegroup(
-    name = "cc_embed_binary",
-    srcs = ["cc_embed_binary.build_defs"],
-    visibility = ["//test/..."],
-)
-
 # Used for some of the parse tests that want a subinclude that isn't visible to them.
 filegroup(
     name = "not_visible",

test/build_defs/BUILD

@@ -1,7 +1,7 @@
 # This contains an arbitrary set of rules intended to exercise
 # aspects of the cross-compilation code.
 
-subinclude("//test/build_defs:cc_embed_binary", "///cc//build_defs:c")
+subinclude("///cc//build_defs:c", "///cc//build_defs:cc_embed_binary")
 
 go_binary(
     name = "generator",

test/build_defs/cc_embed_binary.build_defs

@@ -1,6 +1,7 @@
-package(GO_TOOL = "foo")
+package(go = {
+    "go_tool": "foo",
+})
 
 subinclude("//test/parse/pre_post_build_config/build_defs:build_foo")
 
 build_foo(name = "target")
-

test/cross_compile/lib/BUILD

@@ -1,8 +1,8 @@
 def _prebuild(x):
-    assert CONFIG.GO_TOOL == "foo"
+    assert CONFIG.GO.GO_TOOL == "foo"
 
 def _postbuild(x, y):
-    assert CONFIG.GO_TOOL == "foo"
+    assert CONFIG.GO.GO_TOOL == "foo"
 
 def build_foo(name):
     return build_rule(
@@ -11,4 +11,3 @@ def build_foo(name):
         pre_build = _prebuild,
         post_build = _postbuild,
     )
-