Skip to content

Commit

Permalink
Build updates (protocolbuffers#5300)
Browse files Browse the repository at this point in the history
* Make language instructions' documentation links clickable

See 86208c5.

* Add a `git submodules` check to autogen.sh

Running `./autogen.sh && make` happens to work without initializing git
submodules - but autogen.sh writes to what is supposed to be a git
submodules directory, so trying to later initialize git submodules
fails.

This change makes building a bit more reliable for people who miss this
step.

* Revise third_party googletest logic

As discussed in PR, instead of requiring that `git submodule --init` be
run, correctly handle the case where it isn't run.
  • Loading branch information
joshkel authored May 17, 2021
1 parent 939569a commit 8aaf4d2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@ set -ex

# The absence of a m4 directory in googletest causes autoreconf to fail when
# building under the CentOS docker image. It's a warning in regular build on
# Ubuntu/gLinux as well.
mkdir -p third_party/googletest/m4
# Ubuntu/gLinux as well. (This is only needed if git submodules have been
# initialized, which is typically only needed for testing; see the installation
# instructions for details.)
if test -d third_party/googletest; then
mkdir -p third_party/googletest/m4
fi

# TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings.
autoreconf -f -i -Wall,no-obsolete
Expand Down
2 changes: 1 addition & 1 deletion objectivec/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,4 @@ Documentation
The complete documentation for Protocol Buffers is available via the
web at:

https://developers.google.com/protocol-buffers/
https://developers.google.com/protocol-buffers/
2 changes: 1 addition & 1 deletion src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,4 @@ Usage
The complete documentation for Protocol Buffers is available via the
web at:

https://developers.google.com/protocol-buffers/
https://developers.google.com/protocol-buffers/

0 comments on commit 8aaf4d2

Please sign in to comment.