Skip to content

Commit

Permalink
Commit generated ruby protobufs
Browse files Browse the repository at this point in the history
  • Loading branch information
bouk committed Mar 20, 2021
1 parent 1c5875e commit e7edc92
Show file tree
Hide file tree
Showing 13 changed files with 332 additions and 2 deletions.
1 change: 0 additions & 1 deletion .gitignore
Expand Up @@ -185,7 +185,6 @@ js/testproto_libs2.js
/bazel-*

# ruby test output
ruby/lib/
ruby/tests/basic_test_pb.rb
ruby/tests/basic_test_proto2_pb.rb
ruby/tests/generated_code_pb.rb
Expand Down
2 changes: 2 additions & 0 deletions ruby/ext/google/protobuf_c/extconf.rb
Expand Up @@ -17,4 +17,6 @@
$objs = ["protobuf.o", "convert.o", "defs.o", "message.o",
"repeated_field.o", "map.o", "ruby-upb.o", "wrap_memcpy.o"]

find_header('third_party/wyhash/wyhash.h', '../../../..')

This comment has been minimized.

Copy link
@es

es Mar 21, 2021

What is this for?

This comment has been minimized.

Copy link
@bouk

bouk Mar 21, 2021

Author Owner

See protocolbuffers#8372 (comment)

the extconf doesn't work on its own, it needs to be run from the Rakefile. This is not good. This line makes it pick up the wyhash header. This change was made by @bbuchalter, I added the generated files so the gem should now be usable from git directly.


create_makefile("google/protobuf_c")
2 changes: 1 addition & 1 deletion ruby/google-protobuf.gemspec
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.files += ["lib/google/protobuf_java.jar"]
else
s.files += Dir.glob('ext/**/*')
s.extensions << 'Rakefile'
s.extensions= ["ext/google/protobuf_c/extconf.rb"]
s.add_development_dependency "rake-compiler-dock", ">= 1.1.0", "< 2.0"
end
s.test_files = ["tests/basic.rb",
Expand Down
19 changes: 19 additions & 0 deletions ruby/lib/google/protobuf/any_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 41 additions & 0 deletions ruby/lib/google/protobuf/api_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions ruby/lib/google/protobuf/duration_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions ruby/lib/google/protobuf/empty_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions ruby/lib/google/protobuf/field_mask_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions ruby/lib/google/protobuf/source_context_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 37 additions & 0 deletions ruby/lib/google/protobuf/struct_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions ruby/lib/google/protobuf/timestamp_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

91 changes: 91 additions & 0 deletions ruby/lib/google/protobuf/type_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions ruby/lib/google/protobuf/wrappers_pb.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e7edc92

Please sign in to comment.