Skip to content

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

Closed
wants to merge 2 commits into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Apr 24, 2023

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 in PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET and BASIC_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 for PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET and BASIC_SETUP_PATHS are made in BASIC_SETUP_FUNDAMENTAL_TOOLS and everything else is moved into another macro called BASIC_SETUP_TOOLS that is invoked after path handling is set up correctly, which includes the lookup of git.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8289735: UTIL_LOOKUP_PROGS fails on pathes with space

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

Change order of tools initialization to allow for better handling of windows paths
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 24, 2023

👋 Welcome back clanger! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 24, 2023
@openjdk
Copy link

openjdk bot commented Apr 24, 2023

@RealCLanger The following label will be automatically applied to this pull request:

  • build

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.

@openjdk openjdk bot added the build build-dev@openjdk.org label Apr 24, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 24, 2023

Webrevs

@erikj79
Copy link
Member

erikj79 commented Apr 24, 2023

I think this change makes sense. Given how small this set of tools is now, I think we should add a comment on PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET in platform.m4 saying something about needing to be careful to only use tools setup in BASIC_SETUP_FUNDAMENTAL_TOOLS.

@RealCLanger
Copy link
Contributor Author

I think this change makes sense. Given how small this set of tools is now, I think we should add a comment on PLATFORM_SETUP_OPENJDK_BUILD_AND_TARGET in platform.m4 saying something about needing to be careful to only use tools setup in BASIC_SETUP_FUNDAMENTAL_TOOLS.

Right, and the same comment for BASIC_SETUP_PATHS. Will update the comments...

@openjdk
Copy link

openjdk bot commented Apr 24, 2023

@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:

8289735: UTIL_LOOKUP_PROGS fails on pathes with space

Reviewed-by: erikj, mbaesken

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 master branch:

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 24, 2023
@RealCLanger
Copy link
Contributor Author

Thanks for the reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Apr 25, 2023

Going to push as commit bad6aa6.
Since your change was applied there have been 20 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 25, 2023
@openjdk openjdk bot closed this Apr 25, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 25, 2023
@openjdk
Copy link

openjdk bot commented Apr 25, 2023

@RealCLanger Pushed as commit bad6aa6.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@RealCLanger RealCLanger deleted the JDK-8289735 branch April 25, 2023 14:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants