Skip to content
Permalink
Browse files

NEWS: Convert German NEWS file to Markdown (#1627)

* NEWS: Convert German NEWS file to Markdown

* NEWS: Fix Markdown conversion errors in NEUES.md

* BUILD: Add the German NEWS file to the build system

* NEWS: Fix formatting in NEUES.md
  • Loading branch information...
lotharsm committed May 18, 2019
1 parent 7c35e15 commit 95d4678de78f7c09b247161811660cefea1d24c5
Showing with 63 additions and 58 deletions.
  1. +3 −0 .gitignore
  2. +8 −7 Makefile.common
  3. +1 −1 backends/platform/sdl/riscos/riscos.mk
  4. +4 −3 backends/platform/sdl/win32/win32.mk
  5. +47 −47 doc/de/{NEUES → NEUES.md}
@@ -37,10 +37,13 @@ lib*.a
/Icon.*
/scummvm-conf.cpp
/tmp_*.cpp

/README
/README.html
/NEWS
/NEWS.html
/doc/de/NEUES
/doc/de/NEUES.html

/build
/staging
@@ -13,7 +13,7 @@ all: $(EXECUTABLE).dwp
endif

ifdef USE_PANDOC
all: README$(PANDOCEXT) NEWS$(PANDOCEXT)
all: README$(PANDOCEXT) NEWS$(PANDOCEXT) doc/de/NEUES$(PANDOCEXT)
endif

######################################################################
@@ -237,11 +237,9 @@ VERFILE := $(DISTDIR)/$(DISTNAME)/base/internal_version.h

ifdef USE_PANDOC
# Convert README.md and NEWS.md to plain text for any platform that might require it
README$(PANDOCEXT): ${srcdir}/README.md
$(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $<

NEWS$(PANDOCEXT): ${srcdir}/NEWS.md
$(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) -o $@ $<
%$(PANDOCEXT): ${srcdir}/%.md
$(QUIET)$(MKDIR) $(*D)
$(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) --metadata pagetitle=$(basename $(notdir $@)) -s -o $@ $<
endif

# TODO git via $(GITROOT)
@@ -281,7 +279,10 @@ endif
DIST_FILES_DOCS_languages=cz da de es fr it no-nb se
DIST_FILES_DOCS_cz:=$(addprefix $(srcdir)/doc/cz/,PrectiMe)
DIST_FILES_DOCS_da:=$(addprefix $(srcdir)/doc/da/,HurtigStart)
DIST_FILES_DOCS_de:=$(addprefix $(srcdir)/doc/de/,LIESMICH NEUES Schnellstart)
DIST_FILES_DOCS_de:=$(addprefix $(srcdir)/doc/de/,LIESMICH NEUES.md Schnellstart)
ifdef USE_PANDOC
DIST_FILES_DOCS_de+=doc/de/NEUES$(PANDOCEXT)
endif
DIST_FILES_DOCS_es:=$(addprefix $(srcdir)/doc/es/,InicioRapido)
DIST_FILES_DOCS_fr:=$(addprefix $(srcdir)/doc/fr/,DemarrageRapide)
DIST_FILES_DOCS_it:=$(addprefix $(srcdir)/doc/it/,GuidaRapida)
@@ -48,7 +48,7 @@ riscosdist: $(APP_NAME)/docs/ScummVM,3d6 # $(APP_NAME)/docs/de/ScummVM,3d6 $(APP
README=${srcdir}/README.md
NEWS=${srcdir}/NEWS.md
$(APP_NAME)/docs/de/ScummVM,3d6: README=${srcdir}/doc/de/LIESMICH
$(APP_NAME)/docs/de/ScummVM,3d6: NEWS=${srcdir}/doc/de/NEUES
$(APP_NAME)/docs/de/ScummVM,3d6: NEWS=${srcdir}/doc/de/NEUES.md
$(APP_NAME)/docs/cz/ScummVM,3d6: README=${srcdir}/doc/cz/PrectiMe
$(APP_NAME)/docs/se/ScummVM,3d6: README=${srcdir}/doc/se/LasMig

@@ -26,7 +26,6 @@ win32dist: all
cp $(srcdir)/COPYING.OFL $(WIN32PATH)/COPYING.OFL.txt
cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.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
cp $(srcdir)/doc/es/InicioRapido $(WIN32PATH)/doc/es/InicioRapido.txt
cp $(srcdir)/doc/fr/DemarrageRapide $(WIN32PATH)/doc/fr/DemarrageRapide.txt
@@ -36,11 +35,13 @@ win32dist: all
cp $(srcdir)/doc/de/Schnellstart $(WIN32PATH)/doc/de/Schnellstart.txt
cp $(srcdir)/doc/se/Snabbstart $(WIN32PATH)/doc/se/Snabbstart.txt
ifdef USE_PANDOC
cp NEWS $(WIN32PATH)/NEWS.txt
cp README $(WIN32PATH)/README.txt
cp NEWS$(PANDOCEXT) $(WIN32PATH)/NEWS.txt
cp README$(PANDOCEXT) $(WIN32PATH)/README.txt
cp doc/de/NEUES$(PANDOCEXT) $(WIN32PATH)/doc/de/NEUES.txt
else
cp $(srcdir)/NEWS.md $(WIN32PATH)/NEWS.txt
cp $(srcdir)/README.md $(WIN32PATH)/README.txt
cp $(srcdir)/doc/de/NEUES.md $(WIN32PATH)/doc/de/NEUES.txt
endif
cp $(WIN32SDLDOCPATH)/README-SDL.txt $(WIN32PATH)/README-SDL.txt
cp $(srcdir)/doc/de/LIESMICH $(WIN32PATH)/doc/de/LIESMICH.txt

0 comments on commit 95d4678

Please sign in to comment.
You can’t perform that action at this time.