Skip to content

Commit ef46474

Browse files
committed
protobuf/rules_cc update
1 parent fc4878f commit ef46474

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ single_version_override(
3131

3232
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
3333
bazel_dep(name = "platforms", version = "0.0.10")
34-
bazel_dep(name = "rules_cc", version = "0.0.16") # Issues with 0.1.0
34+
bazel_dep(name = "rules_cc", version = "0.0.17")
3535
bazel_dep(name = "rules_pkg", version = "1.0.1")
3636
bazel_dep(name = "rules_proto", version = "7.0.2")
3737
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
@@ -49,7 +49,7 @@ archive_override(
4949
# ERROR: Q:/b/u/c56xnmzt/external/protobuf+/src/google/protobuf/BUILD.bazel:462:11: Compiling src/google/protobuf/any_lite.cc [for tool] failed: undeclared inclusion(s) in rule '@@protobuf+//src/google/protobuf:protobuf_lite':
5050
# this rule is missing dependency declarations for the following files included by 'src/google/protobuf/any_lite.cc':
5151
# 'bazel-out/x64_windows-opt-exec-ST-d610928244b0/bin/external/protobuf+/src/google/protobuf/_virtual_includes/protobuf_lite/google/protobuf/port.h'
52-
bazel_dep(name = "protobuf", version = "29.0-rc3")
52+
bazel_dep(name = "protobuf", version = "29.0")
5353
bazel_dep(name = "opentelemetry-proto", version = "1.4.0")
5454
archive_override(
5555
module_name = "opentelemetry-proto",

x/.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ try-import %workspace%/../../top.bazelrc
44
test --test_output=streamed --test_timeout=36000,36000,36000,36000
55

66
common:devenv --run_under='"c:/windows/system32/cmd.exe" /D /C start /wait devenv /debugexe '
7+
common:xcode --run_under='/Users/malkia/p/m/opentelemetry-cpp/x/xcdebug.sh'
78

89
#test:devenv --run_under='"c:/windows/system32/cmd.exe" /c start /wait devenv /debugexe '
910
#common:slrun --run_under='sudo -E --inline q:/superluminal/SuperluminalCmd.exe run windows --symbol-location q:/symbols --resolve --symbol-cache-dir q:/symcache '

x/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ load("@bazel_skylib//rules:native_binary.bzl", "native_binary")
44

55
package(default_visibility = ["//visibility:public"])
66

7+
exports_files(
8+
["xcdebug.sh"]
9+
)
10+
711
cc_test(
812
name = "x",
913
srcs = ["x.cpp"],

x/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ single_version_override(
3535

3636
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
3737
bazel_dep(name = "platforms", version = "0.0.10")
38-
bazel_dep(name = "rules_cc", version = "0.0.16") # Issues with 0.1.0
38+
bazel_dep(name = "rules_cc", version = "0.0.17")
3939
bazel_dep(name = "rules_pkg", version = "1.0.1")
4040
bazel_dep(name = "rules_proto", version = "7.0.2")
4141
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
@@ -53,7 +53,7 @@ archive_override(
5353
# ERROR: Q:/b/u/c56xnmzt/external/protobuf+/src/google/protobuf/BUILD.bazel:462:11: Compiling src/google/protobuf/any_lite.cc [for tool] failed: undeclared inclusion(s) in rule '@@protobuf+//src/google/protobuf:protobuf_lite':
5454
# this rule is missing dependency declarations for the following files included by 'src/google/protobuf/any_lite.cc':
5555
# 'bazel-out/x64_windows-opt-exec-ST-d610928244b0/bin/external/protobuf+/src/google/protobuf/_virtual_includes/protobuf_lite/google/protobuf/port.h'
56-
bazel_dep(name = "protobuf", version = "29.0-rc3")
56+
bazel_dep(name = "protobuf", version = "29.0")
5757
bazel_dep(name = "opentelemetry-proto", version = "1.4.0")
5858
archive_override(
5959
module_name = "opentelemetry-proto",

x/xcdebug.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pwd
2+
ls -l
3+
#/usr/bin/xcdebug $(pwd)/../../$*
4+
export PATH=$(pwd):$PATH
5+
/usr/bin/xcdebug $(pwd)/$*

0 commit comments

Comments
 (0)