Commit Graph

8 Commits (main)

Author SHA1 Message Date
Adam Cozzette 7286ffceb2 Merge the protobuf and upb Bazel repos
A couple weeks ago we moved upb into the protobuf Git repo, and this change
continues the merger of the two repos by making them into a single Bazel repo.
This was mostly a matter of deleting upb's WORKSPACE file and fixing up a bunch
of references to reflect the new structure.

Most of the changes are pretty mechanical, but one thing that needed more
invasive changes was the Python script for generating CMakeLists.txt,
make_cmakelists.py. The WORKSPACE file it relied on no longer exists with this
change, so I updated it to hardcode the information it needed from that file.

PiperOrigin-RevId: 564810016
2023-09-12 13:09:54 -07:00
Adam Cozzette 8a82d14432 Update .bazelignore to ignore the upb/ directory
upb is going to have its own Bazel repository for now, so this change will
ensure that things like `bazel query //...` won't try to descend into upb and
get confused. I would think that Bazel should see the `WORKSPACE` file and
know not to descend into the upb/ directory, but that does not seem to be
happening (possibly a Bazel bug).

PiperOrigin-RevId: 560072475
2023-08-25 06:26:02 -07:00
Mike Kruskal 8bad7e0dd0
Clean up leftover benchmark cruft (#10480)
* Removing benchmark submodule

* Removing C# benchmarks

* Removing dangling benchmark references

* Deleting unused function
2022-08-29 16:05:04 -04:00
Mike Kruskal cac9765af0
Update CMake configuration to add a dependency on Abseil (#10401)
* Rolling https://github.com/protocolbuffers/protobuf/pull/9793 forward

* Removing private label on conformance linkage

* no-op comment added
2022-08-12 16:41:00 -07:00
Adam Cozzette f7e2e0b301
Remove Abseil dependency from CMake build (#10056)
* Revert "Added cmake abseil include guard"

This reverts commit b6ee841d7c.

* Revert "Update CMake configuration to add a dependency on Abseil (#9793)"

This reverts commit e9246cd789.
2022-05-26 12:13:41 -07:00
mkruskal-google e9246cd789
Update CMake configuration to add a dependency on Abseil (#9793)
* Proof of concept for CMake Abseil dependency

* Hooked up Abseil linking

* Adding test binaries

* Reverting absl::string view use added for testing.  This will still be broken for automake and bazel

* Adding new cmake config to dist list

* Whitespace fixes and an attempt at fix for Windows Python Release (CMake version < 3.13)

* Hook up LTS to windows cmake

* Fix 'git cd' typo

* Adding clarifying comment for fix

* Adding abseil dependency to protobuf-lite too

* Update submodules instead of cloning abseil-cpp

* Adding explicit pointer to abseil root directory

Co-authored-by: Jason Lunn <jason.lunn@gmail.com>
Co-authored-by: Jorg Brown <jorg.brown@gmail.com>
2022-04-17 22:28:01 -04:00
Deanna Garcia b3d25f7d2f Add _build to .bazelignore 2021-08-13 23:35:37 +00:00
Yannic 2e51ad6344
[bazel] Update gtest and deprecate //external:{gtest,gtest_main} (#7237)
This change updates the gtest-version used by Bazel.
Also, `//external:{gtest,gtest_main}` is deprecated so we can remove some
of the uses of the discouraged `bind` function.

RELNOTES[bazel]: Starting with Protobuf 3.13.0, building and running
Protobuf tests requires `@com_google_googletest//:{gtest,gtest_main}`
instead of `//external:{gtest,gtest_main}`. Use
`--@com_google_protobuf//:incompatible_use_com_google_googletest=true`
to verify your workspace is not affected by this change.
2020-03-02 15:15:22 -08:00