8351029: IncludeCustomExtension does not work on cygwin with source code below /home

[magicus]

If you check out your source code in Cygwin, somewhere under /home/... (as opposed to /cygpath/...), IncludeCustomExtension does not work.

The problem is that TOPDIR gets a different lexical value from the spec.gmk file when setup in Makefile, even if this was the same directory. Since THIS_INCLUDE is calculated as a relative path by string substitution of $(TOPDIR), the path failed to relativize correctly.

---

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-8351029: IncludeCustomExtension does not work on cygwin with source code below /home (Bug - P3)

Reviewers

• Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/25100/head:pull/25100
$ git checkout pull/25100

Update a local copy of the PR:
$ git checkout pull/25100
$ git pull https://git.openjdk.org/jdk.git pull/25100/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25100

View PR using the GUI difftool:
$ git pr show -t 25100

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/25100.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back ihse! 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]

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

8351029: IncludeCustomExtension does not work on cygwin with source code below /home

Reviewed-by: erikj

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 17 new commits pushed to the master branch:

• 24d84cf: 8354091: Update RELEASE_25 description for Flexible Constructor Bodies
• 1e8927d: 8354433: Assert in AbstractRBTree::visit_range_in_order(const K& from, const K& to, F f) is wrong
• 7f3191a: 8354878: File Leak in CgroupSubsystemFactory::determine_type of cgroupSubsystem_linux.cpp:300
• ... and 14 more: https://git.openjdk.org/jdk/compare/493ac93606e4637638ec1ae34e24526aaba7b7f3...master

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]

@magicus 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.

[mlbridge]

Webrevs

• 01: Full - Incremental (f227d802)
• 00: Full (65a1b222)

[erikj79]

Is it the cd $$(TOPDIR) when calling make from DefineMakeTargets that is causing the mismatch that you are correcting by including SPEC here?

[magicus]

Is it the cd $$(TOPDIR) when calling make from DefineMakeTargets that is causing the mismatch that you are correcting by including SPEC here?

No, it is the -f $$(TOPDIR)/make/GenerateFindTests.gmk argument to make. This is added verbatim by make to MAKEFILE_LIST, and then our string processing in make/common/MakeIncludeStart.gmk does not work properly, since it tries to strip off $(TOPDIR), which at that point is different.

My first attempt was to re-create the TOPDIR in PreInit the same way as it is created in spec.gmk, but that would include mimicking the entire UTIL_FIXUP_PATH which seemed to be just too much work and too fragile.

[magicus]

I just realized that it might be possible to pass the TOPDIR actually used down to MakeIncludeStart, and it might be a better solution... I'll check that.

[magicus]

This seems like a much safer solution. It will allow us to have two different "spellings" for TOPDIR, one that configure puts in spec.gmk, and one that is calculated by the top-level Makefile. I think this will make for a robust solution.

[erikj79]

I think this looks ok, and better than the other solution. Should we add a comment somewhere describing what TOPDIR_ALT is and why it's needed for future archeologists?

[magicus]

There are no obvious place where to put that comment, and I don't want to sprinkle the code with comments about it everwhere it is used. I'd say that those future archaeologists will have to use git blame to find this PR, if it is not clear to them how the variable is used...

[magicus]

/integrate

[openjdk]

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

• 3aa2ea7: 8301971: Make JDK source code UTF-8
• 74e981e: 8353735: [JVMCI] Allow specifying storage kind of the callee save register
• c88f94c: 8356394: Remove USE_LIBRARY_BASED_TLS_ONLY macro
• ... and 27 more: https://git.openjdk.org/jdk/compare/493ac93606e4637638ec1ae34e24526aaba7b7f3...master

Your commit was automatically rebased without conflicts.

[openjdk]

@magicus Pushed as commit a091e2f.

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