Fixed Python protobuf V1 generation.

V1 protobus were not being generated for python.

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


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

Branch: refs/heads/master
Commit: 01ca009af6e5566c80dde3304f2c64ceb041c3db
Parents: 5d246ce
Author: Isabel Jimenez <[email protected]>
Authored: Wed Oct 14 15:29:52 2015 +0200
Committer: Joris Van Remoortere <[email protected]>
Committed: Wed Oct 14 15:45:51 2015 +0200

----------------------------------------------------------------------
 src/Makefile.am                                 | 23 ++++++++++++++++++--
 src/python/interface/src/mesos/v1/__init__.py   |  0
 .../src/mesos/v1/interface/__init__.py          |  0
 3 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/01ca009a/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 347cd93..2bf40f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -235,8 +235,24 @@ PYTHON_PROTOS =                                            
                \
   python/interface/src/mesos/interface/mesos_pb2.py                    \
   python/interface/src/mesos/interface/containerizer_pb2.py
 
-BUILT_SOURCES += $(CXX_PROTOS) $(JAVA_PROTOS) $(V1_JAVA_PROTOS) 
$(PYTHON_PROTOS)
-CLEANFILES += $(CXX_PROTOS) $(JAVA_PROTOS) $(V1_JAVA_PROTOS) $(PYTHON_PROTOS)
+V1_PYTHON_PROTOS =                                                     \
+  python/interface/src/mesos/v1/interface/mesos_pb2.py                 \
+  python/interface/src/mesos/v1/interface/scheduler_pb2.py
+
+
+BUILT_SOURCES +=                                                       \
+  $(CXX_PROTOS)                                                        \
+  $(JAVA_PROTOS)                                                       \
+  $(V1_JAVA_PROTOS)                                                    \
+  $(PYTHON_PROTOS)                                                     \
+  $(V1_PYTHON_PROTOS)
+
+CLEANFILES +=                                                          \
+  $(CXX_PROTOS)                                                        \
+  $(JAVA_PROTOS)                                                       \
+  $(V1_JAVA_PROTOS)                                                    \
+  $(PYTHON_PROTOS)                                                     \
+  $(V1_PYTHON_PROTOS)
 
 FLAGS_PROTOS = messages/flags.pb.cc messages/flags.pb.h
 
@@ -1411,6 +1427,8 @@ PYTHON_SOURCE =                                           
                \
        python/cli/src/mesos/http.py                                    \
        python/interface/src/mesos/__init__.py                          \
        python/interface/src/mesos/interface/__init__.py                \
+       python/interface/src/mesos/v1/__init__.py                       \
+       python/interface/src/mesos/v1/interface/__init__.py             \
        python/native/src/mesos/__init__.py                             \
        python/native/src/mesos/native/__init__.py                      \
        python/native/src/mesos/native/mesos_executor_driver_impl.cpp   \
@@ -1484,6 +1502,7 @@ MESOS_WHLS =                                              
                                \
 # and converts it into the correct directory path.
 $(MESOS_EGGS) $(MESOS_WHLS):                                                   
        \
                $(PYTHON_PROTOS)                                                
        \
+               $(V1_PYTHON_PROTOS)                                             
        \
                $(PYTHON_SOURCE)                                                
        \
                libmesos_no_3rdparty.la                                         
        \
                $(PROTOBUF_EGG)

http://git-wip-us.apache.org/repos/asf/mesos/blob/01ca009a/src/python/interface/src/mesos/v1/__init__.py
----------------------------------------------------------------------
diff --git a/src/python/interface/src/mesos/v1/__init__.py 
b/src/python/interface/src/mesos/v1/__init__.py
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/mesos/blob/01ca009a/src/python/interface/src/mesos/v1/interface/__init__.py
----------------------------------------------------------------------
diff --git a/src/python/interface/src/mesos/v1/interface/__init__.py 
b/src/python/interface/src/mesos/v1/interface/__init__.py
new file mode 100644
index 0000000..e69de29

Reply via email to