You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/04/20 19:45:52 UTC
[2/2] mesos git commit: Some CMakeLists.txt cleanup.
Some CMakeLists.txt cleanup.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/23d4297b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/23d4297b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/23d4297b
Branch: refs/heads/master
Commit: 23d4297b6bb4e6556cb07e46f7f748a5271b404c
Parents: d02108f
Author: Jie Yu <yu...@gmail.com>
Authored: Wed Apr 20 10:41:16 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Apr 20 10:41:16 2016 -0700
----------------------------------------------------------------------
src/CMakeLists.txt | 66 ++++++++++++++++++++++---------------------------
1 file changed, 30 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/23d4297b/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 420cb79..8e3eecb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,9 +19,8 @@
include(MesosProtobuf)
# Build the protobuf structs.
-PROTOC_TO_INCLUDE_DIR(MESOS mesos/mesos)
-PROTOC_TO_INCLUDE_DIR(V1_MESOS mesos/v1/mesos)
PROTOC_TO_INCLUDE_DIR(ACLS mesos/authorizer/acls)
+PROTOC_TO_INCLUDE_DIR(ALLOCATOR mesos/master/allocator)
PROTOC_TO_INCLUDE_DIR(APPC_SPEC mesos/appc/spec)
PROTOC_TO_INCLUDE_DIR(AUTHENTICATION mesos/authentication/authentication)
PROTOC_TO_INCLUDE_DIR(AUTHORIZATION mesos/authorizer/authorizer)
@@ -30,62 +29,61 @@ PROTOC_TO_INCLUDE_DIR(DOCKER_SPEC mesos/docker/spec)
PROTOC_TO_INCLUDE_DIR(DOCKER_V1 mesos/docker/v1)
PROTOC_TO_INCLUDE_DIR(DOCKER_V2 mesos/docker/v2)
PROTOC_TO_INCLUDE_DIR(EXECUTOR mesos/executor/executor)
-PROTOC_TO_INCLUDE_DIR(V1_EXECUTOR mesos/v1/executor/executor)
PROTOC_TO_INCLUDE_DIR(FETCHER mesos/fetcher/fetcher)
+PROTOC_TO_INCLUDE_DIR(ISOLATOR mesos/slave/isolator)
PROTOC_TO_INCLUDE_DIR(MAINTENANCE mesos/maintenance/maintenance)
-PROTOC_TO_INCLUDE_DIR(ALLOCATOR mesos/master/allocator)
+PROTOC_TO_INCLUDE_DIR(MESOS mesos/mesos)
PROTOC_TO_INCLUDE_DIR(MODULE mesos/module/module)
+PROTOC_TO_INCLUDE_DIR(OVERSUBSCRIPTION mesos/slave/oversubscription)
PROTOC_TO_INCLUDE_DIR(QUOTA mesos/quota/quota)
PROTOC_TO_INCLUDE_DIR(SCHEDULER mesos/scheduler/scheduler)
-PROTOC_TO_INCLUDE_DIR(V1_SCHEDULER mesos/v1/scheduler/scheduler)
-PROTOC_TO_INCLUDE_DIR(ISOLATOR mesos/slave/isolator)
-PROTOC_TO_INCLUDE_DIR(OVERSUBSCRIPTION mesos/slave/oversubscription)
PROTOC_TO_INCLUDE_DIR(STATE mesos/state/state)
PROTOC_TO_INCLUDE_DIR(URI mesos/uri/uri)
+PROTOC_TO_INCLUDE_DIR(V1_EXECUTOR mesos/v1/executor/executor)
+PROTOC_TO_INCLUDE_DIR(V1_MESOS mesos/v1/mesos)
+PROTOC_TO_INCLUDE_DIR(V1_SCHEDULER mesos/v1/scheduler/scheduler)
-PROTOC_TO_SRC_DIR(REGISTRY master/registry)
-
-PROTOC_TO_SRC_DIR(MESSAGES messages/messages)
-PROTOC_TO_SRC_DIR(FLAGS messages/flags)
-PROTOC_TO_SRC_DIR(LOG messages/log)
-PROTOC_TO_SRC_DIR(INTERNAL_STATE messages/state)
-
-PROTOC_TO_SRC_DIR(PROVISIONER_DOCKER slave/containerizer/mesos/provisioner/docker/message)
-PROTOC_TO_SRC_DIR(ISOLATOR_CNI_SPEC slave/containerizer/mesos/isolators/network/cni/spec)
-PROTOC_TO_SRC_DIR(ISOLATOR_DOCKER_VOLUME_STATE slave/containerizer/mesos/isolators/docker/volume/state)
+PROTOC_TO_SRC_DIR(REGISTRY master/registry)
+PROTOC_TO_SRC_DIR(INTERNAL_MESSAGES messages/messages)
+PROTOC_TO_SRC_DIR(INTERNAL_FLAGS messages/flags)
+PROTOC_TO_SRC_DIR(INTERNAL_LOG messages/log)
+PROTOC_TO_SRC_DIR(INTERNAL_STATE messages/state)
+PROTOC_TO_SRC_DIR(PROVISIONER_DOCKER slave/containerizer/mesos/provisioner/docker/message)
+PROTOC_TO_SRC_DIR(ISOLATOR_CNI_SPEC slave/containerizer/mesos/isolators/network/cni/spec)
+PROTOC_TO_SRC_DIR(ISOLATOR_DOCKER_VOLUME_STATE slave/containerizer/mesos/isolators/docker/volume/state)
set(MESOS_PROTOBUF_SRC
- ${MESOS_PROTO_CC}
- ${V1_MESOS_PROTO_CC}
${ACLS_PROTO_CC}
+ ${ALLOCATOR_PROTO_CC}
${APPC_SPEC_PROTO_CC}
${AUTHENTICATION_PROTO_CC}
${AUTHORIZATION_PROTO_CC}
- ${ISOLATOR_CNI_SPEC_PROTO_CC}
${CONTAINERIZER_PROTO_CC}
${DOCKER_SPEC_PROTO_CC}
${DOCKER_V1_PROTO_CC}
${DOCKER_V2_PROTO_CC}
${EXECUTOR_PROTO_CC}
- ${V1_EXECUTOR_PROTO_CC}
${FETCHER_PROTO_CC}
+ ${INTERNAL_FLAGS_PROTO_CC}
+ ${INTERNAL_LOG_PROTO_CC}
+ ${INTERNAL_MESSAGES_PROTO_CC}
+ ${INTERNAL_STATE_PROTO_CC}
+ ${ISOLATOR_PROTO_CC}
+ ${ISOLATOR_CNI_SPEC_PROTO_CC}
+ ${ISOLATOR_DOCKER_VOLUME_STATE_CC}
${MAINTENANCE_PROTO_CC}
- ${ALLOCATOR_PROTO_CC}
+ ${MESOS_PROTO_CC}
${MODULE_PROTO_CC}
${QUOTA_PROTO_CC}
- ${SCHEDULER_PROTO_CC}
- ${V1_SCHEDULER_PROTO_CC}
${OVERSUBSCRIPTION_PROTO_CC}
- ${STATE_PROTO_CC}
- ${MESSAGES_PROTO_CC}
- ${FLAGS_PROTO_CC}
- ${LOG_PROTO_CC}
- ${INERNAL_STATE_PROTO_CC}
- ${ISOLATOR_PROTO_CC}
- ${REGISTRY_PROTO_CC}
${PROVISIONER_DOCKER_PROTO_CC}
+ ${REGISTRY_PROTO_CC}
+ ${SCHEDULER_PROTO_CC}
+ ${STATE_PROTO_CC}
${URI_PROTO_CC}
- ${ISOLATOR_DOCKER_VOLUME_STATE_CC}
+ ${V1_EXECUTOR_PROTO_CC}
+ ${V1_MESOS_PROTO_CC}
+ ${V1_SCHEDULER_PROTO_CC}
)
# Configure Mesos files.
@@ -214,7 +212,6 @@ set(MASTER_SRC
master/quota.cpp
master/quota_handler.cpp
master/registry.hpp
- master/registry.proto
master/registrar.cpp
master/repairer.cpp
master/validation.cpp
@@ -281,9 +278,7 @@ if (NOT WIN32)
slave/containerizer/mesos/mount.cpp
slave/containerizer/mesos/isolators/filesystem/posix.cpp
slave/containerizer/mesos/isolators/posix/disk.cpp
- slave/containerizer/mesos/isolators/docker/volume/state.proto
slave/containerizer/mesos/isolators/network/cni/paths.cpp
- slave/containerizer/mesos/isolators/network/cni/spec.proto
slave/containerizer/mesos/isolators/network/cni/spec.cpp
slave/containerizer/mesos/provisioner/docker/local_puller.cpp
slave/containerizer/mesos/provisioner/paths.cpp
@@ -295,7 +290,6 @@ if (NOT WIN32)
slave/containerizer/mesos/provisioner/appc/store.cpp
slave/containerizer/mesos/provisioner/backend.cpp
slave/containerizer/mesos/provisioner/backends/copy.cpp
- slave/containerizer/mesos/provisioner/docker/message.proto
slave/containerizer/mesos/provisioner/docker/metadata_manager.cpp
slave/containerizer/mesos/provisioner/docker/paths.cpp
slave/containerizer/mesos/provisioner/docker/puller.cpp