diff options
author | lpino <lpino@google.com> | 2017-11-30 06:51:43 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-11-30 06:54:03 -0800 |
commit | 08e48a729feedaa7b3d66b3d683dceaeb4df2711 (patch) | |
tree | bc9e2177dfba860089e9ee5bc8ec28737a724a95 /src/main/java/com/google/devtools | |
parent | f08e9fe3df1928c9df97fd3854bad2b9f953f246 (diff) |
Move BazelRuleClassProvider.CONFIG_RULES to its own class in the config package.
PiperOrigin-RevId: 177447905
Diffstat (limited to 'src/main/java/com/google/devtools')
4 files changed, 49 insertions, 25 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 0e60f09aa6..bfbdd975b2 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -886,7 +886,6 @@ java_library( ), deps = [ "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib/rules/config", "//third_party:guava", ], ) 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 d8ae98d451..5e6c7eed82 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 @@ -97,9 +97,7 @@ import com.google.devtools.build.lib.rules.apple.XcodeVersionRule; import com.google.devtools.build.lib.rules.apple.cpp.AppleCcToolchainRule; import com.google.devtools.build.lib.rules.apple.swift.SwiftCommandLineOptions; import com.google.devtools.build.lib.rules.apple.swift.SwiftConfiguration; -import com.google.devtools.build.lib.rules.config.ConfigFeatureFlagConfiguration; -import com.google.devtools.build.lib.rules.config.ConfigRuleClasses; -import com.google.devtools.build.lib.rules.config.ConfigSkylarkCommon; +import com.google.devtools.build.lib.rules.config.ConfigRules; import com.google.devtools.build.lib.rules.core.CoreRules; import com.google.devtools.build.lib.rules.cpp.CcImportRule; import com.google.devtools.build.lib.rules.cpp.CcIncLibraryRule; @@ -282,26 +280,6 @@ public class BazelRuleClassProvider { } }; - public static final RuleSet CONFIG_RULES = - new RuleSet() { - @Override - public void init(Builder builder) { - builder.addRuleDefinition(new ConfigRuleClasses.ConfigBaseRule()); - builder.addRuleDefinition(new ConfigRuleClasses.ConfigSettingRule()); - - builder.addConfig( - ConfigFeatureFlagConfiguration.Options.class, - new ConfigFeatureFlagConfiguration.Loader()); - builder.addRuleDefinition(new ConfigRuleClasses.ConfigFeatureFlagRule()); - builder.addSkylarkAccessibleTopLevels("config_common", new ConfigSkylarkCommon()); - } - - @Override - public ImmutableList<RuleSet> requires() { - return ImmutableList.of(CoreRules.INSTANCE); - } - }; - public static final RuleSet CORE_WORKSPACE_RULES = new RuleSet() { @Override @@ -662,7 +640,7 @@ public class BazelRuleClassProvider { CoreRules.INSTANCE, CORE_WORKSPACE_RULES, GENERIC_RULES, - CONFIG_RULES, + ConfigRules.INSTANCE, PLATFORM_RULES, PROTO_RULES, SH_RULES, diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/BUILD b/src/main/java/com/google/devtools/build/lib/rules/config/BUILD index eb43723aee..ca6c17a8d5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/config/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/config/BUILD @@ -16,6 +16,7 @@ java_library( deps = [ "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:build-configuration-option-details", + "//src/main/java/com/google/devtools/build/lib:core-rules", "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", diff --git a/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java new file mode 100644 index 0000000000..a7817769ab --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/rules/config/ConfigRules.java @@ -0,0 +1,46 @@ +// Copyright 2017 The Bazel Authors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package com.google.devtools.build.lib.rules.config; + +import com.google.common.collect.ImmutableList; +import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.Builder; +import com.google.devtools.build.lib.analysis.ConfiguredRuleClassProvider.RuleSet; +import com.google.devtools.build.lib.rules.core.CoreRules; + +/** + * Set of rules to specify or manipulate configuration settings. + */ +public final class ConfigRules implements RuleSet { + public static final ConfigRules INSTANCE = new ConfigRules(); + + private ConfigRules() { + // Use the static INSTANCE field instead. + } + + @Override + public void init(Builder builder) { + builder.addRuleDefinition(new ConfigRuleClasses.ConfigBaseRule()); + builder.addRuleDefinition(new ConfigRuleClasses.ConfigSettingRule()); + builder.addConfig(ConfigFeatureFlagConfiguration.Options.class, + new ConfigFeatureFlagConfiguration.Loader()); + + builder.addRuleDefinition(new ConfigRuleClasses.ConfigFeatureFlagRule()); + builder.addSkylarkAccessibleTopLevels("config_common", new ConfigSkylarkCommon()); + } + + @Override + public ImmutableList<RuleSet> requires() { + return ImmutableList.of(CoreRules.INSTANCE); + } +} |