> On April 14, 2014, 5:09 a.m., Benjamin Hindman wrote: > > src/Makefile.am, lines 108-110 > > <https://reviews.apache.org/r/20141/diff/3/?file=555025#file555025line108> > > > > Now this should be able to be just: > > > > JAVA_PROTOS = \ > > java/generated/org/apache/mesos/Protos.java \ > > java/generated/org/apache/mesos/containerizer/Protos.java > > > > > > And then below you should be able to define the Java targets like what > > was done for C++ and what you did for Python. > > Till Toenshoff wrote: > I may be missing something but IIUC, then using a subfolder for that > containerizer.proto does force me to add more rules like: > > [...] > > containerizer/%.pb.cc containerizer/%.pb.h: $(CONTAINERIZER_PROTO) > $(MKDIR_P) $(@D) > $(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/containerizer/Protos.java: > $(CONTAINERIZER_PROTO) > $(MKDIR_P) $(@D) > $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^ > > python/src/mesos_pb2.py: $(MESOS_PROTO) > $(MKDIR_P) $(@D) > $(PROTOC) $(PROTOCFLAGS) --python_out=python/src $^ > > python/src/containerizer/containerizer_pb2.py: $(CONTAINERIZER_PROTO) > $(MKDIR_P) $(@D) > $(PROTOC) $(PROTOCFLAGS) --python_out=python/src $^ > > > I will also have to adapt setup.py to cover subpackages: > > setup(name = 'mesos', > version = '0.19.0', > description = 'Mesos', > package_dir = { '': 'src' }, > packages = ['.', 'containerizer'], > install_requires = ['protobuf>=2.5.0'], > ext_modules = [mesos_module]) > > I would be happy to do so, but please confirm that this is what you aim > for.
I ended up doing it differently as I had trouble getting the subpackage stuff to work properly. - Till ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/20141/#review40228 ----------------------------------------------------------- On April 18, 2014, 3:20 a.m., Till Toenshoff wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/20141/ > ----------------------------------------------------------- > > (Updated April 18, 2014, 3:20 a.m.) > > > Review request for mesos, Benjamin Hindman and Niklas Nielsen. > > > Repository: mesos-git > > > Description > ------- > > Adds containerizer.proto containing protobuf message definitions for > "Launch", "Update" and "Termination". All of those are used in the upcoming > External Containerizer. > These protos are defined within their own C++ namespace: "containerizer". > > Replaced slave::Containerizer::Termination with the > containerizer::Termination protobuf, gaining a serializable Termination > message. > > The protoc results are added towards the Python Egg (containerizer_pb2.py) > and the Java package (ContainerizerProtos.java). > > > Diffs > ----- > > include/mesos/containerizer/containerizer.hpp PRE-CREATION > include/mesos/containerizer/containerizer.proto PRE-CREATION > src/Makefile.am 560b4c7 > src/slave/containerizer/containerizer.hpp d9ae326 > src/slave/containerizer/mesos_containerizer.hpp ee1fd30 > src/slave/containerizer/mesos_containerizer.cpp 1ce41d7 > src/slave/slave.hpp 1e98795 > src/slave/slave.cpp d6ec87c > src/tests/containerizer.hpp a9f1531 > src/tests/containerizer.cpp bfb9341 > > Diff: https://reviews.apache.org/r/20141/diff/ > > > Testing > ------- > > make check > > > Thanks, > > Till Toenshoff > >
