This is an automated email from the ASF dual-hosted git repository. josephwu pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit af54474e46bc41ec7cf7e3c9e26791fbcdf9e959 Author: Joseph Wu <[email protected]> AuthorDate: Tue Jul 16 15:44:31 2019 -0700 Windows: Fixed exclusion of GID and Docker spec headers. These headers and related protobufs are not compiled on Windows because the features using them are not supported on Windows. --- src/CMakeLists.txt | 8 ++++++-- src/slave/containerizer/mesos/provisioner/backends/copy.cpp | 2 ++ src/slave/containerizer/mesos/provisioner/provisioner.cpp | 2 ++ src/slave/volume_gid_manager/volume_gid_manager.hpp | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index eb4e2ac..6d14090 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -260,8 +260,12 @@ set(CSI_SRC csi/volume_manager.cpp) set(DOCKER_SRC - docker/docker.cpp - docker/spec.cpp) + docker/docker.cpp) + +if (NOT WIN32) + list(APPEND DOCKER_SRC + docker/spec.cpp) +endif () set(EXECUTOR_SRC exec/exec.cpp diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp index 9c2fdf1..10516ca 100644 --- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp +++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp @@ -16,7 +16,9 @@ #include <vector> +#ifndef __WINDOWS__ #include <mesos/docker/spec.hpp> +#endif // __WINDOWS__ #include <process/collect.hpp> #include <process/defer.hpp> diff --git a/src/slave/containerizer/mesos/provisioner/provisioner.cpp b/src/slave/containerizer/mesos/provisioner/provisioner.cpp index 9b0ea38..a081fb0 100644 --- a/src/slave/containerizer/mesos/provisioner/provisioner.cpp +++ b/src/slave/containerizer/mesos/provisioner/provisioner.cpp @@ -20,7 +20,9 @@ #include <mesos/type_utils.hpp> +#ifndef __WINDOWS__ #include <mesos/docker/spec.hpp> +#endif // __WINDOWS__ #include <mesos/secret/resolver.hpp> diff --git a/src/slave/volume_gid_manager/volume_gid_manager.hpp b/src/slave/volume_gid_manager/volume_gid_manager.hpp index 838728b..7413e83 100644 --- a/src/slave/volume_gid_manager/volume_gid_manager.hpp +++ b/src/slave/volume_gid_manager/volume_gid_manager.hpp @@ -25,7 +25,9 @@ #include "slave/flags.hpp" +#ifndef __WINDOWS__ #include "slave/volume_gid_manager/state.hpp" +#endif // __WINDOWS__ namespace mesos { namespace internal { @@ -39,6 +41,7 @@ class VolumeGidManagerProcess; // persistent volumes and SANDBOX_PATH volume of PARENT type. class VolumeGidManager { +#ifndef __WINDOWS__ public: static Try<VolumeGidManager*> create(const Flags& flags); @@ -57,6 +60,7 @@ private: const process::Owned<VolumeGidManagerProcess>& process); process::Owned<VolumeGidManagerProcess> process; +#endif // __WINDOWS__ }; } // namespace slave {
