Allow hiding deprecated config options

.plzconfig

@@ -1,7 +1,7 @@
 [parse]
 BlacklistDirs = tree ; The performance test repo
 preloadsubincludes = ///go//build_defs:go
-preloadsubincludes = ///cc//build_defs:cc 
+preloadsubincludes = ///cc//build_defs:cc
 preloadsubincludes = ///python//build_defs:python
 preloadsubincludes = ///shell//build_defs:shell
 
@@ -88,3 +88,6 @@ accept = Artistic License
 accept = ISC
 # Not really a licence, but Bazel projects commonly describe things this way.
 accept = notice
+
+[featureflags]
+hidedeprecatedconfigoptions = true

docs/BUILD

@@ -57,11 +57,11 @@ genrule(
 
 # Plugin versions to pull the docs from
 plugins = {
- "python": "v1.3.0",
+ "python": "v1.4.0",
  "java": "v0.3.0",
  "go": "v1.7.6",
  "cc": "v0.3.2",
- "shell": "v0.1.2",
+ "shell": "v0.2.0",
  "go-proto": "v0.2.0",
  "python-proto": "v0.1.0",
  "proto": "v0.2.1",

plugins/BUILD

@@ -13,11 +13,11 @@ plugin_repo(
 plugin_repo(
  name = "shell",
  plugin = "shell-rules",
- revision = "v0.1.1",
+ revision = "v0.2.0",
 )
 
 plugin_repo(
  name = "python",
  plugin = "python-rules",
- revision = "v1.2.4",
+ revision = "v1.4.0",
 )

src/help/config.go

@@ -78,6 +78,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/parse/asp/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))
+ }
  }
  }
  }

test/build_defs/BUILD

@@ -12,8 +12,8 @@ filegroup(
  name = "build_defs",
  srcs = ["test.build_defs"],
  visibility = [
- "//test/...",
  "//src/test/...",
+ "//test/...",
  ],
 )
 
@@ -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/cross_compile/lib/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/parse/pre_post_build_config/BUILD.test

@@ -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/parse/pre_post_build_config/build_defs/build_foo.build_defs

@@ -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,
  )
-

test/proto_plugin/BUILD

@@ -10,6 +10,6 @@ please_repo_e2e_test(
  plz_command = "plz -o plugin.go.gotool:$TOOLS_GO test",
  repo = "test_repo",
  tools = {
- "go": [CONFIG.GO_TOOL],
+ "go": [CONFIG.GO.GO_TOOL],
  },
 )