diff options
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/BUILD | 2 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/bazel/Bazel.java (renamed from src/main/java/com/google/devtools/build/lib/bazel/BazelMain.java) | 4 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index 4227f1df85..9f53d1b84f 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -228,7 +228,7 @@ local_repository(name = 'bazel_tools', path = '${BAZEL_TOOLS_REPO}') bind(name = "cc_toolchain", actual = "@bazel_tools//tools/cpp:default-toolchain") EOF - create_deploy_jar "libblaze" "com.google.devtools.build.lib.bazel.BazelMain" \ + create_deploy_jar "libblaze" "com.google.devtools.build.lib.bazel.Bazel" \ ${OUTPUT_DIR} fi diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index ae9db41e53..faf5ea0054 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -1347,7 +1347,7 @@ java_binary( "-Xlint:all", "-Xlint:-path", ], - main_class = "com.google.devtools.build.lib.bazel.BazelMain", + main_class = "com.google.devtools.build.lib.bazel.Bazel", runtime_deps = [ ":server", "//src/main/java/com/google/devtools/build/lib:bazel-main", diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelMain.java b/src/main/java/com/google/devtools/build/lib/bazel/Bazel.java index 96a52be8e8..135d0408f5 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/BazelMain.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/Bazel.java @@ -25,7 +25,7 @@ import java.util.Properties; /** * The main class. */ -public final class BazelMain { +public final class Bazel { private static final String BUILD_DATA_PROPERTIES = "/build-data.properties"; /** @@ -67,7 +67,7 @@ public final class BazelMain { * load the returned map is empty. */ private static ImmutableMap<String, String> tryGetBuildInfo() { - try (InputStream in = BazelMain.class.getResourceAsStream(BUILD_DATA_PROPERTIES)) { + try (InputStream in = Bazel.class.getResourceAsStream(BUILD_DATA_PROPERTIES)) { if (in == null) { return ImmutableMap.of(); } diff --git a/src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java b/src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java index 0af2e5f867..79d4eea62b 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java +++ b/src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java @@ -17,7 +17,7 @@ package com.google.devtools.build.lib.packages; import static java.nio.charset.StandardCharsets.UTF_8; import com.google.common.io.Files; -import com.google.devtools.build.lib.bazel.BazelMain; +import com.google.devtools.build.lib.bazel.Bazel; import com.google.devtools.build.lib.bazel.rules.BazelRuleClassProvider; import com.google.devtools.build.lib.packages.util.DocumentationTestUtil; import com.google.devtools.build.lib.util.OS; @@ -44,7 +44,7 @@ public class BazelDocumentationTest { } final File documentationFile = new File(documentationFilePath); DocumentationTestUtil.validateUserManual( - BazelMain.BAZEL_MODULES, + Bazel.BAZEL_MODULES, BazelRuleClassProvider.create(), Files.asCharSource(documentationFile, UTF_8).read()); } |