[Scummvm-git-logs] scummvm master -> 3b6b881ad48ce5de8e658a0964f9935a5d0d0943

[criezy]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e9049d3278 DIST: Add CONTRIBUTING.md to the list of files to distribute
3b6b881ad4 DIST: Fix dead links in converted README file


Commit: e9049d327812fbbfbc9d51496de412d3573e13a2
    https://github.com/scummvm/scummvm/commit/e9049d327812fbbfbc9d51496de412d3573e13a2
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-04-26T15:35:01+01:00

Commit Message:
DIST: Add CONTRIBUTING.md to the list of files to distribute

The main reason for that change is that there is a link to it from
the README.md file, so distributing CONTRIBUTING.md avoids having
a dead link in the distributed README.md.

Changed paths:
    .gitignore
    Makefile.common


diff --git a/.gitignore b/.gitignore
index 31c27c04f9..90e2514557 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,8 @@ lib*.a
 /README.html
 /NEWS
 /NEWS.html
+/CONTRIBUTING
+/CONTRIBUTING.html
 /doc/de/NEUES
 /doc/de/NEUES.html
 
@@ -259,4 +261,4 @@ gmon.out
 .idea
 
 #Ingore temporary Android project folder
-android_project
\ No newline at end of file
+android_project
diff --git a/Makefile.common b/Makefile.common
index 950f52e794..c14176cd92 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -278,9 +278,9 @@ dist-src: \
 	@#DEB-src?
 
 # Common files
-DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYING.OFL COPYRIGHT NEWS.md README.md)
+DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYING.OFL COPYRIGHT NEWS.md README.md CONTRIBUTING.md)
 ifdef USE_PANDOC
-DIST_FILES_DOCS+=README$(PANDOCEXT) NEWS$(PANDOCEXT)
+DIST_FILES_DOCS+=README$(PANDOCEXT) NEWS$(PANDOCEXT) CONTRIBUTING$(PANDOCEXT)
 endif
 
 DIST_FILES_DOCS_languages=cz da de es fr it no-nb se


Commit: 3b6b881ad48ce5de8e658a0964f9935a5d0d0943
    https://github.com/scummvm/scummvm/commit/3b6b881ad48ce5de8e658a0964f9935a5d0d0943
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-04-26T15:40:29+01:00

Commit Message:
DIST: Fix dead links in converted README file

This fixes bug #10946.

Changed paths:
    Makefile.common
    ports.mk


diff --git a/Makefile.common b/Makefile.common
index c14176cd92..43263b13a1 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -13,7 +13,7 @@ all: $(EXECUTABLE).dwp
 endif
 
 ifdef USE_PANDOC
-all: README$(PANDOCEXT) NEWS$(PANDOCEXT) doc/de/NEUES$(PANDOCEXT)
+all: PANDOC_CONVERT
 endif
 
 ######################################################################
@@ -244,6 +244,10 @@ 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
+PANDOC_CONVERT: README$(PANDOCEXT) CONTRIBUTING$(PANDOCEXT) NEWS$(PANDOCEXT) doc/de/NEUES$(PANDOCEXT)
+	@sed -i'' -e "s/NEWS.md/NEWS$(PANDOCEXT)/g" README$(PANDOCEXT)
+	@sed -i'' -e "s/CONTRIBUTING.md/CONTRIBUTING$(PANDOCEXT)/g" README$(PANDOCEXT)
+
 %$(PANDOCEXT): %.md
 	$(QUIET)$(MKDIR) $(*D)
 	$(QUIET_PANDOC)$(PANDOC) -f gfm -t $(PANDOCFORMAT) --metadata pagetitle=$(basename $(notdir $@)) -s -o $@ $<
diff --git a/ports.mk b/ports.mk
index 14f9099f5c..a2106aed33 100644
--- a/ports.mk
+++ b/ports.mk
@@ -129,6 +129,10 @@ ifdef DIST_FILES_VKEYBD
 endif
 	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/AUTHORS.rtf
 	rm $(bundle_name)/Contents/Resources/AUTHORS
+	@sed -i'' -e "s/AUTHORS/AUTHORS.rtf/g" $(bundle_name)/Contents/Resources/README.md
+ifdef USE_PANDOC
+	@sed -i'' -e "s|href=\"AUTHORS\"|href=\"https://www.scummvm.org/credits/\"|g" $(bundle_name)/Contents/Resources/README$(PANDOCEXT)
+endif
 	cp $(bundle_name)/Contents/Resources/COPYING.LGPL $(bundle_name)/Contents/Resources/COPYING-LGPL
 	cp $(bundle_name)/Contents/Resources/COPYING.FREEFONT $(bundle_name)/Contents/Resources/COPYING-FREEFONT
 	cp $(bundle_name)/Contents/Resources/COPYING.OFL $(bundle_name)/Contents/Resources/COPYING-OFL