diff --git a/v2/build.sh b/v2/build.sh index efcd77f..bd549b5 100755 --- a/v2/build.sh +++ b/v2/build.sh @@ -27,7 +27,15 @@ hash protoc-gen-go 2>/dev/null || { echo >&2 'error: Make sure $GOPATH/bin is in mkdir -p $DIR/go $DIR/python $DIR/js $DIR/cpp find $DIR/go $DIR/python $DIR/js $DIR/cpp -type f -delete +$PROTOC --proto_path="$DIR/proto" \ + --go_out="$DIR/go" --go_opt=paths=source_relative \ + --go-grpc_out="$DIR/go" --go-grpc_opt=paths=source_relative \ + --js_out="import_style=commonjs,binary:$DIR/js" --cpp_out="$DIR/cpp" \ + $DIR/proto/*.proto -protoc --proto_path="$DIR/proto" --python_out="$DIR/python" --go_out="$DIR/go" --js_out="import_style=commonjs,binary:$DIR/js" --cpp_out="$DIR/cpp" $DIR/proto/*.proto +python -m grpc_tools.protoc --proto_path="$DIR/proto" \ + --python_out="$DIR/python" \ + --grpc_python_out="$DIR/python" \ + $DIR/proto/*.proto ls "$DIR"/go/*.pb.go | xargs -n1 -IX bash -c "sed -e 's/,omitempty//' X > X.tmp && mv X{.tmp,}" diff --git a/v2/cpp/claim.pb.cc b/v2/cpp/claim.pb.cc index 1235c28..17bed70 100644 --- a/v2/cpp/claim.pb.cc +++ b/v2/cpp/claim.pb.cc @@ -14,279 +14,208 @@ #include // @@protoc_insertion_point(includes) #include -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Audio_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<2> scc_info_Channel_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_ClaimList_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_ClaimReference_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Fee_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Image_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Language_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Location_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Software_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Source_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<6> scc_info_Stream_claim_2eproto; -extern PROTOBUF_INTERNAL_EXPORT_claim_2eproto ::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<1> scc_info_Video_claim_2eproto; + +PROTOBUF_PRAGMA_INIT_SEG namespace pb { -class ClaimDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; - const ::pb::Stream* stream_; - const ::pb::Channel* channel_; - const ::pb::ClaimList* collection_; - const ::pb::ClaimReference* repost_; -} _Claim_default_instance_; -class StreamDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; - const ::pb::Image* image_; - const ::pb::Video* video_; - const ::pb::Audio* audio_; - const ::pb::Software* software_; -} _Stream_default_instance_; -class ChannelDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; -} _Channel_default_instance_; -class ClaimReferenceDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; -} _ClaimReference_default_instance_; -class ClaimListDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; -} _ClaimList_default_instance_; -class SourceDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; -} _Source_default_instance_; -class FeeDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; -} _Fee_default_instance_; -class ImageDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed _instance; -} _Image_default_instance_; -class VideoDefaultTypeInternal { - public: - ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed