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

Reviewed-by: erikj
This commit is contained in:
Nizar Benalla 2025-02-20 15:53:05 +00:00
parent 10bf48a6b0
commit 53db57648a
2 changed files with 9 additions and 2 deletions

View File

@ -673,7 +673,7 @@ ifeq ($(ENABLE_PANDOC), true)
$(foreach m, $(ALL_MODULES), \
$(eval MAN_$m := $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, \
$(call FindModuleManDirs, $m))))) \
$(call FindModuleManDirsForDocs, $m))))) \
$(if $(MAN_$m), \
$(eval $(call SetupProcessMarkdown, MAN_TO_HTML_$m, \
FILES := $(MAN_$m), \

View File

@ -87,7 +87,10 @@ SRC_SUBDIRS += share/classes
SPEC_SUBDIRS += share/specs
MAN_SUBDIRS += share/man windows/man
MAN_SUBDIRS += share/man $(TARGET_OS)/man
# The docs should include the sum of all man pages for all platforms
MAN_DOCS_SUBDIRS += share/man windows/man
# Find all module-info.java files for the current build target platform and
# configuration.
@ -153,6 +156,10 @@ FindModuleManDirs = \
$(strip $(wildcard \
$(foreach sub, $(MAN_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
FindModuleManDirsForDocs = \
$(strip $(wildcard \
$(foreach sub, $(MAN_DOCS_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
# Construct the complete module source path
GetModuleSrcPath = \
$(call PathList, \