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

Build updates (#5300)

Browse Source 
* Make language instructions' documentation links clickable

See 86208c52.

* 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.
This commit is contained in:
Josh Kelley 2021-05-17 17:53:27 -04:00 committed by GitHub
parent 939569ac9c
commit 8aaf4d2a40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autogen.sh
View File

@ -30,8 +30,12 @@ set -ex
# The absence of a m4 directory in googletest causes autoreconf to fail when # 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 # building under the CentOS docker image. It's a warning in regular build on
# Ubuntu/gLinux as well. # Ubuntu/gLinux as well. (This is only needed if git submodules have been
mkdir -p third_party/googletest/m4 # 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. # TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings.
autoreconf -f -i -Wall,no-obsolete autoreconf -f -i -Wall,no-obsolete

2
objectivec/README.md
View File

@ -194,4 +194,4 @@ Documentation
The complete documentation for Protocol Buffers is available via the The complete documentation for Protocol Buffers is available via the
web at: web at:
https://developers.google.com/protocol-buffers/ https://developers.google.com/protocol-buffers/

2
src/README.md
View File

@ -229,4 +229,4 @@ Usage
The complete documentation for Protocol Buffers is available via the The complete documentation for Protocol Buffers is available via the
web at: web at:
https://developers.google.com/protocol-buffers/ https://developers.google.com/protocol-buffers/