Rename all BUILD files to BUILD.bazel (#9892)
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:
parent
cd4a8156fa
commit
95da0ba5b4
@ -1496,7 +1496,7 @@ pkg_files(
|
|||||||
"protobuf*.pc.in",
|
"protobuf*.pc.in",
|
||||||
"test-driver",
|
"test-driver",
|
||||||
], allow_empty = True) + [
|
], allow_empty = True) + [
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"CHANGES.txt",
|
"CHANGES.txt",
|
||||||
"CMakeLists.txt",
|
"CMakeLists.txt",
|
||||||
"CONTRIBUTORS.txt",
|
"CONTRIBUTORS.txt",
|
||||||
@ -1512,7 +1512,7 @@ pkg_files(
|
|||||||
"maven_install.json",
|
"maven_install.json",
|
||||||
"update_file_lists.sh",
|
"update_file_lists.sh",
|
||||||
"//third_party:zlib.BUILD",
|
"//third_party:zlib.BUILD",
|
||||||
"//util/python:BUILD",
|
"//util/python:BUILD.bazel",
|
||||||
],
|
],
|
||||||
strip_prefix = strip_prefix.from_root(""),
|
strip_prefix = strip_prefix.from_root(""),
|
||||||
visibility = ["//pkg:__pkg__"],
|
visibility = ["//pkg:__pkg__"],
|
44
Makefile.am
44
Makefile.am
@ -11,7 +11,7 @@ SUBDIRS = . src
|
|||||||
# Always include third_party directories in distributions.
|
# Always include third_party directories in distributions.
|
||||||
#
|
#
|
||||||
# Note that distribution artifacts will be produced by Bazel in the future.
|
# 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
|
DIST_SUBDIRS = src conformance benchmarks third_party/googletest
|
||||||
|
|
||||||
# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS
|
# Build gmock before we build protobuf tests. We don't add gmock to SUBDIRS
|
||||||
@ -51,7 +51,7 @@ clean-local:
|
|||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = protobuf.pc protobuf-lite.pc
|
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= \
|
csharp_EXTRA_DIST= \
|
||||||
global.json \
|
global.json \
|
||||||
csharp/.editorconfig \
|
csharp/.editorconfig \
|
||||||
@ -283,11 +283,11 @@ csharp_EXTRA_DIST= \
|
|||||||
csharp/src/Google.Protobuf/UnknownFieldSet.cs \
|
csharp/src/Google.Protobuf/UnknownFieldSet.cs \
|
||||||
csharp/src/Google.Protobuf/UnsafeByteOperations.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_EXTRA_DIST= \
|
||||||
java/README.md \
|
java/README.md \
|
||||||
java/bom/pom.xml \
|
java/bom/pom.xml \
|
||||||
java/core/BUILD \
|
java/core/BUILD.bazel \
|
||||||
java/core/generate-sources-build.xml \
|
java/core/generate-sources-build.xml \
|
||||||
java/core/generate-test-sources-build.xml \
|
java/core/generate-test-sources-build.xml \
|
||||||
java/core/pom.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_check_utf8_size.proto \
|
||||||
java/core/src/test/proto/com/google/protobuf/test_custom_options.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/core/src/test/proto/com/google/protobuf/wrappers_test.proto \
|
||||||
java/internal/BUILD \
|
java/internal/BUILD.bazel \
|
||||||
java/internal/testing.bzl \
|
java/internal/testing.bzl \
|
||||||
java/kotlin/BUILD \
|
java/kotlin/BUILD.bazel \
|
||||||
java/kotlin/generate-sources-build.xml \
|
java/kotlin/generate-sources-build.xml \
|
||||||
java/kotlin/generate-test-sources-build.xml \
|
java/kotlin/generate-test-sources-build.xml \
|
||||||
java/kotlin/pom.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/evil_names_proto3.proto \
|
||||||
java/kotlin/src/test/proto/com/google/protobuf/example_extensible_message.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/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-sources-build.xml \
|
||||||
java/kotlin-lite/generate-test-sources-build.xml \
|
java/kotlin-lite/generate-test-sources-build.xml \
|
||||||
java/kotlin-lite/lite.awk \
|
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/ExtendableMessageLiteExtensionsTest.kt\
|
||||||
java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt \
|
java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt \
|
||||||
java/lite.md \
|
java/lite.md \
|
||||||
java/lite/BUILD \
|
java/lite/BUILD.bazel \
|
||||||
java/lite/generate-sources-build.xml \
|
java/lite/generate-sources-build.xml \
|
||||||
java/lite/generate-test-sources-build.xml \
|
java/lite/generate-test-sources-build.xml \
|
||||||
java/lite/lite.awk \
|
java/lite/lite.awk \
|
||||||
@ -591,9 +591,9 @@ java_EXTRA_DIST=
|
|||||||
java/lite/pom_template.xml \
|
java/lite/pom_template.xml \
|
||||||
java/lite/process-lite-sources-build.xml \
|
java/lite/process-lite-sources-build.xml \
|
||||||
java/lite/src/test/java/com/google/protobuf/LiteTest.java \
|
java/lite/src/test/java/com/google/protobuf/LiteTest.java \
|
||||||
java/BUILD \
|
java/BUILD.bazel \
|
||||||
java/pom.xml \
|
java/pom.xml \
|
||||||
java/util/BUILD \
|
java/util/BUILD.bazel \
|
||||||
java/util/pom.xml \
|
java/util/pom.xml \
|
||||||
java/util/pom_template.xml \
|
java/util/pom_template.xml \
|
||||||
java/util/src/main/java/com/google/protobuf/util/Durations.java \
|
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/java/com/google/protobuf/util/ValuesTest.java \
|
||||||
java/util/src/test/proto/com/google/protobuf/util/json_test.proto
|
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_EXTRA_DIST= \
|
||||||
objectivec/.clang-format \
|
objectivec/.clang-format \
|
||||||
objectivec/BUILD \
|
objectivec/BUILD.bazel \
|
||||||
objectivec/DevTools/check_version_stamps.sh \
|
objectivec/DevTools/check_version_stamps.sh \
|
||||||
objectivec/DevTools/compile_testing_protos.sh \
|
objectivec/DevTools/compile_testing_protos.sh \
|
||||||
objectivec/DevTools/full_mac_build.sh \
|
objectivec/DevTools/full_mac_build.sh \
|
||||||
@ -821,7 +821,7 @@ objectivec_EXTRA_DIST= \
|
|||||||
objectivec/Tests/UnitTests-Info.plist \
|
objectivec/Tests/UnitTests-Info.plist \
|
||||||
Protobuf.podspec
|
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_EXTRA_DIST= \
|
||||||
php/README.md \
|
php/README.md \
|
||||||
php/REFCOUNTING.md \
|
php/REFCOUNTING.md \
|
||||||
@ -1018,7 +1018,7 @@ php_EXTRA_DIST= \
|
|||||||
php/tests/WellKnownTest.php \
|
php/tests/WellKnownTest.php \
|
||||||
php/tests/WrapperTypeSettersTest.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_EXTRA_DIST= \
|
||||||
python/MANIFEST.in \
|
python/MANIFEST.in \
|
||||||
python/google/__init__.py \
|
python/google/__init__.py \
|
||||||
@ -1142,7 +1142,7 @@ python_EXTRA_DIST= \
|
|||||||
python/tox.ini \
|
python/tox.ini \
|
||||||
python/README.md
|
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_EXTRA_DIST= \
|
||||||
ruby/Gemfile \
|
ruby/Gemfile \
|
||||||
ruby/.gitignore \
|
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)
|
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) \
|
EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
|
||||||
autogen.sh \
|
autogen.sh \
|
||||||
generate_descriptor_proto.sh \
|
generate_descriptor_proto.sh \
|
||||||
@ -1229,7 +1229,7 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
|
|||||||
CONTRIBUTORS.txt \
|
CONTRIBUTORS.txt \
|
||||||
CHANGES.txt \
|
CHANGES.txt \
|
||||||
update_file_lists.sh \
|
update_file_lists.sh \
|
||||||
BUILD \
|
BUILD.bazel \
|
||||||
WORKSPACE \
|
WORKSPACE \
|
||||||
CMakeLists.txt \
|
CMakeLists.txt \
|
||||||
cmake/abseil-cpp.cmake \
|
cmake/abseil-cpp.cmake \
|
||||||
@ -1254,12 +1254,12 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
|
|||||||
compiler_config_setting.bzl \
|
compiler_config_setting.bzl \
|
||||||
build_files_updated_unittest.sh \
|
build_files_updated_unittest.sh \
|
||||||
cc_proto_blacklist_test.bzl \
|
cc_proto_blacklist_test.bzl \
|
||||||
csharp/BUILD \
|
csharp/BUILD.bazel \
|
||||||
editors/README.txt \
|
editors/README.txt \
|
||||||
editors/proto.vim \
|
editors/proto.vim \
|
||||||
editors/protobuf-mode.el \
|
editors/protobuf-mode.el \
|
||||||
examples/AddPerson.java \
|
examples/AddPerson.java \
|
||||||
examples/BUILD \
|
examples/BUILD.bazel \
|
||||||
examples/CMakeLists.txt \
|
examples/CMakeLists.txt \
|
||||||
examples/ListPeople.java \
|
examples/ListPeople.java \
|
||||||
examples/Makefile \
|
examples/Makefile \
|
||||||
@ -1281,14 +1281,14 @@ EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST) \
|
|||||||
examples/pubspec.yaml \
|
examples/pubspec.yaml \
|
||||||
internal.bzl \
|
internal.bzl \
|
||||||
maven_install.json \
|
maven_install.json \
|
||||||
php/BUILD \
|
php/BUILD.bazel \
|
||||||
protobuf.bzl \
|
protobuf.bzl \
|
||||||
protobuf_deps.bzl \
|
protobuf_deps.bzl \
|
||||||
protobuf_release.bzl \
|
protobuf_release.bzl \
|
||||||
protobuf_version.bzl \
|
protobuf_version.bzl \
|
||||||
ruby/BUILD \
|
ruby/BUILD.bazel \
|
||||||
third_party/zlib.BUILD \
|
third_party/zlib.BUILD \
|
||||||
util/python/BUILD
|
util/python/BUILD.bazel
|
||||||
|
|
||||||
# Deletes all the files generated by autogen.sh.
|
# Deletes all the files generated by autogen.sh.
|
||||||
MAINTAINERCLEANFILES = \
|
MAINTAINERCLEANFILES = \
|
||||||
|
@ -75,7 +75,7 @@ pkg_files(
|
|||||||
],
|
],
|
||||||
exclude = [
|
exclude = [
|
||||||
"__init__.py", # not in autotools dist
|
"__init__.py", # not in autotools dist
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"go/*",
|
"go/*",
|
||||||
],
|
],
|
||||||
),
|
),
|
@ -61,7 +61,7 @@ java_library(
|
|||||||
|
|
||||||
pkg_files(
|
pkg_files(
|
||||||
name = "dist_files",
|
name = "dist_files",
|
||||||
srcs = ["BUILD"],
|
srcs = ["BUILD.bazel"],
|
||||||
strip_prefix = strip_prefix.from_root(""),
|
strip_prefix = strip_prefix.from_root(""),
|
||||||
visibility = ["//benchmarks:__pkg__"],
|
visibility = ["//benchmarks:__pkg__"],
|
||||||
)
|
)
|
@ -13,7 +13,7 @@ pkg_files(
|
|||||||
]) + [
|
]) + [
|
||||||
".editorconfig",
|
".editorconfig",
|
||||||
".gitignore",
|
".gitignore",
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"CHANGES.txt",
|
"CHANGES.txt",
|
||||||
"Google.Protobuf.Tools.nuspec",
|
"Google.Protobuf.Tools.nuspec",
|
||||||
"Google.Protobuf.Tools.targets",
|
"Google.Protobuf.Tools.targets",
|
@ -110,7 +110,7 @@ pkg_files(
|
|||||||
name = "dist_files",
|
name = "dist_files",
|
||||||
srcs = [
|
srcs = [
|
||||||
"AddPerson.java",
|
"AddPerson.java",
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"CMakeLists.txt",
|
"CMakeLists.txt",
|
||||||
"ListPeople.java",
|
"ListPeople.java",
|
||||||
"Makefile",
|
"Makefile",
|
@ -28,7 +28,7 @@ filegroup(
|
|||||||
pkg_files(
|
pkg_files(
|
||||||
name = "dist_files",
|
name = "dist_files",
|
||||||
srcs = [
|
srcs = [
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"README.md",
|
"README.md",
|
||||||
"bom/pom.xml",
|
"bom/pom.xml",
|
||||||
"lite.md",
|
"lite.md",
|
@ -420,7 +420,7 @@ pkg_files(
|
|||||||
"src/test/java/**/*.java",
|
"src/test/java/**/*.java",
|
||||||
"src/test/proto/**/*.proto",
|
"src/test/proto/**/*.proto",
|
||||||
]) + [
|
]) + [
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"generate-sources-build.xml",
|
"generate-sources-build.xml",
|
||||||
"generate-test-sources-build.xml",
|
"generate-test-sources-build.xml",
|
||||||
"pom.xml",
|
"pom.xml",
|
@ -5,7 +5,7 @@ load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
|
|||||||
pkg_files(
|
pkg_files(
|
||||||
name = "dist_files",
|
name = "dist_files",
|
||||||
srcs = [
|
srcs = [
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"testing.bzl",
|
"testing.bzl",
|
||||||
],
|
],
|
||||||
strip_prefix = strip_prefix.from_root(""),
|
strip_prefix = strip_prefix.from_root(""),
|
@ -191,7 +191,7 @@ pkg_files(
|
|||||||
"src/main/kotlin/com/google/protobuf/*.kt",
|
"src/main/kotlin/com/google/protobuf/*.kt",
|
||||||
"src/test/kotlin/**/*.kt",
|
"src/test/kotlin/**/*.kt",
|
||||||
]) + [
|
]) + [
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"generate-sources-build.xml",
|
"generate-sources-build.xml",
|
||||||
"generate-test-sources-build.xml",
|
"generate-test-sources-build.xml",
|
||||||
"lite.awk",
|
"lite.awk",
|
@ -303,7 +303,7 @@ pkg_files(
|
|||||||
"src/test/kotlin/**/*.kt",
|
"src/test/kotlin/**/*.kt",
|
||||||
"src/test/proto/**/*.proto",
|
"src/test/proto/**/*.proto",
|
||||||
]) + [
|
]) + [
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"generate-sources-build.xml",
|
"generate-sources-build.xml",
|
||||||
"generate-test-sources-build.xml",
|
"generate-test-sources-build.xml",
|
||||||
"pom.xml",
|
"pom.xml",
|
@ -83,7 +83,7 @@ pkg_files(
|
|||||||
srcs = glob([
|
srcs = glob([
|
||||||
"**/*.java",
|
"**/*.java",
|
||||||
]) + [
|
]) + [
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"generate-sources-build.xml",
|
"generate-sources-build.xml",
|
||||||
"generate-test-sources-build.xml",
|
"generate-test-sources-build.xml",
|
||||||
"lite.awk",
|
"lite.awk",
|
@ -83,7 +83,7 @@ pkg_files(
|
|||||||
"src/test/**/*.java",
|
"src/test/**/*.java",
|
||||||
"src/test/**/*.proto",
|
"src/test/**/*.proto",
|
||||||
]) + [
|
]) + [
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"pom.xml",
|
"pom.xml",
|
||||||
"pom_template.xml",
|
"pom_template.xml",
|
||||||
],
|
],
|
@ -111,7 +111,7 @@ pkg_files(
|
|||||||
"Tests/*.proto",
|
"Tests/*.proto",
|
||||||
]) + [
|
]) + [
|
||||||
".clang-format",
|
".clang-format",
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"README.md",
|
"README.md",
|
||||||
"Tests/golden_message",
|
"Tests/golden_message",
|
||||||
"Tests/golden_packed_fields_message",
|
"Tests/golden_packed_fields_message",
|
@ -14,7 +14,7 @@ pkg_files(
|
|||||||
"tests/*.sh",
|
"tests/*.sh",
|
||||||
"tests/proto/**/*.proto",
|
"tests/proto/**/*.proto",
|
||||||
]) + [
|
]) + [
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"README.md",
|
"README.md",
|
||||||
"REFCOUNTING.md",
|
"REFCOUNTING.md",
|
||||||
"composer.json",
|
"composer.json",
|
@ -14,7 +14,7 @@ pkg_files(
|
|||||||
"tests/*.rb",
|
"tests/*.rb",
|
||||||
]) + [
|
]) + [
|
||||||
".gitignore",
|
".gitignore",
|
||||||
"BUILD",
|
"BUILD.bazel",
|
||||||
"Gemfile",
|
"Gemfile",
|
||||||
"README.md",
|
"README.md",
|
||||||
"Rakefile",
|
"Rakefile",
|
@ -1,6 +1,6 @@
|
|||||||
load("@rules_cc//cc:defs.bzl", "cc_library")
|
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
|
# This is a placeholder for python headers. Projects needing to use
|
||||||
# fast cpp protos in protobuf's python interface should build with
|
# fast cpp protos in protobuf's python interface should build with
|
Loading…
Reference in New Issue
Block a user