-
-
Notifications
You must be signed in to change notification settings - Fork 921
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.
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
Properly install and package bundled and default gem bits #6609
Conversation
This should be built from a clean clone, so everything under the gem dir needs to be included for all preinstalled and default gems to be fully functional.
* Specify JRuby bin dir and env shebang during install * Copy default exes to appropriate location * Include all bin stubs in dist
One failure, which may indicate we need the bin scripts (sans |
The failure:
|
e79285d
to
bc1f1b6
Compare
Ok, with recent changes we are looking good. I tested the following scenarios with
Both succeed and are putting the right files in the right places for default gems with executables. The problems fixed here:
Note that this was actually broken for HEAD builds, but because we frequently install racc for other testing the racc executables and stubs were often in place (just lucky) for local testing. This PR fixes jruby-9.2 HEAD builds, and will fix jruby-head builds once merged to master (resolving #6604 and finishing incomplete work from #6416). The diff from 9.2.16.0 tar.gz to 9.2.17.0 follows:
The relevant changes seen here:
|
This file was not included in the stdlib artifact before, and by extension not included in the dist archives build from that artifact. To avoid trouble with this new executable being in the tarball, we exclude it here. [skip ci]
@headius Just one thing to note. The fact that webrick and fileutils ship |
@deivid-rodriguez Ok, thank you for explaining that. I assumed they should not be there, but our old logic unconditionally copied whatever it saw in Is this a bug in the default |
That makes sense 👍.
It's the libraries, they should not include |
The logic to install bundled and default gems was half broken, as described in #6604. This affected both distribution tarballs and HEAD builds since the bin scripts for default gems were either not installed at all or not included in the tarball at release time.
The following changes were made:
specifications/default/bin
rather than as partial gems undergems/
.bin/
are included in the release distribution, rather than a whitelist.rake
,rdoc
, andri
scripts are now removed frombin/
since they are properly installed by the build. This aligns with master and should avoid losing the rake script when switching branches.With these changes, I can do the following which did not work before:
jruby-9.2
branchFixes #6604.