RFR: 8350137: After JDK-8348975, Linux builds contain man pages for windows only tools

Erik Joelsson erikj at openjdk.org
Wed Feb 19 15:21:52 UTC 2025


On Wed, 19 Feb 2025 14:34:37 GMT, Nizar Benalla <nbenalla at openjdk.org> wrote:

> 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 both `Docs.gmk` used to generate the documentation for the JDK as well as in `LauncherCommon.gmk` here https://github.com/openjdk/jdk/blob/efbad00c4d7931177ccc5e9bce3b30dfbac94010/make/common/modules/LauncherCommon.gmk#L195
> 
> 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.
> 
> This patch will need to be backported to JDK 24.

make/common/Modules.gmk line 92:

> 90: MAN_SUBDIRS += share/man $(TARGET_OS)/man
> 91: 
> 92: MAN_DOCS_SUBDIRS += share/man windows/man

I think this warrants a comment explaining why we need a separate list.
Suggestion:

# The docs should include the sum of all man pages for all platforms
MAN_DOCS_SUBDIRS += share/man windows/man

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/23697#discussion_r1961878087


More information about the build-dev mailing list