-
Notifications
You must be signed in to change notification settings - Fork 5.9k
8350137: After JDK-8348975, Linux builds contain man pages for windows only tools #23697
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
👋 Welcome back nbenalla! A progress list of the required criteria for merging this PR into |
@nizarbenalla 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 5 new commits pushed to the
Please see this link for an up-to-date comparison between the source branch of this pull request and the ➡️ To integrate this PR with the above commit message to the |
@nizarbenalla 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
|
MAN_SUBDIRS += share/man windows/man | ||
MAN_SUBDIRS += share/man $(TARGET_OS)/man | ||
|
||
MAN_DOCS_SUBDIRS += share/man windows/man |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this warrants a comment explaining why we need a separate list.
MAN_DOCS_SUBDIRS += share/man windows/man | |
# The docs should include the sum of all man pages for all platforms | |
MAN_DOCS_SUBDIRS += share/man windows/man |
Thanks for reviewing Erik. /integrate |
Going to push as commit 53db576.
Your commit was automatically rebased without conflicts. |
@nizarbenalla Pushed as commit 53db576. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Thank you @nizarbenalla and @erikj79 for resolving this! |
This patch fixes a regression where the windows tools man pages appeared on the Linux and the MacOS builds
The man pages found using
FindModuleManDirs
were used in bothDocs.gmk
used to generate the documentation for the JDK as well as inLauncherCommon.gmk
herejdk/make/common/modules/LauncherCommon.gmk
Line 195 in efbad00
I've separated the logic between generated the docs and the man pages. I've checked on a MacOs machine and the man pages no longer appear.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/23697/head:pull/23697
$ git checkout pull/23697
Update a local copy of the PR:
$ git checkout pull/23697
$ git pull https://git.openjdk.org/jdk.git pull/23697/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 23697
View PR using the GUI difftool:
$ git pr show -t 23697
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/23697.diff
Using Webrev
Link to Webrev Comment