From 21aa1024c5f5302d998457b1538c864c233bf460 Mon Sep 17 00:00:00 2001 From: lpino Date: Wed, 6 Dec 2017 06:03:03 -0800 Subject: Move BazelRuleClassProvider.CORE_WORKSPACE_RULES to its own class in the rules/repository package. PiperOrigin-RevId: 178087895 --- src/main/java/com/google/devtools/build/lib/BUILD | 19 ++++++++++ .../lib/bazel/rules/BazelRuleClassProvider.java | 23 ++---------- .../lib/rules/repository/CoreWorkspaceRules.java | 42 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 20 deletions(-) create mode 100644 src/main/java/com/google/devtools/build/lib/rules/repository/CoreWorkspaceRules.java (limited to 'src/main/java/com/google/devtools') diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 310f57f849..6698ed08ba 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -428,6 +428,7 @@ java_library( "analysis/BuildInfo.java", "analysis/TransitiveInfoProvider.java", "analysis/config/BuildConfigurationOptionDetails.java", + "rules/repository/CoreWorkspaceRules.java", ], ) + [ "runtime/BlazeServerStartupOptions.java", @@ -505,6 +506,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:build-info", "//src/main/java/com/google/devtools/build/lib:core-rules", + "//src/main/java/com/google/devtools/build/lib:core-workspace-rules", "//src/main/java/com/google/devtools/build/lib:events", "//src/main/java/com/google/devtools/build/lib:java-compilation", "//src/main/java/com/google/devtools/build/lib:java-rules", @@ -890,6 +892,23 @@ java_library( ], ) +# TODO(bazel-team): Include in the srcs the implementations of the rules inside +# CoreWorkspaceRules.java once they can be extracted from the "build-base" target. They can't be +# extracted currently because of non-trivial inter-package dependencies. +java_library( + name = "core-workspace-rules", + srcs = [ + "rules/repository/CoreWorkspaceRules.java", + ], + deps = [ + "//src/main/java/com/google/devtools/build/lib:build-base", + "//src/main/java/com/google/devtools/build/lib:core-rules", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:util", + "//third_party:guava", + ], +) + java_library( name = "android-rules", srcs = glob( 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 1c06b21f6c..0cad20cd0f 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 @@ -163,10 +163,8 @@ import com.google.devtools.build.lib.rules.proto.ProtoConfiguration; import com.google.devtools.build.lib.rules.proto.ProtoLangToolchainRule; import com.google.devtools.build.lib.rules.python.PythonConfigurationLoader; import com.google.devtools.build.lib.rules.python.PythonOptions; -import com.google.devtools.build.lib.rules.repository.BindRule; -import com.google.devtools.build.lib.rules.repository.LocalRepositoryRule; +import com.google.devtools.build.lib.rules.repository.CoreWorkspaceRules; import com.google.devtools.build.lib.rules.repository.NewLocalRepositoryRule; -import com.google.devtools.build.lib.rules.repository.WorkspaceBaseRule; import com.google.devtools.build.lib.rules.test.SkylarkTestingModule; import com.google.devtools.build.lib.rules.test.TestSuiteRule; import com.google.devtools.build.lib.util.ResourceFileLoader; @@ -279,21 +277,6 @@ public class BazelRuleClassProvider { } }; - public static final RuleSet CORE_WORKSPACE_RULES = - new RuleSet() { - @Override - public void init(Builder builder) { - builder.addRuleDefinition(new BindRule()); - builder.addRuleDefinition(new WorkspaceBaseRule()); - builder.addRuleDefinition(new LocalRepositoryRule()); - } - - @Override - public ImmutableList requires() { - return ImmutableList.of(CoreRules.INSTANCE); - } - }; - public static final RuleSet PROTO_RULES = new RuleSet() { @Override @@ -628,7 +611,7 @@ public class BazelRuleClassProvider { @Override public ImmutableList requires() { - return ImmutableList.of(CoreRules.INSTANCE, CORE_WORKSPACE_RULES); + return ImmutableList.of(CoreRules.INSTANCE, CoreWorkspaceRules.INSTANCE); } }; @@ -636,7 +619,7 @@ public class BazelRuleClassProvider { ImmutableSet.of( BAZEL_SETUP, CoreRules.INSTANCE, - CORE_WORKSPACE_RULES, + CoreWorkspaceRules.INSTANCE, GENERIC_RULES, ConfigRules.INSTANCE, PLATFORM_RULES, diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/CoreWorkspaceRules.java b/src/main/java/com/google/devtools/build/lib/rules/repository/CoreWorkspaceRules.java new file mode 100644 index 0000000000..386c64a52c --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/CoreWorkspaceRules.java @@ -0,0 +1,42 @@ +// 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.repository; + +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; + +/** + * Basic rules for WORKSPACE files. + */ +public final class CoreWorkspaceRules implements RuleSet { + public static final CoreWorkspaceRules INSTANCE = new CoreWorkspaceRules(); + + private CoreWorkspaceRules() { + // Use the static INSTANCE field instead. + } + + @Override + public void init(Builder builder) { + builder.addRuleDefinition(new BindRule()); + builder.addRuleDefinition(new WorkspaceBaseRule()); + builder.addRuleDefinition(new LocalRepositoryRule()); + } + + @Override + public ImmutableList requires() { + return ImmutableList.of(CoreRules.INSTANCE); + } +} -- cgit v1.2.3