FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(googleapis): install directories for protos by coryan · Pull Request #5783 · googleapis/google-cloud-cpp · GitHub

/ google-cloud-cpp Public

fix(googleapis): install directories for protos #5783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coryan merged 3 commits into from
Jan 31, 2021
Conversation 8 Commits 3 Checks 0 Files changed
Merged

fix(googleapis): install directories for protos #5783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
57aed51
fix(googleapis): install directories for protos
coryan Jan 30, 2021
4fbba50
Fix script for static build case
coryan Jan 30, 2021
46e6c2f
Address review comments
coryan Jan 31, 2021
File filter

Filter by extension

Filter by extension .cmake  (1) .sh  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
137 changes: 88 additions & 49 deletions ci/kokoro/docker/build-in-docker-cmake.sh
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -378,30 +378,39 @@ if [[ "${TEST_INSTALL:-}" == "yes" ]]; then
echo
io::log_yellow "testing install script for runtime components"
cmake --install "${BINARY_DIR}" --component google_cloud_cpp_runtime
EXPECTED_RUNTIME_DIRS=(
"/var/tmp/staging/"
"/var/tmp/staging/${libdir}"
)
readarray -t EXPECTED_RUNTIME_DIRS < <(printf "%s\n" "${EXPECTED_RUNTIME_DIRS[@]}" | sort)
readonly EXPECTED_RUNTIME_DIRS
if comm -23 \
<(find /var/tmp/staging/ -type d | sort) \
<(/usr/bin/printf "%s\n" "${EXPECTED_RUNTIME_DIRS[@]}") | grep -q /var/tmp; then
io::log_red "Installed directories do not match expectation:"
diff -u \
<(find /var/tmp/staging/ -type d | sort) \
<(printf "%s\n" "${EXPECTED_RUNTIME_DIRS[@]}")
exit 1
# Static builds do not create any runtime components, so the previous step
# may create no directories.
if grep -q '^BUILD_SHARED_LIBS' "${BINARY_DIR}/CMakeCache.txt"; then
echo
io::log_yellow "verify the expected runtime directories are created"
EXPECTED_RUNTIME_DIRS=(
"/var/tmp/staging/"
"/var/tmp/staging/${libdir}"
)
readarray -t EXPECTED_RUNTIME_DIRS < <(printf "%s\n" "${EXPECTED_RUNTIME_DIRS[@]}" | sort)
readonly EXPECTED_RUNTIME_DIRS
IFS=$'\n' readarray -t ACTUAL_RUNTIME_DIRS < <(find /var/tmp/staging/ -type d | sort)
readonly ACTUAL_RUNTIME_DIRS
if comm -23 \
<(/usr/bin/printf '%s\n' "${EXPECTED_RUNTIME_DIRS[@]}") \
<(/usr/bin/printf '%s\n' "${ACTUAL_RUNTIME_DIRS[@]}") | grep -q /var/tmp; then
io::log_red "Installed runtime directories do not match expectation:"
diff -u \
<(/usr/bin/printf '%s\n' "${EXPECTED_RUNTIME_DIRS[@]}") \
<(/usr/bin/printf "%s\n" "${ACTUAL_RUNTIME_DIRS[@]}")
exit 1
fi
fi

echo
io::log_yellow "testing install script for development components"
cmake --install "${BINARY_DIR}" --component google_cloud_cpp_development

echo
io::log_yellow "verify the expected directories for CMake and pkgconfig are created"
EXPECTED_LIB_DIRS=(
"/var/tmp/staging/${libdir}/"
"/var/tmp/staging/${libdir}/cmake"
"/var/tmp/staging/${libdir}/cmake/bigtable_client"
"/var/tmp/staging/${libdir}/cmake/firestore_client"
"/var/tmp/staging/${libdir}/cmake/google_cloud_cpp_bigtable"
"/var/tmp/staging/${libdir}/cmake/google_cloud_cpp_common"
"/var/tmp/staging/${libdir}/cmake/google_cloud_cpp_firestore"
Expand All @@ -412,46 +421,79 @@ if [[ "${TEST_INSTALL:-}" == "yes" ]]; then
"/var/tmp/staging/${libdir}/cmake/google_cloud_cpp_pubsub"
"/var/tmp/staging/${libdir}/cmake/google_cloud_cpp_spanner"
"/var/tmp/staging/${libdir}/cmake/google_cloud_cpp_storage"
"/var/tmp/staging/${libdir}/pkgconfig"
# TODO(#5726) - these can be removed after 2022-02-15
"/var/tmp/staging/${libdir}/cmake/bigtable_client"
"/var/tmp/staging/${libdir}/cmake/firestore_client"
"/var/tmp/staging/${libdir}/cmake/googleapis"
"/var/tmp/staging/${libdir}/cmake/pubsub_client"
"/var/tmp/staging/${libdir}/cmake/spanner_client"
"/var/tmp/staging/${libdir}/cmake/storage_client"
"/var/tmp/staging/${libdir}/pkgconfig"
# TODO(#5726) - END
)
readarray -t EXPECTED_LIB_DIRS < <(printf "%s\n" "${EXPECTED_LIB_DIRS[@]}" | sort)
readonly EXPECTED_LIB_DIRS
IFS=$'\n' readarray -t ACTUAL_LIB_DIRS < <(find "/var/tmp/staging/${libdir}/" -type d | sort)
if comm -23 \
<(find "/var/tmp/staging/${libdir}/" -type d | sort) \
<(/usr/bin/printf "%s\n" "${EXPECTED_LIB_DIRS[@]}") | grep -q /var/tmp/staging; then
io::log_red "Installed directories do not match expectation:"
<(/usr/bin/printf '%s\n' "${EXPECTED_LIB_DIRS[@]}") \
<(/usr/bin/printf '%s\n' "${ACTUAL_LIB_DIRS[@]}") | grep -q /var/tmp/staging; then
io::log_red "Installed library directories do not match expectation:"
diff -u \
<(find "/var/tmp/staging/${libdir}/" -type d | sort) \
<(printf "%s\n" "${EXPECTED_LIB_DIRS[@]}")
<(/usr/bin/printf '%s\n' "${EXPECTED_LIB_DIRS[@]}") \
<(/usr/bin/printf '%s\n' "${ACTUAL_LIB_DIRS[@]}")
exit 1
fi

# Also verify that the install directory does not get unexpected files or
# directories installed.
echo
io::log_yellow "Verify installed headers created only expected directories."
EXPECTED_INCLUDE_DIRS=(
"/var/tmp/staging/include/google/cloud"
"/var/tmp/staging/include/google/cloud/bigquery"
"/var/tmp/staging/include/google/cloud/bigquery/connection"
io::log_yellow "Verify installed protos create the expected directories."
EXPECTED_PROTO_DIRS=(
"/var/tmp/staging/include/google/api"
"/var/tmp/staging/include/google/bigtable/admin/v2"
"/var/tmp/staging/include/google/bigtable/v2"
"/var/tmp/staging/include/google/cloud/bigquery/connection/v1beta1"
"/var/tmp/staging/include/google/cloud/bigquery/datatransfer"
"/var/tmp/staging/include/google/cloud/bigquery/datatransfer/v1"
"/var/tmp/staging/include/google/cloud/bigquery/internal"
"/var/tmp/staging/include/google/cloud/bigquery/logging"
"/var/tmp/staging/include/google/cloud/bigquery/logging/v1"
"/var/tmp/staging/include/google/cloud/bigquery/storage"
"/var/tmp/staging/include/google/cloud/bigquery/storage/v1beta1"
"/var/tmp/staging/include/google/cloud/bigquery/v2"
"/var/tmp/staging/include/google/cloud/bigtable"
"/var/tmp/staging/include/google/cloud/bigtable/internal"
"/var/tmp/staging/include/google/cloud/dialogflow"
"/var/tmp/staging/include/google/cloud/dialogflow/v2"
"/var/tmp/staging/include/google/cloud/dialogflow/v2beta1"
"/var/tmp/staging/include/google/cloud/speech/v1"
"/var/tmp/staging/include/google/cloud/texttospeech/v1"
"/var/tmp/staging/include/google/devtools/cloudtrace/v2"
"/var/tmp/staging/include/google/iam/credentials/v1"
"/var/tmp/staging/include/google/iam/v1"
"/var/tmp/staging/include/google/logging/type"
"/var/tmp/staging/include/google/logging/v2"
"/var/tmp/staging/include/google/longrunning"
"/var/tmp/staging/include/google/monitoring/v3"
"/var/tmp/staging/include/google/pubsub/v1"
"/var/tmp/staging/include/google/rpc"
"/var/tmp/staging/include/google/spanner/admin/database/v1"
"/var/tmp/staging/include/google/spanner/admin/instance/v1"
"/var/tmp/staging/include/google/spanner/v1"
"/var/tmp/staging/include/google/storage/v1"
"/var/tmp/staging/include/google/type"
)
readarray -t < <(printf "%s\n" "${EXPECTED_PROTO_DIRS[@]}" | sort)
readonly EXPECTED_PROTO_DIRS
IFS=$'\n' readarray -t ACTUAL_PROTO_DIRS < <(find /var/tmp/staging/ -name '*.proto' -printf '%h\n' | sort -u)
readonly ACTUAL_PROTO_DIRS
if comm -23 \
<(/usr/bin/printf '%s\n' "${EXPECTED_PROTO_DIRS[@]}") \
<(/usr/bin/printf '%s\n' "${ACTUAL_PROTO_DIRS[@]}") | grep -q /var/tmp; then
diff -u \
<(/usr/bin/printf '%s\n' "${EXPECTED_PROTO_DIRS[@]}") \
<(/usr/bin/printf '%s\n' "${ACTUAL_PROTO_DIRS[@]}")
exit 1
fi

echo
io::log_yellow "Verify installed headers create the expected directories."
EXPECTED_INCLUDE_DIRS=(
"/var/tmp/staging/include/google/cloud"
"/var/tmp/staging/include/google/cloud/internal"
"/var/tmp/staging/include/google/cloud/bigtable"
"/var/tmp/staging/include/google/cloud/bigtable/internal"
"/var/tmp/staging/include/google/cloud/firestore"
"/var/tmp/staging/include/google/cloud/grpc_utils"
"/var/tmp/staging/include/google/cloud/iam"
Expand All @@ -467,28 +509,25 @@ if [[ "${TEST_INSTALL:-}" == "yes" ]]; then
"/var/tmp/staging/include/google/cloud/spanner"
"/var/tmp/staging/include/google/cloud/spanner/internal"
"/var/tmp/staging/include/google/cloud/spanner/mocks"
"/var/tmp/staging/include/google/cloud/speech"
"/var/tmp/staging/include/google/cloud/speech/v1"
"/var/tmp/staging/include/google/cloud/storage"
"/var/tmp/staging/include/google/cloud/storage/internal"
"/var/tmp/staging/include/google/cloud/storage/oauth2"
"/var/tmp/staging/include/google/cloud/storage/testing"
"/var/tmp/staging/include/google/cloud/testing_util"
"/var/tmp/staging/include/google/cloud/texttospeech"
"/var/tmp/staging/include/google/cloud/texttospeech/v1")
readarray -t < <(printf "%s\n" "${EXPECTED_INCLUDE_DIRS[@]}" | sort)
"/var/tmp/staging/include/google/cloud/storage/testing")
readarray -t EXPECTED_INCLUDE_DIRS < <(printf "%s\n" "${EXPECTED_PROTO_DIRS[@]}" "${EXPECTED_INCLUDE_DIRS[@]}" | sort -u)
readonly EXPECTED_INCLUDE_DIRS
IFS=$'\n' readarray -t ACTUAL_INCLUDE_DIRS < <(find /var/tmp/staging/include -name '*.h' -printf '%h\n' | sort -u)
readonly ACTUAL_INCLUDE_DIRS
if comm -23 \
<(find /var/tmp/staging/include/google/cloud -type d | sort) \
<(/usr/bin/printf "%s\n" "${EXPECTED_INCLUDE_DIRS[@]}") | grep -q /var/tmp; then
io::log_red "Installed directories do not match expectation:"
<(/usr/bin/printf '%s\n' "${EXPECTED_INCLUDE_DIRS[@]}") \
<(/usr/bin/printf '%s\n' "${ACTUAL_INCLUDE_DIRS[@]}") | grep -q /var/tmp; then
io::log_red "Installed include directories do not match expectation:"
diff -u \
<(find /var/tmp/staging/include/google/cloud -type d | sort) \
<(printf "%s\n" "${EXPECTED_INCLUDE_DIRS[@]}")
<(/usr/bin/printf '%s\n' "${EXPECTED_INCLUDE_DIRS[@]}") \
<(/usr/bin/printf '%s\n' "${ACTUAL_INCLUDE_DIRS[@]}")
exit 1
fi

io::log_yellow "Verify no extraneous files were installed."
io::log_yellow "Verify only files with expected extensions are installed."
export PKG_CONFIG_PATH="/var/tmp/staging/${libdir}/pkgconfig:${PKG_CONFIG_PATH:-}"

# Get the version of one of the libraries. These should all be the same, so
Expand Down
5 changes: 3 additions & 2 deletions cmake/CompileProtos.cmake
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -233,14 +233,15 @@ function (google_cloud_cpp_install_proto_library_headers target)
endfunction ()

# Install protos for a C++ proto library.
function (google_cloud_cpp_install_proto_library_protos target)
function (google_cloud_cpp_install_proto_library_protos target source_dir)
get_target_property(target_protos ${target} PROTO_SOURCES)
foreach (header ${target_protos})
# Skip anything that is not a header file.
if (NOT "${header}" MATCHES "\\.proto$")
continue()
endif ()
string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" relative "${header}")
string(REPLACE "${source_dir}/" "" relative "${header}")
string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" relative "${relative}")
get_filename_component(dir "${relative}" DIRECTORY)
# This is modeled after the Protobuf library, it installs the basic
# protos (think google/protobuf/any.proto) in the include directory for
Expand Down
Back | FazBrowse Home | New Git URL