stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8215635: Pandoc check in Docs.gmk does not work on Windows

Browse Source 
Reviewed-by: tbell, ihse
This commit is contained in:
Erik Joelsson 2018-12-20 05:27:42 -08:00
parent 2778c86488
commit 9f1d035d8d
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/Docs.gmk
View File

@ -517,7 +517,7 @@ $(foreach m, $(ALL_MODULES), \
) \ ) \
) )
ifneq ($(PANDOC), ) ifeq ($(ENABLE_PANDOC), true)
# For all markdown files in $module/share/specs directories, convert them to # For all markdown files in $module/share/specs directories, convert them to
# html, if we have pandoc (otherwise we'll just skip this). # html, if we have pandoc (otherwise we'll just skip this).

7
make/autoconf/basics.m4
View File

@ -610,7 +610,14 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
BASIC_PATH_PROGS(DF, df) BASIC_PATH_PROGS(DF, df)
BASIC_PATH_PROGS(CPIO, [cpio bsdcpio]) BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
BASIC_PATH_PROGS(NICE, nice) BASIC_PATH_PROGS(NICE, nice)
BASIC_PATH_PROGS(PANDOC, pandoc) BASIC_PATH_PROGS(PANDOC, pandoc)
if test -n "$PANDOC"; then
ENABLE_PANDOC="true"
else
ENABLE_PANDOC="false"
fi
AC_SUBST(ENABLE_PANDOC)
]) ])
############################################################################### ###############################################################################

1
make/autoconf/spec.gmk.in
View File

@ -761,6 +761,7 @@ MSVCR_DLL:=@MSVCR_DLL@
MSVCP_DLL:=@MSVCP_DLL@ MSVCP_DLL:=@MSVCP_DLL@
UCRT_DLL_DIR:=@UCRT_DLL_DIR@ UCRT_DLL_DIR:=@UCRT_DLL_DIR@
STLPORT_LIB:=@STLPORT_LIB@ STLPORT_LIB:=@STLPORT_LIB@
ENABLE_PANDOC:=@ENABLE_PANDOC@
#################################################### ####################################################
# #

2
make/launcher/LauncherCommon.gmk
View File

@ -203,7 +203,7 @@ ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
ifneq ($(MAN_FILES_MD), ) ifneq ($(MAN_FILES_MD), )
# If we got markdown files, ignore the troff files # If we got markdown files, ignore the troff files
ifeq ($(PANDOC), ) ifeq ($(ENABLE_PANDOC), false)
$(info Warning: pandoc not found. Not generating man pages) $(info Warning: pandoc not found. Not generating man pages)
else else
# Create dynamic man pages from markdown using pandoc. We need # Create dynamic man pages from markdown using pandoc. We need