From 8aaf4d2a40fd1f932daed3b433d8acb0822bb7b2 Mon Sep 17 00:00:00 2001 From: Josh Kelley Date: Mon, 17 May 2021 17:53:27 -0400 Subject: [PATCH] Build updates (#5300) * 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. --- autogen.sh | 8 ++++++-- objectivec/README.md | 2 +- src/README.md | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index d00d21727c..105bf09b67 100755 --- a/autogen.sh +++ b/autogen.sh @@ -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 diff --git a/objectivec/README.md b/objectivec/README.md index 2583779d38..bbe5726d45 100644 --- a/objectivec/README.md +++ b/objectivec/README.md @@ -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/ diff --git a/src/README.md b/src/README.md index 78d6bb5ec7..ec4901d894 100644 --- a/src/README.md +++ b/src/README.md @@ -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/