From fd0b332f4609bb3a2e3918f24ca470b1a3c2a301 Mon Sep 17 00:00:00 2001 From: Rich Gowman Date: Mon, 5 Feb 2018 13:55:20 -0500 Subject: Downgrade nanopb from 0.4.0-dev to 0.3.8. Also regenerate the protos --- Firestore/Protos/build-protos.sh | 2 +- .../nanopb/firestore/local/maybe_document.pb.c | 2 +- .../nanopb/firestore/local/maybe_document.pb.h | 2 +- .../Protos/nanopb/firestore/local/mutation.pb.c | 2 +- .../Protos/nanopb/firestore/local/mutation.pb.h | 2 +- .../Protos/nanopb/firestore/local/target.pb.c | 2 +- .../Protos/nanopb/firestore/local/target.pb.h | 2 +- .../Protos/nanopb/google/api/annotations.pb.c | 2 +- .../Protos/nanopb/google/api/annotations.pb.h | 2 +- Firestore/Protos/nanopb/google/api/http.pb.c | 2 +- Firestore/Protos/nanopb/google/api/http.pb.h | 2 +- .../nanopb/google/firestore/v1beta1/common.pb.c | 2 +- .../nanopb/google/firestore/v1beta1/common.pb.h | 2 +- .../nanopb/google/firestore/v1beta1/document.pb.c | 2 +- .../nanopb/google/firestore/v1beta1/document.pb.h | 6 ++-- .../nanopb/google/firestore/v1beta1/firestore.pb.c | 2 +- .../nanopb/google/firestore/v1beta1/firestore.pb.h | 6 ++-- .../nanopb/google/firestore/v1beta1/query.pb.c | 2 +- .../nanopb/google/firestore/v1beta1/query.pb.h | 18 +++++----- .../nanopb/google/firestore/v1beta1/write.pb.c | 2 +- .../nanopb/google/firestore/v1beta1/write.pb.h | 6 ++-- .../Protos/nanopb/google/protobuf/struct.pb.c | 2 +- .../Protos/nanopb/google/protobuf/struct.pb.h | 2 +- .../Protos/nanopb/google/protobuf/timestamp.pb.c | 2 +- .../Protos/nanopb/google/protobuf/timestamp.pb.h | 2 +- Firestore/Protos/nanopb/google/rpc/status.pb.c | 2 +- Firestore/Protos/nanopb/google/rpc/status.pb.h | 2 +- Firestore/Protos/nanopb/google/type/latlng.pb.c | 2 +- Firestore/Protos/nanopb/google/type/latlng.pb.h | 2 +- cmake/FindNanopb.cmake | 2 +- cmake/external/nanopb.cmake | 40 ++++++++++------------ 31 files changed, 62 insertions(+), 66 deletions(-) diff --git a/Firestore/Protos/build-protos.sh b/Firestore/Protos/build-protos.sh index ced0ee5..a535f16 100755 --- a/Firestore/Protos/build-protos.sh +++ b/Firestore/Protos/build-protos.sh @@ -22,7 +22,7 @@ pod update # Generate the objective C files from the protos. ./Pods/!ProtoCompiler/protoc \ --plugin=protoc-gen-grpc=Pods/\!ProtoCompiler-gRPCPlugin/grpc_objective_c_plugin \ - --plugin=../../build/external/nanopb/src/nanopb-build/generator/protoc-gen-nanopb \ + --plugin=../../build/external/nanopb/src/nanopb/generator/protoc-gen-nanopb \ -I protos --objc_out=objc --grpc_out=objc \ --nanopb_out="--options-file=protos/%s.options:nanopb" \ `find protos -name *.proto -print | xargs` diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.c b/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.c index 45bc2f0..7cd4035 100644 --- a/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.c +++ b/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "maybe_document.pb.h" diff --git a/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.h b/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.h index 8c2f8bd..b159cd1 100644 --- a/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.h +++ b/Firestore/Protos/nanopb/firestore/local/maybe_document.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_PB_H_INCLUDED #define PB_FIRESTORE_CLIENT_MAYBE_DOCUMENT_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.pb.c b/Firestore/Protos/nanopb/firestore/local/mutation.pb.c index 39dfd77..7dedb14 100644 --- a/Firestore/Protos/nanopb/firestore/local/mutation.pb.c +++ b/Firestore/Protos/nanopb/firestore/local/mutation.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "mutation.pb.h" diff --git a/Firestore/Protos/nanopb/firestore/local/mutation.pb.h b/Firestore/Protos/nanopb/firestore/local/mutation.pb.h index 28b8e54..537d0cd 100644 --- a/Firestore/Protos/nanopb/firestore/local/mutation.pb.h +++ b/Firestore/Protos/nanopb/firestore/local/mutation.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_FIRESTORE_CLIENT_MUTATION_PB_H_INCLUDED #define PB_FIRESTORE_CLIENT_MUTATION_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/firestore/local/target.pb.c b/Firestore/Protos/nanopb/firestore/local/target.pb.c index 269eb04..2805ceb 100644 --- a/Firestore/Protos/nanopb/firestore/local/target.pb.c +++ b/Firestore/Protos/nanopb/firestore/local/target.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "target.pb.h" diff --git a/Firestore/Protos/nanopb/firestore/local/target.pb.h b/Firestore/Protos/nanopb/firestore/local/target.pb.h index 01b0fdc..8cc146f 100644 --- a/Firestore/Protos/nanopb/firestore/local/target.pb.h +++ b/Firestore/Protos/nanopb/firestore/local/target.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_FIRESTORE_CLIENT_TARGET_PB_H_INCLUDED #define PB_FIRESTORE_CLIENT_TARGET_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/google/api/annotations.pb.c b/Firestore/Protos/nanopb/google/api/annotations.pb.c index f26aa49..6da5206 100644 --- a/Firestore/Protos/nanopb/google/api/annotations.pb.c +++ b/Firestore/Protos/nanopb/google/api/annotations.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "annotations.pb.h" diff --git a/Firestore/Protos/nanopb/google/api/annotations.pb.h b/Firestore/Protos/nanopb/google/api/annotations.pb.h index 656d293..33c9ba8 100644 --- a/Firestore/Protos/nanopb/google/api/annotations.pb.h +++ b/Firestore/Protos/nanopb/google/api/annotations.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_API_ANNOTATIONS_PB_H_INCLUDED #define PB_GOOGLE_API_ANNOTATIONS_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/google/api/http.pb.c b/Firestore/Protos/nanopb/google/api/http.pb.c index d2c39aa..5219163 100644 --- a/Firestore/Protos/nanopb/google/api/http.pb.c +++ b/Firestore/Protos/nanopb/google/api/http.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "http.pb.h" diff --git a/Firestore/Protos/nanopb/google/api/http.pb.h b/Firestore/Protos/nanopb/google/api/http.pb.h index e41343f..e29758c 100644 --- a/Firestore/Protos/nanopb/google/api/http.pb.h +++ b/Firestore/Protos/nanopb/google/api/http.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_API_HTTP_PB_H_INCLUDED #define PB_GOOGLE_API_HTTP_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/common.pb.c b/Firestore/Protos/nanopb/google/firestore/v1beta1/common.pb.c index 6b93f2a..de2cf65 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/common.pb.c +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/common.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "common.pb.h" diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/common.pb.h b/Firestore/Protos/nanopb/google/firestore/v1beta1/common.pb.h index 6f61794..277d9b8 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/common.pb.h +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/common.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_FIRESTORE_V1BETA1_COMMON_PB_H_INCLUDED #define PB_GOOGLE_FIRESTORE_V1BETA1_COMMON_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.c b/Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.c index a35a713..862c884 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.c +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "document.pb.h" diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.h b/Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.h index c9b36e2..180c1af 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.h +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/document.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_FIRESTORE_V1BETA1_DOCUMENT_PB_H_INCLUDED #define PB_GOOGLE_FIRESTORE_V1BETA1_DOCUMENT_PB_H_INCLUDED @@ -89,13 +89,13 @@ typedef struct _google_firestore_v1beta1_MapValue_FieldsEntry { /* Initializer values for message structs */ #define google_firestore_v1beta1_Document_init_default {{{NULL}, NULL}, {{NULL}, NULL}, google_protobuf_Timestamp_init_default, google_protobuf_Timestamp_init_default} #define google_firestore_v1beta1_Document_FieldsEntry_init_default {{{NULL}, NULL}, google_firestore_v1beta1_Value_init_default} -#define google_firestore_v1beta1_Value_init_default {0, 0, 0, {{NULL}, NULL}, google_firestore_v1beta1_MapValue_init_default, google_type_LatLng_init_default, google_firestore_v1beta1_ArrayValue_init_default, google_protobuf_Timestamp_init_default, _google_protobuf_NullValue_MIN, {{NULL}, NULL}, {{NULL}, NULL}} +#define google_firestore_v1beta1_Value_init_default {0, 0, 0, {{NULL}, NULL}, google_firestore_v1beta1_MapValue_init_default, google_type_LatLng_init_default, google_firestore_v1beta1_ArrayValue_init_default, google_protobuf_Timestamp_init_default, (google_protobuf_NullValue)0, {{NULL}, NULL}, {{NULL}, NULL}} #define google_firestore_v1beta1_ArrayValue_init_default {{{NULL}, NULL}} #define google_firestore_v1beta1_MapValue_init_default {{{NULL}, NULL}} #define google_firestore_v1beta1_MapValue_FieldsEntry_init_default {{{NULL}, NULL}, google_firestore_v1beta1_Value_init_default} #define google_firestore_v1beta1_Document_init_zero {{{NULL}, NULL}, {{NULL}, NULL}, google_protobuf_Timestamp_init_zero, google_protobuf_Timestamp_init_zero} #define google_firestore_v1beta1_Document_FieldsEntry_init_zero {{{NULL}, NULL}, google_firestore_v1beta1_Value_init_zero} -#define google_firestore_v1beta1_Value_init_zero {0, 0, 0, {{NULL}, NULL}, google_firestore_v1beta1_MapValue_init_zero, google_type_LatLng_init_zero, google_firestore_v1beta1_ArrayValue_init_zero, google_protobuf_Timestamp_init_zero, _google_protobuf_NullValue_MIN, {{NULL}, NULL}, {{NULL}, NULL}} +#define google_firestore_v1beta1_Value_init_zero {0, 0, 0, {{NULL}, NULL}, google_firestore_v1beta1_MapValue_init_zero, google_type_LatLng_init_zero, google_firestore_v1beta1_ArrayValue_init_zero, google_protobuf_Timestamp_init_zero, (google_protobuf_NullValue)0, {{NULL}, NULL}, {{NULL}, NULL}} #define google_firestore_v1beta1_ArrayValue_init_zero {{{NULL}, NULL}} #define google_firestore_v1beta1_MapValue_init_zero {{{NULL}, NULL}} #define google_firestore_v1beta1_MapValue_FieldsEntry_init_zero {{{NULL}, NULL}, google_firestore_v1beta1_Value_init_zero} diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.pb.c b/Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.pb.c index a450c28..bc8eca9 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.pb.c +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "firestore.pb.h" diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.pb.h b/Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.pb.h index ef62edb..5bfbcf8 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.pb.h +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/firestore.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_FIRESTORE_V1BETA1_FIRESTORE_PB_H_INCLUDED #define PB_GOOGLE_FIRESTORE_V1BETA1_FIRESTORE_PB_H_INCLUDED @@ -305,7 +305,7 @@ typedef struct _google_firestore_v1beta1_ListenRequest { #define google_firestore_v1beta1_Target_init_default {0, {google_firestore_v1beta1_Target_QueryTarget_init_default}, {{NULL}, NULL}, 0, 0, google_protobuf_Timestamp_init_default} #define google_firestore_v1beta1_Target_DocumentsTarget_init_default {{{NULL}, NULL}} #define google_firestore_v1beta1_Target_QueryTarget_init_default {{{NULL}, NULL}, 0, {google_firestore_v1beta1_StructuredQuery_init_default}} -#define google_firestore_v1beta1_TargetChange_init_default {_google_firestore_v1beta1_TargetChange_TargetChangeType_MIN, {{NULL}, NULL}, google_rpc_Status_init_default, {{NULL}, NULL}, google_protobuf_Timestamp_init_default} +#define google_firestore_v1beta1_TargetChange_init_default {(google_firestore_v1beta1_TargetChange_TargetChangeType)0, {{NULL}, NULL}, google_rpc_Status_init_default, {{NULL}, NULL}, google_protobuf_Timestamp_init_default} #define google_firestore_v1beta1_ListCollectionIdsRequest_init_default {{{NULL}, NULL}, 0, {{NULL}, NULL}} #define google_firestore_v1beta1_ListCollectionIdsResponse_init_default {{{NULL}, NULL}, {{NULL}, NULL}} #define google_firestore_v1beta1_GetDocumentRequest_init_zero {{{NULL}, NULL}, google_firestore_v1beta1_DocumentMask_init_zero, {{NULL}, NULL}, google_protobuf_Timestamp_init_zero} @@ -332,7 +332,7 @@ typedef struct _google_firestore_v1beta1_ListenRequest { #define google_firestore_v1beta1_Target_init_zero {0, {google_firestore_v1beta1_Target_QueryTarget_init_zero}, {{NULL}, NULL}, 0, 0, google_protobuf_Timestamp_init_zero} #define google_firestore_v1beta1_Target_DocumentsTarget_init_zero {{{NULL}, NULL}} #define google_firestore_v1beta1_Target_QueryTarget_init_zero {{{NULL}, NULL}, 0, {google_firestore_v1beta1_StructuredQuery_init_zero}} -#define google_firestore_v1beta1_TargetChange_init_zero {_google_firestore_v1beta1_TargetChange_TargetChangeType_MIN, {{NULL}, NULL}, google_rpc_Status_init_zero, {{NULL}, NULL}, google_protobuf_Timestamp_init_zero} +#define google_firestore_v1beta1_TargetChange_init_zero {(google_firestore_v1beta1_TargetChange_TargetChangeType)0, {{NULL}, NULL}, google_rpc_Status_init_zero, {{NULL}, NULL}, google_protobuf_Timestamp_init_zero} #define google_firestore_v1beta1_ListCollectionIdsRequest_init_zero {{{NULL}, NULL}, 0, {{NULL}, NULL}} #define google_firestore_v1beta1_ListCollectionIdsResponse_init_zero {{{NULL}, NULL}, {{NULL}, NULL}} diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/query.pb.c b/Firestore/Protos/nanopb/google/firestore/v1beta1/query.pb.c index c3dbc55..4e68490 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/query.pb.c +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/query.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "query.pb.h" diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/query.pb.h b/Firestore/Protos/nanopb/google/firestore/v1beta1/query.pb.h index c6c555b..faad2a2 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/query.pb.h +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/query.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_FIRESTORE_V1BETA1_QUERY_PB_H_INCLUDED #define PB_GOOGLE_FIRESTORE_V1BETA1_QUERY_PB_H_INCLUDED @@ -154,20 +154,20 @@ typedef struct _google_firestore_v1beta1_StructuredQuery { #define google_firestore_v1beta1_StructuredQuery_init_default {google_firestore_v1beta1_StructuredQuery_Projection_init_default, {{NULL}, NULL}, google_firestore_v1beta1_StructuredQuery_Filter_init_default, {{NULL}, NULL}, google_protobuf_Int32Value_init_default, 0, google_firestore_v1beta1_Cursor_init_default, google_firestore_v1beta1_Cursor_init_default} #define google_firestore_v1beta1_StructuredQuery_CollectionSelector_init_default {{{NULL}, NULL}, 0} #define google_firestore_v1beta1_StructuredQuery_Filter_init_default {0, {google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_default}} -#define google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_default {_google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_MIN, {{NULL}, NULL}} -#define google_firestore_v1beta1_StructuredQuery_FieldFilter_init_default {google_firestore_v1beta1_StructuredQuery_FieldReference_init_default, _google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_MIN, google_firestore_v1beta1_Value_init_default} -#define google_firestore_v1beta1_StructuredQuery_UnaryFilter_init_default {_google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_MIN, 0, {google_firestore_v1beta1_StructuredQuery_FieldReference_init_default}} -#define google_firestore_v1beta1_StructuredQuery_Order_init_default {google_firestore_v1beta1_StructuredQuery_FieldReference_init_default, _google_firestore_v1beta1_StructuredQuery_Direction_MIN} +#define google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_default {(google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator)0, {{NULL}, NULL}} +#define google_firestore_v1beta1_StructuredQuery_FieldFilter_init_default {google_firestore_v1beta1_StructuredQuery_FieldReference_init_default, (google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator)0, google_firestore_v1beta1_Value_init_default} +#define google_firestore_v1beta1_StructuredQuery_UnaryFilter_init_default {(google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator)0, 0, {google_firestore_v1beta1_StructuredQuery_FieldReference_init_default}} +#define google_firestore_v1beta1_StructuredQuery_Order_init_default {google_firestore_v1beta1_StructuredQuery_FieldReference_init_default, (google_firestore_v1beta1_StructuredQuery_Direction)0} #define google_firestore_v1beta1_StructuredQuery_FieldReference_init_default {{{NULL}, NULL}} #define google_firestore_v1beta1_StructuredQuery_Projection_init_default {{{NULL}, NULL}} #define google_firestore_v1beta1_Cursor_init_default {{{NULL}, NULL}, 0} #define google_firestore_v1beta1_StructuredQuery_init_zero {google_firestore_v1beta1_StructuredQuery_Projection_init_zero, {{NULL}, NULL}, google_firestore_v1beta1_StructuredQuery_Filter_init_zero, {{NULL}, NULL}, google_protobuf_Int32Value_init_zero, 0, google_firestore_v1beta1_Cursor_init_zero, google_firestore_v1beta1_Cursor_init_zero} #define google_firestore_v1beta1_StructuredQuery_CollectionSelector_init_zero {{{NULL}, NULL}, 0} #define google_firestore_v1beta1_StructuredQuery_Filter_init_zero {0, {google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_zero}} -#define google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_zero {_google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator_MIN, {{NULL}, NULL}} -#define google_firestore_v1beta1_StructuredQuery_FieldFilter_init_zero {google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero, _google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator_MIN, google_firestore_v1beta1_Value_init_zero} -#define google_firestore_v1beta1_StructuredQuery_UnaryFilter_init_zero {_google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator_MIN, 0, {google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero}} -#define google_firestore_v1beta1_StructuredQuery_Order_init_zero {google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero, _google_firestore_v1beta1_StructuredQuery_Direction_MIN} +#define google_firestore_v1beta1_StructuredQuery_CompositeFilter_init_zero {(google_firestore_v1beta1_StructuredQuery_CompositeFilter_Operator)0, {{NULL}, NULL}} +#define google_firestore_v1beta1_StructuredQuery_FieldFilter_init_zero {google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero, (google_firestore_v1beta1_StructuredQuery_FieldFilter_Operator)0, google_firestore_v1beta1_Value_init_zero} +#define google_firestore_v1beta1_StructuredQuery_UnaryFilter_init_zero {(google_firestore_v1beta1_StructuredQuery_UnaryFilter_Operator)0, 0, {google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero}} +#define google_firestore_v1beta1_StructuredQuery_Order_init_zero {google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero, (google_firestore_v1beta1_StructuredQuery_Direction)0} #define google_firestore_v1beta1_StructuredQuery_FieldReference_init_zero {{{NULL}, NULL}} #define google_firestore_v1beta1_StructuredQuery_Projection_init_zero {{{NULL}, NULL}} #define google_firestore_v1beta1_Cursor_init_zero {{{NULL}, NULL}, 0} diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/write.pb.c b/Firestore/Protos/nanopb/google/firestore/v1beta1/write.pb.c index 79b4c63..462eca6 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/write.pb.c +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/write.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "write.pb.h" diff --git a/Firestore/Protos/nanopb/google/firestore/v1beta1/write.pb.h b/Firestore/Protos/nanopb/google/firestore/v1beta1/write.pb.h index d9e15d3..a44b6d4 100644 --- a/Firestore/Protos/nanopb/google/firestore/v1beta1/write.pb.h +++ b/Firestore/Protos/nanopb/google/firestore/v1beta1/write.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_FIRESTORE_V1BETA1_WRITE_PB_H_INCLUDED #define PB_GOOGLE_FIRESTORE_V1BETA1_WRITE_PB_H_INCLUDED @@ -111,7 +111,7 @@ typedef struct _google_firestore_v1beta1_WriteResult { /* Initializer values for message structs */ #define google_firestore_v1beta1_Write_init_default {google_firestore_v1beta1_Document_init_default, {{NULL}, NULL}, google_firestore_v1beta1_DocumentMask_init_default, google_firestore_v1beta1_Precondition_init_default, {{NULL}, NULL}, google_firestore_v1beta1_DocumentTransform_init_default} #define google_firestore_v1beta1_DocumentTransform_init_default {{{NULL}, NULL}, {{NULL}, NULL}} -#define google_firestore_v1beta1_DocumentTransform_FieldTransform_init_default {{{NULL}, NULL}, 0, {_google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_MIN}} +#define google_firestore_v1beta1_DocumentTransform_FieldTransform_init_default {{{NULL}, NULL}, 0, {(google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue)0}} #define google_firestore_v1beta1_WriteResult_init_default {google_protobuf_Timestamp_init_default, {{NULL}, NULL}} #define google_firestore_v1beta1_DocumentChange_init_default {google_firestore_v1beta1_Document_init_default, {{NULL}, NULL}, {{NULL}, NULL}} #define google_firestore_v1beta1_DocumentDelete_init_default {{{NULL}, NULL}, google_protobuf_Timestamp_init_default, {{NULL}, NULL}} @@ -119,7 +119,7 @@ typedef struct _google_firestore_v1beta1_WriteResult { #define google_firestore_v1beta1_ExistenceFilter_init_default {0, 0} #define google_firestore_v1beta1_Write_init_zero {google_firestore_v1beta1_Document_init_zero, {{NULL}, NULL}, google_firestore_v1beta1_DocumentMask_init_zero, google_firestore_v1beta1_Precondition_init_zero, {{NULL}, NULL}, google_firestore_v1beta1_DocumentTransform_init_zero} #define google_firestore_v1beta1_DocumentTransform_init_zero {{{NULL}, NULL}, {{NULL}, NULL}} -#define google_firestore_v1beta1_DocumentTransform_FieldTransform_init_zero {{{NULL}, NULL}, 0, {_google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue_MIN}} +#define google_firestore_v1beta1_DocumentTransform_FieldTransform_init_zero {{{NULL}, NULL}, 0, {(google_firestore_v1beta1_DocumentTransform_FieldTransform_ServerValue)0}} #define google_firestore_v1beta1_WriteResult_init_zero {google_protobuf_Timestamp_init_zero, {{NULL}, NULL}} #define google_firestore_v1beta1_DocumentChange_init_zero {google_firestore_v1beta1_Document_init_zero, {{NULL}, NULL}, {{NULL}, NULL}} #define google_firestore_v1beta1_DocumentDelete_init_zero {{{NULL}, NULL}, google_protobuf_Timestamp_init_zero, {{NULL}, NULL}} diff --git a/Firestore/Protos/nanopb/google/protobuf/struct.pb.c b/Firestore/Protos/nanopb/google/protobuf/struct.pb.c index b0ed35c..2826aab 100644 --- a/Firestore/Protos/nanopb/google/protobuf/struct.pb.c +++ b/Firestore/Protos/nanopb/google/protobuf/struct.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.3.9 at Tue Jan 30 18:12:08 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "struct.pb.h" diff --git a/Firestore/Protos/nanopb/google/protobuf/struct.pb.h b/Firestore/Protos/nanopb/google/protobuf/struct.pb.h index 1871f0e..b325b60 100644 --- a/Firestore/Protos/nanopb/google/protobuf/struct.pb.h +++ b/Firestore/Protos/nanopb/google/protobuf/struct.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.3.9 at Tue Jan 30 18:12:08 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_PROTOBUF_STRUCT_PB_H_INCLUDED #define PB_GOOGLE_PROTOBUF_STRUCT_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/google/protobuf/timestamp.pb.c b/Firestore/Protos/nanopb/google/protobuf/timestamp.pb.c index 0ad8cd7..4f03c19 100644 --- a/Firestore/Protos/nanopb/google/protobuf/timestamp.pb.c +++ b/Firestore/Protos/nanopb/google/protobuf/timestamp.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.3.9 at Tue Jan 30 18:12:08 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "timestamp.pb.h" diff --git a/Firestore/Protos/nanopb/google/protobuf/timestamp.pb.h b/Firestore/Protos/nanopb/google/protobuf/timestamp.pb.h index 84dd444..d7be977 100644 --- a/Firestore/Protos/nanopb/google/protobuf/timestamp.pb.h +++ b/Firestore/Protos/nanopb/google/protobuf/timestamp.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.3.9 at Tue Jan 30 18:12:08 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_PROTOBUF_TIMESTAMP_PB_H_INCLUDED #define PB_GOOGLE_PROTOBUF_TIMESTAMP_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/google/rpc/status.pb.c b/Firestore/Protos/nanopb/google/rpc/status.pb.c index f745a6b..dbdccce 100644 --- a/Firestore/Protos/nanopb/google/rpc/status.pb.c +++ b/Firestore/Protos/nanopb/google/rpc/status.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "status.pb.h" diff --git a/Firestore/Protos/nanopb/google/rpc/status.pb.h b/Firestore/Protos/nanopb/google/rpc/status.pb.h index 0081c09..afcbab9 100644 --- a/Firestore/Protos/nanopb/google/rpc/status.pb.h +++ b/Firestore/Protos/nanopb/google/rpc/status.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_RPC_STATUS_PB_H_INCLUDED #define PB_GOOGLE_RPC_STATUS_PB_H_INCLUDED diff --git a/Firestore/Protos/nanopb/google/type/latlng.pb.c b/Firestore/Protos/nanopb/google/type/latlng.pb.c index ae2ddc9..b5f6424 100644 --- a/Firestore/Protos/nanopb/google/type/latlng.pb.c +++ b/Firestore/Protos/nanopb/google/type/latlng.pb.c @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb constant definitions */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #include "latlng.pb.h" diff --git a/Firestore/Protos/nanopb/google/type/latlng.pb.h b/Firestore/Protos/nanopb/google/type/latlng.pb.h index 5157868..fa5703b 100644 --- a/Firestore/Protos/nanopb/google/type/latlng.pb.h +++ b/Firestore/Protos/nanopb/google/type/latlng.pb.h @@ -15,7 +15,7 @@ */ /* Automatically generated nanopb header */ -/* Generated by nanopb-0.4.0-dev at Wed Jan 31 18:12:27 2018. */ +/* Generated by nanopb-0.3.8 at Fri Feb 2 17:48:02 2018. */ #ifndef PB_GOOGLE_TYPE_LATLNG_PB_H_INCLUDED #define PB_GOOGLE_TYPE_LATLNG_PB_H_INCLUDED diff --git a/cmake/FindNanopb.cmake b/cmake/FindNanopb.cmake index fab6f4a..fb22aef 100644 --- a/cmake/FindNanopb.cmake +++ b/cmake/FindNanopb.cmake @@ -21,7 +21,7 @@ find_package_handle_standard_args( ) if(NANOPB_FOUND) - set(NANOPB_INCLUDE_DIRS ${NANOPB_INCLUDE_DIR} ) + set(NANOPB_INCLUDE_DIRS ${NANOPB_INCLUDE_DIR}) if (NOT TARGET nanopb) add_library(nanopb UNKNOWN IMPORTED) diff --git a/cmake/external/nanopb.cmake b/cmake/external/nanopb.cmake index d602d9a..c78613f 100644 --- a/cmake/external/nanopb.cmake +++ b/cmake/external/nanopb.cmake @@ -1,6 +1,4 @@ -# Copyright 2018 Google -# -# Licensed under the Apache License, Version 2.0 (the "License"); +# Copyright 2018 Google # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # @@ -18,7 +16,7 @@ include(ExternalProjectFlags) ExternalProject_GitSource( NANOPB_GIT GIT_REPOSITORY "https://github.com/nanopb/nanopb.git" - GIT_TAG "master" # Needs the most recent. 0.3.9 doesn't fully support cmake. + GIT_TAG "0.3.8" ) ExternalProject_Add( @@ -28,34 +26,32 @@ ExternalProject_Add( ${NANOPB_GIT} + BUILD_IN_SOURCE ON + PREFIX ${PROJECT_BINARY_DIR}/external/nanopb + # Note for (not yet released) nanopb 0.4.0: nanopb will (likely) switch to + # cmake for the protoc plugin. Set these additional cmake variables to use + # it. + # -Dnanopb_BUILD_GENERATOR:BOOL=ON + # -Dnanopb_PROTOC_PATH:STRING=${FIREBASE_INSTALL_DIR}/external/protobuf/src/protobuf-build/src/protoc CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DBUILD_SHARED_LIBS:BOOL=OFF - -Dnanopb_BUILD_GENERATOR:BOOL=ON - -Dnanopb_PROTOC_PATH:STRING=${FIREBASE_INSTALL_DIR}/external/protobuf/src/protobuf-build/src/protoc BUILD_COMMAND - ${CMAKE_COMMAND} --build . - # NB: The following additional build commands are only necessary to - # regenerate the nanopb proto files. - COMMAND - ${CMAKE_COMMAND} -E make_directory /generator/proto COMMAND - ${CMAKE_COMMAND} -E copy /generator/proto/__init__.py /generator/proto/ - COMMAND - ${CMAKE_COMMAND} -E copy /generator/protoc-gen-nanopb /generator/ - COMMAND - ${CMAKE_COMMAND} -E copy /generator/nanopb_generator.py /generator/ - COMMAND - ${CMAKE_COMMAND} -E copy /nanopb_pb2.py /generator/proto/ + ${CMAKE_COMMAND} --build . + # NB: The following additional command is only necessary to regenerate the + # nanopb proto files. COMMAND - ${CMAKE_COMMAND} -E copy /plugin_pb2.py /generator/proto/ + make -C /generator/proto - # TODO: once we clone via a tag (rather than the master branch) we should - # disable updates; i.e.: - # UPDATE_COMMAND "" + # nanopb relies on $PATH for the location of protoc. cmake makes it difficult + # to adjust the path, so we'll just patch the build files with the exact + # location of protoc. + PATCH_COMMAND perl -i -pe s,protoc,${FIREBASE_INSTALL_DIR}/external/protobuf/src/protobuf-build/src/protoc,g ./CMakeLists.txt ./generator/proto/Makefile + UPDATE_COMMAND "" INSTALL_COMMAND "" ) -- cgit v1.2.3