From b10ce377034b86326fa74087fe0f83012b4cc34f Mon Sep 17 00:00:00 2001
From: Deanna Garcia <deannagarcia@google.com>
Date: Wed, 18 Jan 2023 18:04:21 +0000
Subject: [PATCH] Add source files to jruby

---
 ruby/BUILD.bazel            | 1 +
 ruby/build_jruby_release.sh | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/ruby/BUILD.bazel b/ruby/BUILD.bazel
index a7c7d6c7d8bc..b469bc8fc4ff 100755
--- a/ruby/BUILD.bazel
+++ b/ruby/BUILD.bazel
@@ -24,6 +24,7 @@ sh_binary(
     name = "jruby_release",
     data = [
       "//ruby/lib/google:copy_jar",
+      "//ruby/lib/google:dist_files",
       "//:well_known_ruby_protos",
       "google-protobuf.gemspec",
     ],
diff --git a/ruby/build_jruby_release.sh b/ruby/build_jruby_release.sh
index 80a386a5a88c..9ff66d680a58 100755
--- a/ruby/build_jruby_release.sh
+++ b/ruby/build_jruby_release.sh
@@ -46,6 +46,13 @@ cp "$(rlocation com_google_protobuf/src/google/protobuf/wrappers_pb.rb)" lib/goo
 
 cp "$(rlocation com_google_protobuf/ruby/lib/google/protobuf_java.jar)" lib/google
 
+# Move all source files to the correct location
+cp "$(rlocation com_google_protobuf/ruby/lib/google/protobuf.rb)" lib/google
+cp "$(rlocation com_google_protobuf/ruby/lib/google/protobuf/descriptor_dsl.rb)" lib/google/protobuf
+cp "$(rlocation com_google_protobuf/ruby/lib/google/protobuf/message_exts.rb)" lib/google/protobuf
+cp "$(rlocation com_google_protobuf/ruby/lib/google/protobuf/repeated_field.rb)" lib/google/protobuf
+cp "$(rlocation com_google_protobuf/ruby/lib/google/protobuf/well_known_types.rb)" lib/google/protobuf
+
 # Move gemspec file to current directory
 cp "$(rlocation com_google_protobuf/ruby/google.protobuf.gemspec)" .