-
Notifications
You must be signed in to change notification settings - Fork 5.8k
8289735: UTIL_LOOKUP_PROGS fails on pathes with space #13629
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
Conversation
Change order of tools initialization to allow for better handling of windows paths
👋 Welcome back clanger! A progress list of the required criteria for merging this PR into |
@RealCLanger The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
I think this change makes sense. Given how small this set of tools is now, I think we should add a comment on |
Right, and the same comment for BASIC_SETUP_PATHS. Will update the comments... |
@RealCLanger This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 15 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
Thanks for the reviews. /integrate |
Going to push as commit bad6aa6.
Your commit was automatically rebased without conflicts. |
@RealCLanger Pushed as commit bad6aa6. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This is an attempt to fix the issue on Windows when no cygwin Git is installed or the Git for Windows installation has precedence in PATH lookup. The path to the Windows GIT installation usually resides in
C:\Program Files
which contains a space and thus needs some special handling.There exists code in
UTIL_LOOKUP_PROGS
/UTIL_FIXUP_EXECUTABLE
that would handle this. However, it relies on initializations made inPLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET
andBASIC_SETUP_PATHS
. Currently,UTIL_LOOKUP_PROGS(GIT, git)
is called too early in configure and hence the problematic Windows path is not handled correctly. My fix makes sure that only the barely necessary tool lookups required forPLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET
andBASIC_SETUP_PATHS
are made inBASIC_SETUP_FUNDAMENTAL_TOOLS
and everything else is moved into another macro calledBASIC_SETUP_TOOLS
that is invoked after path handling is set up correctly, which includes the lookup of git.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13629/head:pull/13629
$ git checkout pull/13629
Update a local copy of the PR:
$ git checkout pull/13629
$ git pull https://git.openjdk.org/jdk.git pull/13629/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 13629
View PR using the GUI difftool:
$ git pr show -t 13629
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13629.diff
Webrev
Link to Webrev Comment