Skip to content

Handle absolute paths in required_paths #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kigster merged 3 commits into from
Dec 19, 2023
Merged

Handle absolute paths in required_paths #149

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aaa7949
Handle absolute paths in required_paths
JasonLunn Jul 14, 2023
95482d1
Merge branch 'master' into patch-1
kigster Sep 25, 2023
5229f3d
Merge branch 'master' into patch-1
kigster Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ruby/private/bundle/create_bundle_build_file.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@
Dir.glob("lib/#{RbConfig::CONFIG['RUBY_INSTALL_NAME']}/#{ruby_version}/specifications/#{gem_name}-#{gem_version}*.gemspec").first
end

HERE = File.absolute_path '.'

require 'bundler'
require 'json'
require 'stringio'
Expand Down Expand Up @@ -271,7 +273,15 @@ def register_gem(spec, template_out, bundle_lib_paths, bundle_binaries)
# Usually, registering the directory paths listed in the `require_paths` of gemspecs is sufficient, but
# some gems also require additional paths to be included in the load paths.
require_paths += include_array(spec.name)
gem_lib_paths = require_paths.map { |require_path| File.join(gem_path, require_path) }
gem_lib_paths = require_paths.map do |require_path|
# Gems with native extensions (like ffi) will sometimes have elements of
# require_paths that are absolute rather than gem-path relative paths.
# It is incorrect to prepend those paths with the gem_path and Bazel will
# only allow relative paths as inputs to its glob() function.
pathname = Pathname.new(require_path)
pathname.absolute? ? pathname.relative_path_from(HERE).to_s : File.join(gem_path, require_path)
end

bundle_lib_paths.push(*gem_lib_paths)

# paths to search for executables
Expand Down