diff options
4 files changed, 8 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/JarDecompressor.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/JarDecompressor.java index b8c54a673e..703c4a32dd 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/repository/JarDecompressor.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/JarDecompressor.java @@ -21,10 +21,8 @@ import com.google.devtools.build.lib.rules.repository.RepositoryFunction.Reposit import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; import com.google.devtools.build.skyframe.SkyFunctionException.Transience; - import java.io.IOException; import java.nio.charset.Charset; - import javax.annotation.Nullable; /** @@ -40,7 +38,7 @@ public class JarDecompressor implements Decompressor { * The .jar can be used compressed, so this just exposes it in a way Bazel can use. * * <p>It moves the jar from some-name/x/y/z/foo.jar to some-name/jar/foo.jar and creates a - * BUILD file containing one entry: the .jar.</p> + * BUILD.bazel file containing one entry: the .jar. */ @Override @Nullable @@ -62,12 +60,12 @@ public class JarDecompressor implements Decompressor { if (!jarSymlink.exists()) { jarSymlink.createSymbolicLink(descriptor.archivePath()); } - // external/some-name/repository/jar/BUILD defines the //jar target. - Path buildFile = jarDirectory.getRelative("BUILD"); + // external/some-name/repository/jar/BUILD.bazel defines the //jar target. + Path buildFile = jarDirectory.getRelative("BUILD.bazel"); FileSystemUtils.writeLinesAs( buildFile, Charset.forName("UTF-8"), - "# DO NOT EDIT: automatically generated BUILD file for " + "# DO NOT EDIT: automatically generated BUILD.bazel file for " + descriptor.targetKind() + " rule " + descriptor.targetName(), diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/NewRepositoryBuildFileHandler.java b/src/main/java/com/google/devtools/build/lib/rules/repository/NewRepositoryBuildFileHandler.java index 658c957690..76868d77e4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/NewRepositoryBuildFileHandler.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/NewRepositoryBuildFileHandler.java @@ -106,7 +106,7 @@ public class NewRepositoryBuildFileHandler { */ public void finishBuildFile(Path outputDirectory) throws RepositoryFunctionException { if (buildFileValue != null) { - // Link x/BUILD to <build_root>/x.BUILD. + // Link x/BUILD to <build_root>/x.BUILD.bazel. symlinkBuildFile(buildFileValue, outputDirectory); } else if (buildFileContent != null) { RepositoryFunction.writeBuildFile(outputDirectory, buildFileContent); @@ -204,7 +204,7 @@ public class NewRepositoryBuildFileHandler { */ private void symlinkBuildFile( FileValue buildFileValue, Path outputDirectory) throws RepositoryFunctionException { - Path buildFilePath = outputDirectory.getRelative("BUILD"); + Path buildFilePath = outputDirectory.getRelative("BUILD.bazel"); RepositoryFunction.createSymbolicLink(buildFilePath, buildFileValue.realRootedPath().asPath()); } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java index c717905204..03d886e4fa 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java +++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java @@ -197,7 +197,7 @@ public abstract class RepositoryFunction { protected static RepositoryDirectoryValue writeBuildFile( Path repositoryDirectory, String contents) throws RepositoryFunctionException { - Path buildFilePath = repositoryDirectory.getRelative("BUILD"); + Path buildFilePath = repositoryDirectory.getRelative("BUILD.bazel"); try { // The repository could have an existing BUILD file that's either a regular file (for remote // repositories) or a symlink (for local repositories). Either way, we want to remove it and diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/JarDecompressorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/JarDecompressorTest.java index 76ee90d559..37cfa8daa3 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/JarDecompressorTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/JarDecompressorTest.java @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.bazel.repository.JarDecompressor; import com.google.devtools.build.lib.testutil.Scratch; import com.google.devtools.build.lib.vfs.FileSystemUtils; import com.google.devtools.build.lib.vfs.Path; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,7 +53,7 @@ public class JarDecompressorTest { Path outputDir = DecompressorValue.decompress(descriptorBuilder.build()); assertThat(outputDir.exists()).isTrue(); String buildContent = - new String(FileSystemUtils.readContentAsLatin1(outputDir.getRelative("jar/BUILD"))); + new String(FileSystemUtils.readContentAsLatin1(outputDir.getRelative("jar/BUILD.bazel"))); assertThat(buildContent).contains("java_import"); assertThat(buildContent).contains("filegroup"); } @@ -67,5 +66,4 @@ public class JarDecompressorTest { FileSystemUtils.readContentAsLatin1(outputDir.getRelative("WORKSPACE"))); assertThat(workspaceContent).contains("workspace(name = \"tester\")"); } - } |