Skip to content
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

build: cleanup base files inclusion #45441

Merged
merged 1 commit into from
Jun 9, 2022
Merged

build: cleanup base files inclusion #45441

merged 1 commit into from
Jun 9, 2022

Conversation

vtjnash
Copy link
Sponsor Member

@vtjnash vtjnash commented May 24, 2022

Ensures the out-of-tree build has the correct src files installed for the base image, and simplifies some of the includes used in Base.

Fixes #31140

@vtjnash vtjnash added the domain:building Build system, or building Julia or its dependencies label May 24, 2022
@vtjnash vtjnash requested review from staticfloat and musm May 24, 2022 17:22
Ensures the out-of-tree build has the correct files installed, and
simplifies some of the `include`s used in Base.

Fixes a return value that was relied on (largely unnecessarily) by a
loading test, despite being invalid before now.

Fixes #31140
@vtjnash vtjnash merged commit f0b1c5f into master Jun 9, 2022
@vtjnash vtjnash deleted the jn/make_base_files branch June 9, 2022 20:04
@vtjnash
Copy link
Sponsor Member Author

vtjnash commented Jun 9, 2022

I will assume people are okay with this, and take review comments afterwards if not

@Keno
Copy link
Member

Keno commented Jul 22, 2022

I don't really understand what the point of moving the files from usr/share/julia/base to usr/share/julia/src/base is? That seems like a completely random directory structure.

@vtjnash
Copy link
Sponsor Member Author

vtjnash commented Jul 22, 2022

It sort of is random, in that the alternate versions I tried seemed to have more problems with make or Revise getting confused. I didn't really want to nest them this way for any design reason.

@Keno
Copy link
Member

Keno commented Jul 22, 2022

Revise is very confused right now :).

@timholy
Copy link
Sponsor Member

timholy commented Jul 23, 2022

Revise is fixable (see timholy/Revise.jl#694), but it would be worth knowing whether this change is going to be reconsidered. I wouldn't choose an unfortunate directory structure in a (failed) attempt to keep Revise happy, I'd rather see this solved as it should be and Revise can adapt accordingly.

Revise always breaks with each point release, and this is comparatively easy. It's the changes that affect JuliaInterpreter that are scary.

@timholy
Copy link
Sponsor Member

timholy commented Jul 30, 2022

Quick thoughts from @vtjnash? Should we change this directory organization or should I merge timholy/Revise.jl#694?

@staticfloat
Copy link
Sponsor Member

I would very much like to change the directory structure. This change confuses not just Revise but also VSCode, grep, and other tools.

@pfitzseb
Copy link
Member

pfitzseb commented Jul 30, 2022

The directory structure is probably fine, but symlinking usr/share/julia/src/base to src/base makes sense imo.

@timholy
Copy link
Sponsor Member

timholy commented Jul 30, 2022

I'll hold off on the Revise change then. I'll also defer to others in implementing the change since everyone involved in this conversation has a better sense for what needs to be done than me. We'll update Revise when it's done. (@pfitzseb feel free to just modify your PR and merge it whenever you wish.)

ianatol pushed a commit to ianatol/julia that referenced this pull request Aug 17, 2022
JeffBezanson added a commit that referenced this pull request Aug 19, 2022
Keno added a commit that referenced this pull request Aug 19, 2022
Keno added a commit that referenced this pull request Aug 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
domain:building Build system, or building Julia or its dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Out of tree builds fails to copy base julia files
5 participants