Skip to content
This repository was archived by the owner on Dec 8, 2021. It is now read-only.

Commit 1c4e283

Browse files
coryancoryan
authored
refactor!: remove grpc_utils namespace (#158)
**POTENTIALLY BREAKING CHANGE:** Refactor the types and functions from `google::cloud::grpc_utils` to `google::cloud::`. The old header files and types should continue to work, as we kept aliases for them, but there is some risk we missed something. The library name (the physical .a and/or .so file) is not changed, the target names for CMake are not changed, the target name for Bazel moved to the new location. This change also makes some of the installation tests more strict, and that required changes to the ci scripts.
1 parent bfe16d3 commit 1c4e283

40 files changed

+576
-704
lines changed

‎INSTALL.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,13 @@ sudo dnf install -y grpc-devel grpc-plugins \
155155
libcurl-devel protobuf-compiler tar wget zlib-devel
156156
```
157157

158+
The following steps will install libraries and tools in `/usr/local`. By
159+
default pkg-config does not search in these directories.
160+
161+
```bash
162+
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
163+
```
164+
158165
#### googleapis
159166

160167
We need a recent version of the Google Cloud Platform proto C++ libraries:

‎ci/etc/kokoro/install/project-config.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ RUN cmake --build . --target install
6464
6565
## [END INSTALL.md]
6666
67-
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
68-
6967
# Verify that the installed files are actually usable
7068
WORKDIR /home/build/test-install-plain-make
7169
COPY ci/test-install /home/build/test-install-plain-make

‎ci/kokoro/install/Dockerfile.centos-7‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ RUN cmake --build . --target install
151151

152152
## [END INSTALL.md]
153153

154-
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
155-
156154
# Verify that the installed files are actually usable
157155
WORKDIR /home/build/test-install-plain-make
158156
COPY ci/test-install /home/build/test-install-plain-make

‎ci/kokoro/install/Dockerfile.centos-8‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,6 @@ RUN cmake --build . --target install
130130

131131
## [END INSTALL.md]
132132

133-
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
134-
135133
# Verify that the installed files are actually usable
136134
WORKDIR /home/build/test-install-plain-make
137135
COPY ci/test-install /home/build/test-install-plain-make

‎ci/kokoro/install/Dockerfile.debian-buster‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ RUN cmake --build . --target install
9191

9292
## [END INSTALL.md]
9393

94-
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
95-
9694
# Verify that the installed files are actually usable
9795
WORKDIR /home/build/test-install-plain-make
9896
COPY ci/test-install /home/build/test-install-plain-make

‎ci/kokoro/install/Dockerfile.debian-stretch‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,6 @@ RUN cmake --build . --target install
125125

126126
## [END INSTALL.md]
127127

128-
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
129-
130128
# Verify that the installed files are actually usable
131129
WORKDIR /home/build/test-install-plain-make
132130
COPY ci/test-install /home/build/test-install-plain-make

‎ci/kokoro/install/Dockerfile.fedora‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,13 @@ RUN dnf makecache && \
4242
libcurl-devel protobuf-compiler tar wget zlib-devel
4343
# ```
4444

45+
# The following steps will install libraries and tools in `/usr/local`. By
46+
# default pkg-config does not search in these directories.
47+
48+
# ```bash
49+
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
50+
# ```
51+
4552
# #### googleapis
4653

4754
# We need a recent version of the Google Cloud Platform proto C++ libraries:
@@ -92,8 +99,6 @@ RUN cmake --build . --target install
9299

93100
## [END INSTALL.md]
94101

95-
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
96-
97102
# Verify that the installed files are actually usable
98103
WORKDIR /home/build/test-install-plain-make
99104
COPY ci/test-install /home/build/test-install-plain-make

‎ci/kokoro/install/Dockerfile.opensuse-leap‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ RUN cmake --build . --target install
146146

147147
## [END INSTALL.md]
148148

149-
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
150-
151149
# Verify that the installed files are actually usable
152150
WORKDIR /home/build/test-install-plain-make
153151
COPY ci/test-install /home/build/test-install-plain-make

‎ci/kokoro/install/Dockerfile.opensuse-tumbleweed‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@ RUN cmake --build . --target install
9090

9191
## [END INSTALL.md]
9292

93-
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
94-
9593
# Verify that the installed files are actually usable
9694
WORKDIR /home/build/test-install-plain-make
9795
COPY ci/test-install /home/build/test-install-plain-make

‎ci/kokoro/install/Dockerfile.ubuntu-bionic‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ RUN cmake --build . --target install
118118

119119
## [END INSTALL.md]
120120

121-
ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
122-
123121
# Verify that the installed files are actually usable
124122
WORKDIR /home/build/test-install-plain-make
125123
COPY ci/test-install /home/build/test-install-plain-make

0 commit comments

Comments
 (0)