BUILD: Convert the NEWS.md file if pandoc is installed
This commit is contained in:
Cameron Cawley
Matan Bareket
parent
93b9ae2e60
commit
364fb12e83
4 changed files with 29 additions and 28 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -38,6 +38,7 @@ lib*.a
|
|||
/scummvm-conf.cpp
|
||||
/tmp_*.cpp
|
||||
/README
|
||||
/NEWS
|
||||
|
||||
/build
|
||||
/staging
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ all: $(EXECUTABLE).dwp
|
|||
endif
|
||||
|
||||
ifdef USE_PANDOC
|
||||
all: readme
|
||||
all: README NEWS
|
||||
endif
|
||||
|
||||
######################################################################
|
||||
|
|
@ -236,9 +236,12 @@ DISTDIR := dist
|
|||
VERFILE := $(DISTDIR)/$(DISTNAME)/base/internal_version.h
|
||||
|
||||
ifdef USE_PANDOC
|
||||
# Convert README.md to plain text for any platform that might require it
|
||||
readme: README.md
|
||||
$(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $(PANDOCOUTPUT) README.md
|
||||
# Convert README.md and NEWS.md to plain text for any platform that might require it
|
||||
README: ${srcdir}/README.md
|
||||
$(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $<
|
||||
|
||||
NEWS: ${srcdir}/NEWS.md
|
||||
$(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $<
|
||||
endif
|
||||
|
||||
# TODO git via $(GITROOT)
|
||||
|
|
@ -270,9 +273,9 @@ dist-src: \
|
|||
@#DEB-src?
|
||||
|
||||
# Common files
|
||||
DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYRIGHT NEWS README.md)
|
||||
DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYRIGHT NEWS.md README.md)
|
||||
ifdef USE_PANDOC
|
||||
DIST_FILES_DOCS+=$(PANDOCOUTPUT)
|
||||
DIST_FILES_DOCS+=README NEWS
|
||||
endif
|
||||
|
||||
DIST_FILES_DOCS_languages=cz da de es fr it no-nb se
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ win32dist: all
|
|||
cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
|
||||
cp $(srcdir)/COPYING.FREEFONT $(WIN32PATH)/COPYING.FREEFONT.txt
|
||||
cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
|
||||
cp $(srcdir)/NEWS $(WIN32PATH)/NEWS.txt
|
||||
cp $(srcdir)/doc/cz/PrectiMe $(WIN32PATH)/doc/cz/PrectiMe.txt
|
||||
cp $(srcdir)/doc/de/NEUES $(WIN32PATH)/doc/de/NEUES.txt
|
||||
cp $(srcdir)/doc/QuickStart $(WIN32PATH)/doc/QuickStart.txt
|
||||
|
|
@ -35,7 +34,13 @@ win32dist: all
|
|||
cp $(srcdir)/doc/da/HurtigStart $(WIN32PATH)/doc/da/HurtigStart.txt
|
||||
cp $(srcdir)/doc/de/Schnellstart $(WIN32PATH)/doc/de/Schnellstart.txt
|
||||
cp $(srcdir)/doc/se/Snabbstart $(WIN32PATH)/doc/se/Snabbstart.txt
|
||||
cp $(srcdir)/README.md $(WIN32PATH)/README.md
|
||||
ifdef USE_PANDOC
|
||||
cp NEWS $(WIN32PATH)/NEWS.txt
|
||||
cp README $(WIN32PATH)/README.txt
|
||||
else
|
||||
cp $(srcdir)/NEWS.md $(WIN32PATH)/NEWS.txt
|
||||
cp $(srcdir)/README.md $(WIN32PATH)/README.txt
|
||||
endif
|
||||
cp $(WIN32SDLDOCPATH)/README-SDL.txt $(WIN32PATH)/README-SDL.txt
|
||||
cp $(srcdir)/doc/de/LIESMICH $(WIN32PATH)/doc/de/LIESMICH.txt
|
||||
cp $(srcdir)/doc/se/LasMig $(WIN32PATH)/doc/se/LasMig.txt
|
||||
|
|
|
|||
32
configure
vendored
32
configure
vendored
|
|
@ -228,7 +228,6 @@ NASM=""
|
|||
_tainted_build=no
|
||||
PANDOC=""
|
||||
_pandocpath="$PATH"
|
||||
_pandocoutput="README"
|
||||
_pandocformat="plain"
|
||||
# The following variables are automatically detected, and should not
|
||||
# be modified otherwise. Consider them read-only.
|
||||
|
|
@ -1095,8 +1094,7 @@ Optional Libraries:
|
|||
--with-nasm-prefix=DIR prefix where nasm executable is installed (optional)
|
||||
--disable-nasm disable assembly language optimizations [autodetect]
|
||||
|
||||
--with-pandoc-output=FILE filename to convert README.md to (optional)
|
||||
--with-pandoc-format=FORMAT pandoc format to use during the conversion (optional)
|
||||
--with-pandoc-format=FORMAT pandoc format to use during the conversion (optional)
|
||||
|
||||
--with-readline-prefix=DIR prefix where readline is installed (optional)
|
||||
--disable-readline disable readline support in text console [autodetect]
|
||||
|
|
@ -1399,11 +1397,6 @@ for ac_option in $@; do
|
|||
arg=`echo $ac_option | cut -d '=' -f 2`
|
||||
_nasmpath="$arg:$arg/bin"
|
||||
;;
|
||||
--with-pandoc-output=*)
|
||||
arg=`echo $ac_option | cut -d '=' -f 2`
|
||||
_pandocoutput="$arg"
|
||||
_pandoc=yes
|
||||
;;
|
||||
--with-pandoc-format=*)
|
||||
arg=`echo $ac_option | cut -d '=' -f 2`
|
||||
_pandocformat="$arg"
|
||||
|
|
@ -5111,22 +5104,22 @@ define_in_config_if_yes $_nasm 'USE_NASM'
|
|||
# Check for pandoc
|
||||
#
|
||||
if test "$_pandoc" = yes ; then
|
||||
echocheck "pandoc"
|
||||
echocheck "pandoc"
|
||||
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$SEPARATOR
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$SEPARATOR
|
||||
|
||||
for path_dir in $_pandocpath; do
|
||||
if test -x "$path_dir/pandoc$NATIVEEXEEXT" ; then
|
||||
PANDOC="$path_dir/pandoc$NATIVEEXEEXT"
|
||||
break
|
||||
fi
|
||||
done
|
||||
for path_dir in $_pandocpath; do
|
||||
if test -x "$path_dir/pandoc$NATIVEEXEEXT" ; then
|
||||
PANDOC="$path_dir/pandoc$NATIVEEXEEXT"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
IFS="$ac_save_ifs"
|
||||
|
||||
if ! test "$PANDOC" ; then
|
||||
_pandoc = no
|
||||
fi
|
||||
if ! test "$PANDOC" ; then
|
||||
_pandoc = no
|
||||
fi
|
||||
|
||||
echo $_pandoc
|
||||
fi
|
||||
|
|
@ -5610,7 +5603,6 @@ EXEEXT := $HOSTEXEEXT
|
|||
NASM := $NASM
|
||||
NASMFLAGS := $NASMFLAGS
|
||||
PANDOC := $PANDOC
|
||||
PANDOCOUTPUT := $_pandocoutput
|
||||
PANDOCFORMAT := $_pandocformat
|
||||
ZLIB_LIBS := $ZLIB_LIBS
|
||||
ZLIB_CFLAGS := $ZLIB_CFLAGS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue