Merge pull request #8850 from haberman/rubybuilder

Move DSL implementation from C to pure Ruby
protocolbuffers · Aug 2, 2021 · 88e6a36 · 88e6a36
2 parents 79370f1 + b7ab625
commit 88e6a36
Show file tree

Hide file tree

Showing 9 changed files with 521 additions and 1,419 deletions.
diff --git a/.gitignore b/.gitignore
@@ -183,7 +183,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

diff --git a/Makefile.am b/Makefile.am
@@ -1138,6 +1138,7 @@ ruby_EXTRA_DIST=                                                             \
   ruby/ext/google/protobuf_c/ruby-upb.h                                      \
   ruby/ext/google/protobuf_c/wrap_memcpy.c                                   \
   ruby/google-protobuf.gemspec                                               \
+  ruby/lib/google/protobuf/descriptor_dsl.rb                                 \
   ruby/lib/google/protobuf/message_exts.rb                                   \
   ruby/lib/google/protobuf/repeated_field.rb                                 \
   ruby/lib/google/protobuf/well_known_types.rb                               \

diff --git a/ruby/Rakefile b/ruby/Rakefile
@@ -8,6 +8,7 @@ spec = Gem::Specification.load("google-protobuf.gemspec")
 well_known_protos = %w[
   google/protobuf/any.proto
   google/protobuf/api.proto
+  google/protobuf/descriptor.proto
   google/protobuf/duration.proto
   google/protobuf/empty.proto
   google/protobuf/field_mask.proto