diff --git a/bazel/development2.bzl b/bazel/development2.bzl index d470974..7a65f70 100644 --- a/bazel/development2.bzl +++ b/bazel/development2.bzl @@ -14,9 +14,6 @@ """Load dependencies needed for google-cloud-cpp development / Phase 2.""" -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") - def gl_cpp_development2(name = None): """Loads dependencies needed to develop the google-cloud-cpp libraries. @@ -27,16 +24,3 @@ def gl_cpp_development2(name = None): name: Unused. It is conventional to provide a `name` argument to all workspace functions. """ - - # An XML parser and generator, this is only used in //docfx. - # This is an internal tool used to generate the reference documentation. - maybe( - http_archive, - name = "com_github_zeux_pugixml", - urls = [ - "https://github.com/zeux/pugixml/archive/v1.14.tar.gz", - ], - sha256 = "610f98375424b5614754a6f34a491adbddaaec074e9044577d965160ec103d2e", - strip_prefix = "pugixml-1.14", - build_file = Label("//bazel:pugixml.BUILD"), - ) diff --git a/bazel/pugixml.BUILD b/bazel/pugixml.BUILD deleted file mode 100644 index 14d19e9..0000000 --- a/bazel/pugixml.BUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) # Apache 2.0 - -cc_library( - name = "pugixml", - srcs = [ - "src/pugixml.cpp", - ], - hdrs = [ - "src/pugiconfig.hpp", - "src/pugixml.hpp", - ], - includes = ["src"], - visibility = ["//visibility:public"], -) diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-cmake-gcc.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-cmake-gcc.Dockerfile index c3d1b95..3ba647a 100644 --- a/ci/cloudbuild/dockerfiles/fedora-latest-cmake-gcc.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-latest-cmake-gcc.Dockerfile @@ -39,9 +39,6 @@ RUN dnf makecache && dnf install -y java-latest-openjdk RUN dnf makecache && dnf install -y "dnf-command(debuginfo-install)" RUN dnf makecache && dnf debuginfo-install -y libstdc++ -# These are used by the docfx tool. -RUN dnf makecache && dnf install -y pugixml-devel yaml-cpp-devel - # Sets root's password to the empty string to enable users to get a root shell # inside the container with `su -` and no password. Sudo would not work because # we run these containers as the invoking user's uid, which does not exist in diff --git a/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile b/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile index 209ecfe..58b33c5 100644 --- a/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile +++ b/ci/cloudbuild/dockerfiles/fedora-latest-cmake.Dockerfile @@ -39,9 +39,6 @@ RUN dnf makecache && dnf install -y java-latest-openjdk RUN dnf makecache && dnf install -y "dnf-command(debuginfo-install)" RUN dnf makecache && dnf debuginfo-install -y libstdc++ -# These are used by the docfx tool. -RUN dnf makecache && dnf install -y pugixml-devel yaml-cpp-devel - # Sets root's password to the empty string to enable users to get a root shell # inside the container with `su -` and no password. Sudo would not work because # we run these containers as the invoking user's uid, which does not exist in