Skip to content
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.

Sign up for GitHub

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

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

Closed
wants to merge 1 commit into from
+9 −2
Closed

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion make/Docs.gmk
View file
Original file line number Diff line number Diff line change
@@ -680,7 +680,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), \
9 changes: 8 additions & 1 deletion make/common/Modules.gmk
View file
Original file line number Diff line number Diff line change
@@ -92,7 +92,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.
@@ -158,6 +161,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, \