Move JRuby's ext and loader script #39
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
headius
force-pushed
the
jruby_strscan_move
branch
from
2e2532d to
8071313
Compare
* ext/java => ext/jruby * lib/jruby/strscan.rb => ext/jruby/lib/strscan.rb * Changes to Rakefile and gemspec for new locations Fixes ruby#38
headius
force-pushed
the
jruby_strscan_move
branch
from
8071313 to
9d7d8aa
Compare
|
Looks good to me 👍 |
|
I believe this is ready. The only remaining failure is the known issue on Windows (which @enebo and I have discussed a bit... we are not encoding the error message correctly and will fix this later). There's no urgent need to re-release with this change (nothing is actually broken right now), but it would be nice because Git shows me that there's an unversioned, unignored |
|
Thanks! |
|
@kou That would be great, thank you! |
|
Done! |
headius
added a commit
to jruby/jruby
that referenced
this pull request
May 11, 2022
Fixes extra strscan.rb in stdlib as reported in ruby/strscan#38 and fixed in ruby/strscan#39.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The strscan.rb file is only needed by JRuby, which does not have an extension file format that loads itself. As noted in #35 having this file present on TruffleRuby prevents their built-in strscan.rb from loading, so the file was moved to lib/jruby/strscan.rb with lib/jruby added as a require path. However this results in both lib/strscan.rb and lib/jruby/strscan.rb getting copied into JRuby's stdlib when the default gem is installed, leading to the confusing situation in #38.
This PR moves the jruby-specific strscan.rb under the jruby extension, renaming that directory to be explicitly for JRuby, and adding that new ext/jruby/lib path to the require paths so there's no nesting of require paths to copy files multiple times.
Fixes #38