AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Rename all BUILD files to BUILD.bazel (#9892)

Browse Source 
This avoids conflicting names in a couple of cases.

1. Within google, we want to sync files but not name them BUILD (since the structure doesn't match).
2. On case-insensitive filesystems, `build` may be used for a build directory. Naming `BUILD.bazel` avoids potentioal conflicts.
This commit is contained in:
David L. Jones 2022-04-29 17:57:55 -07:00 committed by GitHub
parent cd4a8156fa
commit 95da0ba5b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD → BUILD.bazel
View File

@ -1496,7 +1496,7 @@ pkg_files(
"protobuf*.pc.in",
"test-driver",
], allow_empty = True) + [
"BUILD",
"BUILD.bazel",
"CHANGES.txt",
"CMakeLists.txt",
"CONTRIBUTORS.txt",
@ -1512,7 +1512,7 @@ pkg_files(
"maven_install.json",
"update_file_lists.sh",
"//third_party:zlib.BUILD",
"//util/python:BUILD",
"//util/python:BUILD.bazel",
],
strip_prefix = strip_prefix.from_root(""),
visibility = ["//pkg:__pkg__"],

44
Makefile.am
View File

@ -11,7 +11,7 @@ SUBDIRS = . src
# Always include third_party directories in distributions.
#
# Note that distribution artifacts will be produced by Bazel in the future.
# See pkg/BUILD for overall definitions.
# See pkg/BUILD.bazel for overall definitions.
DIST_SUBDIRS = src conformance benchmarks third_party/googletest
# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS
@ -51,7 +51,7 @@ clean-local:
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = protobuf.pc protobuf-lite.pc
# Note: please keep this in sync with the dist_files rule in csharp/BUILD.
# Note: please keep this in sync with the dist_files rule in csharp/BUILD.bazel.
csharp_EXTRA_DIST= \
global.json \
csharp/.editorconfig \
@ -283,11 +283,11 @@ csharp_EXTRA_DIST= \
csharp/src/Google.Protobuf/UnknownFieldSet.cs \
csharp/src/Google.Protobuf/UnsafeByteOperations.cs
# Note: please keep this in sync with the dist_files rules under java/.../BUILD.
# Note: please keep this in sync with the dist_files rules under java/.../BUILD.bazel.
java_EXTRA_DIST= \
java/README.md \
java/bom/pom.xml \
java/core/BUILD \
java/core/BUILD.bazel \
java/core/generate-sources-build.xml \
java/core/generate-test-sources-build.xml \
java/core/pom.xml \
@ -543,9 +543,9 @@ java_EXTRA_DIST=
java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto \
java/core/src/test/proto/com/google/protobuf/test_custom_options.proto \
java/core/src/test/proto/com/google/protobuf/wrappers_test.proto \
java/internal/BUILD \
java/internal/BUILD.bazel \
java/internal/testing.bzl \
java/kotlin/BUILD \
java/kotlin/BUILD.bazel \
java/kotlin/generate-sources-build.xml \
java/kotlin/generate-test-sources-build.xml \
java/kotlin/pom.xml \
@ -572,7 +572,7 @@ java_EXTRA_DIST=
java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto3.proto \
java/kotlin/src/test/proto/com/google/protobuf/example_extensible_message.proto \
java/kotlin/src/test/proto/com/google/protobuf/multiple_files_proto3.proto \
java/kotlin-lite/BUILD \
java/kotlin-lite/BUILD.bazel \
java/kotlin-lite/generate-sources-build.xml \
java/kotlin-lite/generate-test-sources-build.xml \
java/kotlin-lite/lite.awk \
@ -583,7 +583,7 @@ java_EXTRA_DIST=
java/kotlin-lite/src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt\
java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt \
java/lite.md \
java/lite/BUILD \
java/lite/BUILD.bazel \
java/lite/generate-sources-build.xml \
java/lite/generate-test-sources-build.xml \
java/lite/lite.awk \
@ -591,9 +591,9 @@ java_EXTRA_DIST=
java/lite/pom_template.xml \
java/lite/process-lite-sources-build.xml \
java/lite/src/test/java/com/google/protobuf/LiteTest.java \
java/BUILD \
java/BUILD.bazel \
java/pom.xml \
java/util/BUILD \
java/util/BUILD.bazel \
java/util/pom.xml \
java/util/pom_template.xml \
java/util/src/main/java/com/google/protobuf/util/Durations.java \
@ -612,10 +612,10 @@ java_EXTRA_DIST=
java/util/src/test/java/com/google/protobuf/util/ValuesTest.java \
java/util/src/test/proto/com/google/protobuf/util/json_test.proto
# Note: please keep this in sync with the dist_files rule in objectivec/BUILD.
# Note: please keep this in sync with the dist_files rule in objectivec/BUILD.bazel.
objectivec_EXTRA_DIST= \
objectivec/.clang-format \
objectivec/BUILD \
objectivec/BUILD.bazel \
objectivec/DevTools/check_version_stamps.sh \
objectivec/DevTools/compile_testing_protos.sh \
objectivec/DevTools/full_mac_build.sh \
@ -821,7 +821,7 @@ objectivec_EXTRA_DIST= \
objectivec/Tests/UnitTests-Info.plist \
Protobuf.podspec
# Note: please keep this in sync with the dist_files rule in php/BUILD.
# Note: please keep this in sync with the dist_files rule in php/BUILD.bazel.
php_EXTRA_DIST= \
php/README.md \
php/REFCOUNTING.md \
@ -1018,7 +1018,7 @@ php_EXTRA_DIST= \
php/tests/WellKnownTest.php \
php/tests/WrapperTypeSettersTest.php
# Note: please keep this in sync with the python_dist_files rule in BUILD.
# Note: please keep this in sync with the python_dist_files rule in BUILD.bazel.
python_EXTRA_DIST= \
python/MANIFEST.in \
python/google/__init__.py \
@ -1142,7 +1142,7 @@ python_EXTRA_DIST= \
python/tox.ini \
python/README.md
# Note: please keep this in sync with the dist_files rule in ruby/BUILD.
# Note: please keep this in sync with the dist_files rule in ruby/BUILD.bazel.
ruby_EXTRA_DIST= \
ruby/Gemfile \
ruby/.gitignore \
@ -1220,7 +1220,7 @@ ruby_EXTRA_DIST= \
all_EXTRA_DIST=$(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(php_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST)
# Note: please keep this in sync with the common_dist_files rule in BUILD.
# Note: please keep this in sync with the common_dist_files rule in BUILD.bazel.
EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
autogen.sh \
generate_descriptor_proto.sh \
@ -1229,7 +1229,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
CONTRIBUTORS.txt \
CHANGES.txt \
update_file_lists.sh \
BUILD \
BUILD.bazel \
WORKSPACE \
CMakeLists.txt \
cmake/abseil-cpp.cmake \
@ -1254,12 +1254,12 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
compiler_config_setting.bzl \
build_files_updated_unittest.sh \
cc_proto_blacklist_test.bzl \
csharp/BUILD \
csharp/BUILD.bazel \
editors/README.txt \
editors/proto.vim \
editors/protobuf-mode.el \
examples/AddPerson.java \
examples/BUILD \
examples/BUILD.bazel \
examples/CMakeLists.txt \
examples/ListPeople.java \
examples/Makefile \
@ -1281,14 +1281,14 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
examples/pubspec.yaml \
internal.bzl \
maven_install.json \
php/BUILD \
php/BUILD.bazel \
protobuf.bzl \
protobuf_deps.bzl \
protobuf_release.bzl \
protobuf_version.bzl \
ruby/BUILD \
ruby/BUILD.bazel \
third_party/zlib.BUILD \
util/python/BUILD
util/python/BUILD.bazel
# Deletes all the files generated by autogen.sh.
MAINTAINERCLEANFILES = \

2
benchmarks/BUILD → benchmarks/BUILD.bazel
View File

@ -75,7 +75,7 @@ pkg_files(
],
exclude = [
"__init__.py", # not in autotools dist
"BUILD",
"BUILD.bazel",
"go/*",
],
),

0
benchmarks/cpp/BUILD → benchmarks/cpp/BUILD.bazel
View File

2
benchmarks/datasets/BUILD → benchmarks/datasets/BUILD.bazel
View File

@ -61,7 +61,7 @@ java_library(
pkg_files(
name = "dist_files",
srcs = ["BUILD"],
srcs = ["BUILD.bazel"],
strip_prefix = strip_prefix.from_root(""),
visibility = ["//benchmarks:__pkg__"],
)

0
benchmarks/datasets/google_message1/proto2/BUILD → benchmarks/datasets/google_message1/proto2/BUILD.bazel
View File

0
benchmarks/datasets/google_message1/proto3/BUILD → benchmarks/datasets/google_message1/proto3/BUILD.bazel
View File

0
benchmarks/datasets/google_message2/BUILD → benchmarks/datasets/google_message2/BUILD.bazel
View File

0
benchmarks/datasets/google_message3/BUILD → benchmarks/datasets/google_message3/BUILD.bazel
View File

0
benchmarks/datasets/google_message4/BUILD → benchmarks/datasets/google_message4/BUILD.bazel
View File

2
csharp/BUILD → csharp/BUILD.bazel
View File

@ -13,7 +13,7 @@ pkg_files(
]) + [
".editorconfig",
".gitignore",
"BUILD",
"BUILD.bazel",
"CHANGES.txt",
"Google.Protobuf.Tools.nuspec",
"Google.Protobuf.Tools.targets",

2
examples/BUILD → examples/BUILD.bazel
View File

@ -110,7 +110,7 @@ pkg_files(
name = "dist_files",
srcs = [
"AddPerson.java",
"BUILD",
"BUILD.bazel",
"CMakeLists.txt",
"ListPeople.java",
"Makefile",

2
java/BUILD → java/BUILD.bazel
View File

@ -28,7 +28,7 @@ filegroup(
pkg_files(
name = "dist_files",
srcs = [
"BUILD",
"BUILD.bazel",
"README.md",
"bom/pom.xml",
"lite.md",

2
java/core/BUILD → java/core/BUILD.bazel
View File

@ -420,7 +420,7 @@ pkg_files(
"src/test/java/**/*.java",
"src/test/proto/**/*.proto",
]) + [
"BUILD",
"BUILD.bazel",
"generate-sources-build.xml",
"generate-test-sources-build.xml",
"pom.xml",

2
java/internal/BUILD → java/internal/BUILD.bazel
View File

@ -5,7 +5,7 @@ load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
pkg_files(
name = "dist_files",
srcs = [
"BUILD",
"BUILD.bazel",
"testing.bzl",
],
strip_prefix = strip_prefix.from_root(""),

2
java/kotlin-lite/BUILD → java/kotlin-lite/BUILD.bazel
View File

@ -191,7 +191,7 @@ pkg_files(
"src/main/kotlin/com/google/protobuf/*.kt",
"src/test/kotlin/**/*.kt",
]) + [
"BUILD",
"BUILD.bazel",
"generate-sources-build.xml",
"generate-test-sources-build.xml",
"lite.awk",

2
java/kotlin/BUILD → java/kotlin/BUILD.bazel
View File

@ -303,7 +303,7 @@ pkg_files(
"src/test/kotlin/**/*.kt",
"src/test/proto/**/*.proto",
]) + [
"BUILD",
"BUILD.bazel",
"generate-sources-build.xml",
"generate-test-sources-build.xml",
"pom.xml",

2
java/lite/BUILD → java/lite/BUILD.bazel
View File

@ -83,7 +83,7 @@ pkg_files(
srcs = glob([
"**/*.java",
]) + [
"BUILD",
"BUILD.bazel",
"generate-sources-build.xml",
"generate-test-sources-build.xml",
"lite.awk",

2
java/util/BUILD → java/util/BUILD.bazel
View File

@ -83,7 +83,7 @@ pkg_files(
"src/test/**/*.java",
"src/test/**/*.proto",
]) + [
"BUILD",
"BUILD.bazel",
"pom.xml",
"pom_template.xml",
],

2
objectivec/BUILD → objectivec/BUILD.bazel
View File

@ -111,7 +111,7 @@ pkg_files(
"Tests/*.proto",
]) + [
".clang-format",
"BUILD",
"BUILD.bazel",
"README.md",
"Tests/golden_message",
"Tests/golden_packed_fields_message",

2
php/BUILD → php/BUILD.bazel
View File

@ -14,7 +14,7 @@ pkg_files(
"tests/*.sh",
"tests/proto/**/*.proto",
]) + [
"BUILD",
"BUILD.bazel",
"README.md",
"REFCOUNTING.md",
"composer.json",

0
pkg/BUILD → pkg/BUILD.bazel
View File

2
ruby/BUILD → ruby/BUILD.bazel
View File

@ -14,7 +14,7 @@ pkg_files(
"tests/*.rb",
]) + [
".gitignore",
"BUILD",
"BUILD.bazel",
"Gemfile",
"README.md",
"Rakefile",

0
third_party/BUILD → third_party/BUILD.bazel vendored
View File

0
third_party/utf8_range/BUILD → third_party/utf8_range/BUILD.bazel vendored
View File

0
toolchain/BUILD → toolchain/BUILD.bazel
View File

2
util/python/BUILD → util/python/BUILD.bazel
View File

@ -1,6 +1,6 @@
load("@rules_cc//cc:defs.bzl", "cc_library")
exports_files(["BUILD"])
exports_files(["BUILD.bazel"])
# This is a placeholder for python headers. Projects needing to use
# fast cpp protos in protobuf's python interface should build with