Repository: mesos Updated Branches: refs/heads/master d47cf3960 -> dcc87a160
Fixed header paths for proto files during installation. Review: https://reviews.apache.org/r/23704 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dcc87a16 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dcc87a16 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dcc87a16 Branch: refs/heads/master Commit: dcc87a16093681b2d5702e8fd8620d514226ad92 Parents: d47cf39 Author: Vinod Kone <[email protected]> Authored: Fri Jul 18 18:44:22 2014 -0700 Committer: Vinod Kone <[email protected]> Committed: Mon Aug 4 14:57:51 2014 -0700 ---------------------------------------------------------------------- include/mesos/containerizer/containerizer.proto | 2 +- include/mesos/scheduler/scheduler.proto | 2 +- src/Makefile.am | 8 ++++---- src/master/registry.proto | 2 +- src/messages/messages.proto | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/dcc87a16/include/mesos/containerizer/containerizer.proto ---------------------------------------------------------------------- diff --git a/include/mesos/containerizer/containerizer.proto b/include/mesos/containerizer/containerizer.proto index 29df785..95c84df 100644 --- a/include/mesos/containerizer/containerizer.proto +++ b/include/mesos/containerizer/containerizer.proto @@ -16,7 +16,7 @@ * limitations under the License. */ -import "mesos.proto"; +import "mesos/mesos.proto"; package mesos.containerizer; http://git-wip-us.apache.org/repos/asf/mesos/blob/dcc87a16/include/mesos/scheduler/scheduler.proto ---------------------------------------------------------------------- diff --git a/include/mesos/scheduler/scheduler.proto b/include/mesos/scheduler/scheduler.proto index 6ab5089..5491c59 100644 --- a/include/mesos/scheduler/scheduler.proto +++ b/include/mesos/scheduler/scheduler.proto @@ -16,7 +16,7 @@ * limitations under the License. */ -import "mesos.proto"; +import "mesos/mesos.proto"; package mesos.scheduler; http://git-wip-us.apache.org/repos/asf/mesos/blob/dcc87a16/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index 0d9e3f0..411cff4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,7 +46,7 @@ pkglocalstatedir = $(localstatedir)/$(PACKAGE) # Protocol buffer compiler. PROTOC = ../$(PROTOBUF)/src/protoc -PROTOCFLAGS = -I$(top_srcdir)/include/mesos -I$(srcdir) +PROTOCFLAGS = -I$(top_srcdir)/include -I$(srcdir) # Initialize variables here so we can use += operator everywhere else. lib_LTLIBRARIES = @@ -166,19 +166,19 @@ CLEANFILES += $(REGISTRY_PROTOS) # directory and leave the cc files in src. %.pb.cc ../include/mesos/%.pb.h: $(top_srcdir)/include/mesos/%.proto $(MKDIR_P) $(@D) - $(PROTOC) $(PROTOCFLAGS) --cpp_out=../include/mesos $^ + $(PROTOC) $(PROTOCFLAGS) --cpp_out=../include $^ mv ../include/mesos/*.pb.cc . containerizer/%.pb.cc ../include/mesos/containerizer/%.pb.h: $(CONTAINERIZER_PROTO) $(MKDIR_P) $(@D) $(MKDIR_P) ../include/mesos/containerizer - $(PROTOC) $(PROTOCFLAGS) --cpp_out=../include/mesos $^ + $(PROTOC) $(PROTOCFLAGS) --cpp_out=../include $^ mv ../include/mesos/containerizer/*.pb.cc $(@D) scheduler/%.pb.cc ../include/mesos/scheduler/%.pb.h: $(SCHEDULER_PROTO) $(MKDIR_P) $(@D) $(MKDIR_P) ../include/mesos/scheduler - $(PROTOC) $(PROTOCFLAGS) --cpp_out=../include/mesos $^ + $(PROTOC) $(PROTOCFLAGS) --cpp_out=../include $^ mv ../include/mesos/scheduler/*.pb.cc $(@D) %.pb.cc %.pb.h: %.proto http://git-wip-us.apache.org/repos/asf/mesos/blob/dcc87a16/src/master/registry.proto ---------------------------------------------------------------------- diff --git a/src/master/registry.proto b/src/master/registry.proto index 8ca4e2f..a1995e5 100644 --- a/src/master/registry.proto +++ b/src/master/registry.proto @@ -16,7 +16,7 @@ * limitations under the License. */ -import "mesos.proto"; +import "mesos/mesos.proto"; package mesos.internal; http://git-wip-us.apache.org/repos/asf/mesos/blob/dcc87a16/src/messages/messages.proto ---------------------------------------------------------------------- diff --git a/src/messages/messages.proto b/src/messages/messages.proto index 0d63dc1..7cb3ce6 100644 --- a/src/messages/messages.proto +++ b/src/messages/messages.proto @@ -16,7 +16,7 @@ * limitations under the License. */ -import "mesos.proto"; +import "mesos/mesos.proto"; package mesos.internal;
