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 2015/11/14 02:03:12 UTC
[2/4] mesos git commit: Style fixes for Java and Python protobuf generation rules.

Style fixes for Java and Python protobuf generation rules.

Review: https://reviews.apache.org/r/40251


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/353fa85b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/353fa85b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/353fa85b

Branch: refs/heads/master
Commit: 353fa85b5c879e80ab21defb60a216bfae5d4d8b
Parents: 89032b8
Author: Jie Yu <yu...@gmail.com>
Authored: Thu Nov 12 12:17:34 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Nov 13 17:02:31 2015 -0800

----------------------------------------------------------------------
 src/Makefile.am | 96 +++++++++++++++++++++++++---------------------------
 1 file changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/353fa85b/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 9d64422..7c41937 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -248,96 +248,94 @@ CLEANFILES +=								\
   $(V1_PYTHON_PROTOS)
 
 
-# Targets for generating protocol buffer code.
+# Targets for generating C++ protocol buffer code.
 ../include/mesos/%.pb.cc ../include/mesos/%.pb.h: $(top_srcdir)/include/mesos/%.proto
 	$(PROTOC) $(PROTOCFLAGS) --cpp_out=../include $^
 
 %.pb.cc %.pb.h: %.proto
 	$(PROTOC) $(PROTOCFLAGS) --cpp_out=. $^
 
-java/generated/org/apache/mesos/Protos.java: $(MESOS_PROTO)
-	$(MKDIR_P)  $(@D)
-	$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
 
-java/generated/org/apache/mesos/v1/Protos.java: $(V1_MESOS_PROTO)
-	$(MKDIR_P)  $(@D)
+# Targets for generating Java protocol buffer code.
+java/generated/org/apache/mesos/containerizer/Protos.java: $(CONTAINERIZER_PROTO)
+	$(MKDIR_P) $(@D)
 	$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
 
-java/generated/org/apache/mesos/containerizer/Protos.java:		\
-		$(CONTAINERIZER_PROTO)
-	$(MKDIR_P)  $(@D)
+java/generated/org/apache/mesos/executor/Protos.java: $(EXECUTOR_PROTO)
+	$(MKDIR_P) $(@D)
 	$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
 
 java/generated/org/apache/mesos/fetcher/Protos.java: $(FETCHER_PROTO)
-	$(MKDIR_P)  $(@D)
+	$(MKDIR_P) $(@D)
 	$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
 
-java/generated/org/apache/mesos/scheduler/Protos.java: $(SCHEDULER_PROTO)
-	$(MKDIR_P)  $(@D)
+java/generated/org/apache/mesos/Protos.java: $(MESOS_PROTO)
+	$(MKDIR_P) $(@D)
 	$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
 
-java/generated/org/apache/mesos/v1/scheduler/Protos.java: $(V1_SCHEDULER_PROTO)
-	$(MKDIR_P)  $(@D)
+java/generated/org/apache/mesos/scheduler/Protos.java: $(SCHEDULER_PROTO)
+	$(MKDIR_P) $(@D)
 	$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
 
-java/generated/org/apache/mesos/executor/Protos.java: $(EXECUTOR_PROTO)
-	$(MKDIR_P)  $(@D)
+java/generated/org/apache/mesos/v1/executor/Protos.java: $(V1_EXECUTOR_PROTO)
+	$(MKDIR_P) $(@D)
 	$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
 
-java/generated/org/apache/mesos/v1/executor/Protos.java: $(V1_EXECUTOR_PROTO)
-	$(MKDIR_P)  $(@D)
+java/generated/org/apache/mesos/v1/Protos.java: $(V1_MESOS_PROTO)
+	$(MKDIR_P) $(@D)
 	$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
 
-python/interface/src/mesos/interface/mesos_pb2.py: $(MESOS_PROTO)
+java/generated/org/apache/mesos/v1/scheduler/Protos.java: $(V1_SCHEDULER_PROTO)
 	$(MKDIR_P) $(@D)
-	$(PROTOC) -I$(top_srcdir)/include/mesos				\
-          $(PROTOCFLAGS) --python_out=python/interface/src/mesos/interface $^
+	$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
 
-python/interface/src/mesos/v1/interface/mesos_pb2.py: $(V1_MESOS_PROTO)
+
+# Targets for generating Python protocol buffer code.
+# NOTE: All python protocol buffer code that imports from mesos.proto
+# has to get patched using sed, removing the leading 'mesos.'
+# namespace qualifier due to the flat hierachy in the resulting
+# mesos.interface egg. See MESOS-1750 for more.
+python/interface/src/mesos/interface/containerizer_pb2.py: $(CONTAINERIZER_PROTO)
 	$(MKDIR_P) $(@D)
-	$(PROTOC) -I$(top_srcdir)/include/mesos/v1			\
-          $(PROTOCFLAGS) --python_out=python/interface/src/mesos/v1/interface $^
-
-# All python protocol buffer code that imports from mesos.proto has
-# to get patched using sed, removing the leading 'mesos.' namespace
-# qualifier due to the flat hierachy in the resulting mesos.interface
-# egg. See MESOS-1750 for more.
-python/interface/src/mesos/interface/containerizer_pb2.py:		\
-		$(CONTAINERIZER_PROTO)
+	$(PROTOC) -I$(top_srcdir)/include/mesos/containerizer $(PROTOCFLAGS)	\
+		--python_out=python/interface/src/mesos/interface $^
+	$(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+
+python/interface/src/mesos/interface/executor_pb2.py: $(EXECUTOR_PROTO)
 	$(MKDIR_P) $(@D)
-	$(PROTOC) -I$(top_srcdir)/include/mesos/containerizer		\
-		$(PROTOCFLAGS)						\
+	$(PROTOC) -I$(top_srcdir)/include/mesos/executor $(PROTOCFLAGS)		\
 		--python_out=python/interface/src/mesos/interface $^
 	$(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
 
+python/interface/src/mesos/interface/mesos_pb2.py: $(MESOS_PROTO)
+	$(MKDIR_P) $(@D)
+	$(PROTOC) -I$(top_srcdir)/include/mesos $(PROTOCFLAGS)			\
+		--python_out=python/interface/src/mesos/interface $^
+
 python/interface/src/mesos/interface/scheduler_pb2.py: $(SCHEDULER_PROTO)
 	$(MKDIR_P) $(@D)
-	$(PROTOC) -I$(top_srcdir)/include/mesos/scheduler		\
-          $(PROTOCFLAGS)						\
-          --python_out=python/interface/src/mesos/interface $^
+	$(PROTOC) -I$(top_srcdir)/include/mesos/scheduler $(PROTOCFLAGS)	\
+		--python_out=python/interface/src/mesos/interface $^
 	$(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
 
-python/interface/src/mesos/v1/interface/scheduler_pb2.py: $(V1_SCHEDULER_PROTO)
+python/interface/src/mesos/v1/interface/executor_pb2.py: $(V1_EXECUTOR_PROTO)
 	$(MKDIR_P) $(@D)
-	$(PROTOC) -I$(top_srcdir)/include/mesos/v1/scheduler		\
-          $(PROTOCFLAGS)						\
-          --python_out=python/interface/src/mesos/v1/interface $^
+	$(PROTOC) -I$(top_srcdir)/include/mesos/v1/executor $(PROTOCFLAGS)	\
+		--python_out=python/interface/src/mesos/v1/interface $^
 	$(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
 
-python/interface/src/mesos/interface/executor_pb2.py: $(EXECUTOR_PROTO)
+python/interface/src/mesos/v1/interface/mesos_pb2.py: $(V1_MESOS_PROTO)
 	$(MKDIR_P) $(@D)
-	$(PROTOC) -I$(top_srcdir)/include/mesos/executor		\
-          $(PROTOCFLAGS)						\
-          --python_out=python/interface/src/mesos/interface $^
-	$(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
+	$(PROTOC) -I$(top_srcdir)/include/mesos/v1 $(PROTOCFLAGS)		\
+		--python_out=python/interface/src/mesos/v1/interface $^
 
-python/interface/src/mesos/v1/interface/executor_pb2.py: $(V1_EXECUTOR_PROTO)
+python/interface/src/mesos/v1/interface/scheduler_pb2.py: $(V1_SCHEDULER_PROTO)
 	$(MKDIR_P) $(@D)
-	$(PROTOC) -I$(top_srcdir)/include/mesos/v1/executor		\
-          $(PROTOCFLAGS)						\
-          --python_out=python/interface/src/mesos/v1/interface $^
+	$(PROTOC) -I$(top_srcdir)/include/mesos/v1/scheduler $(PROTOCFLAGS)	\
+		--python_out=python/interface/src/mesos/v1/interface $^
 	$(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
 
+
 # We even use a convenience library for most of Mesos so that we can
 # exclude third party libraries so setuptools/distribute can build a
 # self-contained Python library and statically link in the third party