thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUILD: Convert the NEWS.md file if pandoc is installed

Browse source
This commit is contained in:
Cameron Cawley 2019-03-20 18:26:38 +00:00 • committed by Matan Bareket
parent 93b9ae2e60
commit 364fb12e83
4 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -38,6 +38,7 @@ lib*.a
/scummvm-conf.cpp /scummvm-conf.cpp
/tmp_*.cpp /tmp_*.cpp
/README /README
/NEWS
/build /build
/staging /staging

15
Makefile.common
View file

@ -13,7 +13,7 @@ all: $(EXECUTABLE).dwp
endif endif
ifdef USE_PANDOC ifdef USE_PANDOC
all: readme all: README NEWS
endif endif
###################################################################### ######################################################################
@ -236,9 +236,12 @@ DISTDIR := dist
VERFILE := $(DISTDIR)/$(DISTNAME)/base/internal_version.h VERFILE := $(DISTDIR)/$(DISTNAME)/base/internal_version.h
ifdef USE_PANDOC ifdef USE_PANDOC
# Convert README.md to plain text for any platform that might require it # Convert README.md and NEWS.md to plain text for any platform that might require it
readme: README.md README: ${srcdir}/README.md
$(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $(PANDOCOUTPUT) README.md $(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $<
NEWS: ${srcdir}/NEWS.md
$(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $<
endif endif
# TODO git via $(GITROOT) # TODO git via $(GITROOT)
@ -270,9 +273,9 @@ dist-src: \
@#DEB-src? @#DEB-src?
# Common files # 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 ifdef USE_PANDOC
DIST_FILES_DOCS+=$(PANDOCOUTPUT) DIST_FILES_DOCS+=README NEWS
endif endif
DIST_FILES_DOCS_languages=cz da de es fr it no-nb se DIST_FILES_DOCS_languages=cz da de es fr it no-nb se

9
backends/platform/sdl/win32/win32.mk
View file

@ -24,7 +24,6 @@ win32dist: all
cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
cp $(srcdir)/COPYING.FREEFONT $(WIN32PATH)/COPYING.FREEFONT.txt cp $(srcdir)/COPYING.FREEFONT $(WIN32PATH)/COPYING.FREEFONT.txt
cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.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/cz/PrectiMe $(WIN32PATH)/doc/cz/PrectiMe.txt
cp $(srcdir)/doc/de/NEUES $(WIN32PATH)/doc/de/NEUES.txt cp $(srcdir)/doc/de/NEUES $(WIN32PATH)/doc/de/NEUES.txt
cp $(srcdir)/doc/QuickStart $(WIN32PATH)/doc/QuickStart.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/da/HurtigStart $(WIN32PATH)/doc/da/HurtigStart.txt
cp $(srcdir)/doc/de/Schnellstart $(WIN32PATH)/doc/de/Schnellstart.txt cp $(srcdir)/doc/de/Schnellstart $(WIN32PATH)/doc/de/Schnellstart.txt
cp $(srcdir)/doc/se/Snabbstart $(WIN32PATH)/doc/se/Snabbstart.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 $(WIN32SDLDOCPATH)/README-SDL.txt $(WIN32PATH)/README-SDL.txt
cp $(srcdir)/doc/de/LIESMICH $(WIN32PATH)/doc/de/LIESMICH.txt cp $(srcdir)/doc/de/LIESMICH $(WIN32PATH)/doc/de/LIESMICH.txt
cp $(srcdir)/doc/se/LasMig $(WIN32PATH)/doc/se/LasMig.txt cp $(srcdir)/doc/se/LasMig $(WIN32PATH)/doc/se/LasMig.txt

8
configure vendored
View file

@ -228,7 +228,6 @@ NASM=""
_tainted_build=no _tainted_build=no
PANDOC="" PANDOC=""
_pandocpath="$PATH" _pandocpath="$PATH"
_pandocoutput="README"
_pandocformat="plain" _pandocformat="plain"
# The following variables are automatically detected, and should not # The following variables are automatically detected, and should not
# be modified otherwise. Consider them read-only. # be modified otherwise. Consider them read-only.
@ -1095,7 +1094,6 @@ Optional Libraries:
--with-nasm-prefix=DIR prefix where nasm executable is installed (optional) --with-nasm-prefix=DIR prefix where nasm executable is installed (optional)
--disable-nasm disable assembly language optimizations [autodetect] --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) --with-readline-prefix=DIR prefix where readline is installed (optional)
@ -1399,11 +1397,6 @@ for ac_option in $@; do
arg=`echo $ac_option | cut -d '=' -f 2` arg=`echo $ac_option | cut -d '=' -f 2`
_nasmpath="$arg:$arg/bin" _nasmpath="$arg:$arg/bin"
;; ;;
--with-pandoc-output=*)
arg=`echo $ac_option | cut -d '=' -f 2`
_pandocoutput="$arg"
_pandoc=yes
;;
--with-pandoc-format=*) --with-pandoc-format=*)
arg=`echo $ac_option | cut -d '=' -f 2` arg=`echo $ac_option | cut -d '=' -f 2`
_pandocformat="$arg" _pandocformat="$arg"
@ -5610,7 +5603,6 @@ EXEEXT := $HOSTEXEEXT
NASM := $NASM NASM := $NASM
NASMFLAGS := $NASMFLAGS NASMFLAGS := $NASMFLAGS
PANDOC := $PANDOC PANDOC := $PANDOC
PANDOCOUTPUT := $_pandocoutput
PANDOCFORMAT := $_pandocformat PANDOCFORMAT := $_pandocformat
ZLIB_LIBS := $ZLIB_LIBS ZLIB_LIBS := $ZLIB_LIBS
ZLIB_CFLAGS := $ZLIB_CFLAGS ZLIB_CFLAGS := $ZLIB_CFLAGS