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

Commit 8976440

Browse files
devjgmdevjgm
authored
feat: moved quickstart/ -> google/cloud/spanner/ (#1479)
* feat: moved quickstart/ -> google/cloud/spanner/ Fixes: googleapis/google-cloud-cpp#3973 * fixed quickstart path in build script
1 parent b7946e1 commit 8976440

23 files changed

+36
-42
lines changed

‎.bazelignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
ci/
22
cmake-out/
33
cmake-build-*/
4-
quickstart/
4+
google/cloud/spanner/quickstart/

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ Please note that the Google Cloud C++ client libraries do **not** follow
5555

5656
## Quickstart
5757

58-
The [quickstart/][quickstart-link] directory contains a minimal environment to
59-
help you quickly get started using this client library. The following is the
60-
"Hello World" program you'll be running, which should give you a taste of this
61-
library.
58+
The [google/cloud/spanner/quickstart/][quickstart-link] directory contains a
59+
minimal environment to help you quickly get started using this client library.
60+
The following is the "Hello World" program you'll be running, which should give
61+
you a taste of this library.
6262

63-
[quickstart-link]: https://github.com/googleapis/google-cloud-cpp-spanner/tree/master/quickstart
63+
[quickstart-link]: https://github.com/googleapis/google-cloud-cpp-spanner/tree/master/google/cloud/spanner/quickstart
6464

6565
```cc
6666
#include "google/cloud/spanner/client.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
7979
8080
# Verify that the installed files are actually usable
8181
WORKDIR /home/build/test-install-cmake
82-
COPY quickstart /home/build/test-install-cmake
82+
COPY google/cloud/spanner/quickstart /home/build/test-install-cmake
8383
# Disable pkg-config with CMake to verify it is not used in package discovery.
8484
RUN env -u PKG_CONFIG_PATH cmake -H. -B/i
8585
RUN cmake --build /i -- -j "${NCPU:-4}"

‎ci/generate-markdown/generate-readme.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,19 @@ Please note that the Google Cloud C++ client libraries do **not** follow
7979
8080
## Quickstart
8181
82-
The [quickstart/][quickstart-link] directory contains a minimal environment to
83-
help you quickly get started using this client library. The following is the
84-
"Hello World" program you'll be running, which should give you a taste of this
85-
library.
82+
The [google/cloud/spanner/quickstart/][quickstart-link] directory contains a
83+
minimal environment to help you quickly get started using this client library.
84+
The following is the "Hello World" program you'll be running, which should give
85+
you a taste of this library.
8686
87-
[quickstart-link]: https://github.com/googleapis/google-cloud-cpp-spanner/tree/master/quickstart
87+
[quickstart-link]: https://github.com/googleapis/google-cloud-cpp-spanner/tree/master/google/cloud/spanner/quickstart
8888
8989
```cc
9090
_EOF_
9191

9292
# Dumps the contents of quickstart.cc starting at the first #include, so we
9393
# skip the license header comment.
94-
sed -n '/^#/,$p' "${BINDIR}/../../quickstart/quickstart.cc"
94+
sed -n '/^#/,$p' "${BINDIR}/../../google/cloud/spanner/quickstart/quickstart.cc"
9595

9696
cat <<'_EOF_'
9797
````

‎ci/generate-markdown/generate-spanner-readme.sh‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,17 @@ Please note that the Google Cloud C++ client libraries do **not** follow
5353
5454
## Quickstart
5555
56-
<!-- TODO(googleapis/google-cloud-cpp#3973): move the quickstart directory -->
57-
58-
The [quickstart/](../../../quickstart/) directory contains a minimal environment to
59-
help you quickly get started using this client library. The following is the
60-
"Hello World" program you'll be running, which should give you a taste of this
56+
The [quickstart/](quickstart/) directory contains a minimal environment to help
57+
you quickly get started using this client library. The following is the "Hello
58+
World" program you'll be running, which should give you a taste of this
6159
library.
6260
6361
```cc
6462
_EOF_
6563

66-
# TODO(googleapis/google-cloud-cpp#3973): move the quickstart directory to
67-
# google/cloud/spanner.
68-
#
6964
# Dumps the contents of quickstart.cc starting at the first #include, so we
7065
# skip the license header comment.
71-
sed -n '/^#/,$p' "${BINDIR}/../../quickstart/quickstart.cc"
66+
sed -n '/^#/,$p' "${BINDIR}/../../google/cloud/spanner/quickstart/quickstart.cc"
7267

7368
cat <<'_EOF_'
7469
````

‎ci/kokoro/docker/build-in-docker-bazel-dependency.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if [[ -n "${BAZEL_CONFIG}" ]]; then
5252
bazel_args+=(--config "${BAZEL_CONFIG}")
5353
fi
5454

55-
cd quickstart
55+
cd google/cloud/spanner/quickstart
5656

5757
echo "================================================================"
5858
echo "Fetching dependencies $(date)"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
152152

153153
# Verify that the installed files are actually usable
154154
WORKDIR /home/build/test-install-cmake
155-
COPY quickstart /home/build/test-install-cmake
155+
COPY google/cloud/spanner/quickstart /home/build/test-install-cmake
156156
# Disable pkg-config with CMake to verify it is not used in package discovery.
157157
RUN env -u PKG_CONFIG_PATH cmake -H. -B/i
158158
RUN cmake --build /i -- -j "${NCPU:-4}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
131131

132132
# Verify that the installed files are actually usable
133133
WORKDIR /home/build/test-install-cmake
134-
COPY quickstart /home/build/test-install-cmake
134+
COPY google/cloud/spanner/quickstart /home/build/test-install-cmake
135135
# Disable pkg-config with CMake to verify it is not used in package discovery.
136136
RUN env -u PKG_CONFIG_PATH cmake -H. -B/i
137137
RUN cmake --build /i -- -j "${NCPU:-4}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
9494

9595
# Verify that the installed files are actually usable
9696
WORKDIR /home/build/test-install-cmake
97-
COPY quickstart /home/build/test-install-cmake
97+
COPY google/cloud/spanner/quickstart /home/build/test-install-cmake
9898
# Disable pkg-config with CMake to verify it is not used in package discovery.
9999
RUN env -u PKG_CONFIG_PATH cmake -H. -B/i
100100
RUN cmake --build /i -- -j "${NCPU:-4}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ ENV PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
127127

128128
# Verify that the installed files are actually usable
129129
WORKDIR /home/build/test-install-cmake
130-
COPY quickstart /home/build/test-install-cmake
130+
COPY google/cloud/spanner/quickstart /home/build/test-install-cmake
131131
# Disable pkg-config with CMake to verify it is not used in package discovery.
132132
RUN env -u PKG_CONFIG_PATH cmake -H. -B/i
133133
RUN cmake --build /i -- -j "${NCPU:-4}"

0 commit comments

Comments
 (0)