From 2a7dee8324ec962bcba9467d7740ef1a2fd6dae2 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 20 Aug 2018 11:03:06 +0200 Subject: [PATCH] python: fix generation of protobuf python code --- clients/python/CMakeLists.txt | 15 ++ clients/python/villas_pb2.py | 264 ---------------------------------- lib/formats/CMakeLists.txt | 3 +- 3 files changed, 16 insertions(+), 266 deletions(-) delete mode 100644 clients/python/villas_pb2.py diff --git a/clients/python/CMakeLists.txt b/clients/python/CMakeLists.txt index e9bfca724..632bf86ad 100644 --- a/clients/python/CMakeLists.txt +++ b/clients/python/CMakeLists.txt @@ -20,4 +20,19 @@ # along with this program. If not, see . ################################################################################### +if(DEFINED PROTOBUF_COMPILER AND PROTOBUF_FOUND) + add_custom_command( + OUTPUT + villas_pb2.py + COMMAND ${PROTOBUF_COMPILER} + --python_out=${CMAKE_CURRENT_BINARY_DIR} + villas.proto + MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/lib/formats/villas.proto + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/lib/formats + ) + add_custom_target(python ALL + DEPENDS + villas_pb2.py + ) +endif() diff --git a/clients/python/villas_pb2.py b/clients/python/villas_pb2.py deleted file mode 100644 index 4ba71a132..000000000 --- a/clients/python/villas_pb2.py +++ /dev/null @@ -1,264 +0,0 @@ -# Generated by the protocol buffer compiler. DO NOT EDIT! -# source: villas.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) -from google.protobuf import descriptor as _descriptor -from google.protobuf import message as _message -from google.protobuf import reflection as _reflection -from google.protobuf import symbol_database as _symbol_database -from google.protobuf import descriptor_pb2 -# @@protoc_insertion_point(imports) - -_sym_db = _symbol_database.Default() - - - - -DESCRIPTOR = _descriptor.FileDescriptor( - name='villas.proto', - package='villas.node', - serialized_pb=_b('\n\x0cvillas.proto\x12\x0bvillas.node\"/\n\x07Message\x12$\n\x07samples\x18\x01 \x03(\x0b\x32\x13.villas.node.Sample\"\xca\x01\n\x06Sample\x12,\n\x04type\x18\x01 \x02(\x0e\x32\x18.villas.node.Sample.Type:\x04\x44\x41TA\x12\x10\n\x08sequence\x18\x02 \x01(\r\x12\n\n\x02id\x18\x03 \x01(\r\x12)\n\ttimestamp\x18\x04 \x01(\x0b\x32\x16.villas.node.Timestamp\x12\"\n\x06values\x18\x05 \x03(\x0b\x32\x12.villas.node.Value\"%\n\x04Type\x12\x08\n\x04\x44\x41TA\x10\x01\x12\t\n\x05START\x10\x02\x12\x08\n\x04STOP\x10\x03\"&\n\tTimestamp\x12\x0b\n\x03sec\x18\x01 \x02(\r\x12\x0c\n\x04nsec\x18\x02 \x02(\r\"*\n\x05Value\x12\x0b\n\x01\x66\x18\x01 \x01(\x02H\x00\x12\x0b\n\x01i\x18\x02 \x01(\x05H\x00\x42\x07\n\x05value') -) -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - - - -_SAMPLE_TYPE = _descriptor.EnumDescriptor( - name='Type', - full_name='villas.node.Sample.Type', - filename=None, - file=DESCRIPTOR, - values=[ - _descriptor.EnumValueDescriptor( - name='DATA', index=0, number=1, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='START', index=1, number=2, - options=None, - type=None), - _descriptor.EnumValueDescriptor( - name='STOP', index=2, number=3, - options=None, - type=None), - ], - containing_type=None, - options=None, - serialized_start=244, - serialized_end=281, -) -_sym_db.RegisterEnumDescriptor(_SAMPLE_TYPE) - - -_MESSAGE = _descriptor.Descriptor( - name='Message', - full_name='villas.node.Message', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='samples', full_name='villas.node.Message.samples', index=0, - number=1, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - oneofs=[ - ], - serialized_start=29, - serialized_end=76, -) - - -_SAMPLE = _descriptor.Descriptor( - name='Sample', - full_name='villas.node.Sample', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='type', full_name='villas.node.Sample.type', index=0, - number=1, type=14, cpp_type=8, label=2, - has_default_value=True, default_value=1, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='sequence', full_name='villas.node.Sample.sequence', index=1, - number=2, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='id', full_name='villas.node.Sample.id', index=2, - number=3, type=13, cpp_type=3, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='timestamp', full_name='villas.node.Sample.timestamp', index=3, - number=4, type=11, cpp_type=10, label=1, - has_default_value=False, default_value=None, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='values', full_name='villas.node.Sample.values', index=4, - number=5, type=11, cpp_type=10, label=3, - has_default_value=False, default_value=[], - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - _SAMPLE_TYPE, - ], - options=None, - is_extendable=False, - extension_ranges=[], - oneofs=[ - ], - serialized_start=79, - serialized_end=281, -) - - -_TIMESTAMP = _descriptor.Descriptor( - name='Timestamp', - full_name='villas.node.Timestamp', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='sec', full_name='villas.node.Timestamp.sec', index=0, - number=1, type=13, cpp_type=3, label=2, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='nsec', full_name='villas.node.Timestamp.nsec', index=1, - number=2, type=13, cpp_type=3, label=2, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - oneofs=[ - ], - serialized_start=283, - serialized_end=321, -) - - -_VALUE = _descriptor.Descriptor( - name='Value', - full_name='villas.node.Value', - filename=None, - file=DESCRIPTOR, - containing_type=None, - fields=[ - _descriptor.FieldDescriptor( - name='f', full_name='villas.node.Value.f', index=0, - number=1, type=2, cpp_type=6, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - _descriptor.FieldDescriptor( - name='i', full_name='villas.node.Value.i', index=1, - number=2, type=5, cpp_type=1, label=1, - has_default_value=False, default_value=0, - message_type=None, enum_type=None, containing_type=None, - is_extension=False, extension_scope=None, - options=None), - ], - extensions=[ - ], - nested_types=[], - enum_types=[ - ], - options=None, - is_extendable=False, - extension_ranges=[], - oneofs=[ - _descriptor.OneofDescriptor( - name='value', full_name='villas.node.Value.value', - index=0, containing_type=None, fields=[]), - ], - serialized_start=323, - serialized_end=365, -) - -_MESSAGE.fields_by_name['samples'].message_type = _SAMPLE -_SAMPLE.fields_by_name['type'].enum_type = _SAMPLE_TYPE -_SAMPLE.fields_by_name['timestamp'].message_type = _TIMESTAMP -_SAMPLE.fields_by_name['values'].message_type = _VALUE -_SAMPLE_TYPE.containing_type = _SAMPLE -_VALUE.oneofs_by_name['value'].fields.append( - _VALUE.fields_by_name['f']) -_VALUE.fields_by_name['f'].containing_oneof = _VALUE.oneofs_by_name['value'] -_VALUE.oneofs_by_name['value'].fields.append( - _VALUE.fields_by_name['i']) -_VALUE.fields_by_name['i'].containing_oneof = _VALUE.oneofs_by_name['value'] -DESCRIPTOR.message_types_by_name['Message'] = _MESSAGE -DESCRIPTOR.message_types_by_name['Sample'] = _SAMPLE -DESCRIPTOR.message_types_by_name['Timestamp'] = _TIMESTAMP -DESCRIPTOR.message_types_by_name['Value'] = _VALUE - -Message = _reflection.GeneratedProtocolMessageType('Message', (_message.Message,), dict( - DESCRIPTOR = _MESSAGE, - __module__ = 'villas_pb2' - # @@protoc_insertion_point(class_scope:villas.node.Message) - )) -_sym_db.RegisterMessage(Message) - -Sample = _reflection.GeneratedProtocolMessageType('Sample', (_message.Message,), dict( - DESCRIPTOR = _SAMPLE, - __module__ = 'villas_pb2' - # @@protoc_insertion_point(class_scope:villas.node.Sample) - )) -_sym_db.RegisterMessage(Sample) - -Timestamp = _reflection.GeneratedProtocolMessageType('Timestamp', (_message.Message,), dict( - DESCRIPTOR = _TIMESTAMP, - __module__ = 'villas_pb2' - # @@protoc_insertion_point(class_scope:villas.node.Timestamp) - )) -_sym_db.RegisterMessage(Timestamp) - -Value = _reflection.GeneratedProtocolMessageType('Value', (_message.Message,), dict( - DESCRIPTOR = _VALUE, - __module__ = 'villas_pb2' - # @@protoc_insertion_point(class_scope:villas.node.Value) - )) -_sym_db.RegisterMessage(Value) - - -# @@protoc_insertion_point(module_scope) diff --git a/lib/formats/CMakeLists.txt b/lib/formats/CMakeLists.txt index 4d6652ac9..f9ce21770 100644 --- a/lib/formats/CMakeLists.txt +++ b/lib/formats/CMakeLists.txt @@ -23,10 +23,9 @@ if(DEFINED PROTOBUF_COMPILER AND PROTOBUF_FOUND) add_custom_command( OUTPUT - villas.pb.cc villas.pb.h villas_pb2.py + villas.pb.cc villas.pb.h message.js sample.js timestamp.js value.js COMMAND ${PROTOBUF_COMPILER} - --python_out=${CMAKE_CURRENT_BINARY_DIR} --js_out=${CMAKE_CURRENT_BINARY_DIR} --cpp_out=${CMAKE_CURRENT_BINARY_DIR} villas.proto