[Scummvm-git-logs] scummvm master -> e99a2fa8c33aa7111ff60e86b576ae6911e917ef

[criezy]

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

Summary:
e99a2fa8c3 CREDITS: Remove unused docbook format


Commit: e99a2fa8c33aa7111ff60e86b576ae6911e917ef
    https://github.com/scummvm/scummvm/commit/e99a2fa8c33aa7111ff60e86b576ae6911e917ef
Author: Mataniko (mataniko at gmail.com)
Date: 2020-09-27T00:26:13+01:00

Commit Message:
CREDITS: Remove unused docbook format

Changed paths:
    devtools/credits.pl
    devtools/module.mk


diff --git a/devtools/credits.pl b/devtools/credits.pl
index c1ef4ea675..c9725a9c83 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -6,8 +6,6 @@
 # - The AUTHORS file
 # - The gui/credits.h header file
 # - The Credits.rtf file used by the Mac OS X port
-# - The credits.xml file, part of the DocBook manual
-# - The credits.xml, for use on the website (different format than the DocBook one)
 # - The credits.yaml, alternative version for use on the website
 #
 # Initial version written by Fingolfin in December 2004.
@@ -41,15 +39,14 @@ my @section_count = ( 0, 0, 0 );
 if ($#ARGV >= 0) {
 	$mode = "TEXT" if ($ARGV[0] eq "--text");	# AUTHORS file
 	$mode = "CPP" if ($ARGV[0] eq "--cpp");		# credits.h (for use by about.cpp)
-	$mode = "XML-DOC" if ($ARGV[0] eq "--xml-docbook");		# credits.xml (DocBook)
 	$mode = "RTF" if ($ARGV[0] eq "--rtf");		# Credits.rtf (Mac OS X About box)
 	$mode = "STRONGHELP" if ($ARGV[0] eq "--stronghelp");	# AUTHORS (RISC OS StrongHelp manual)
 	$mode = "YAML" if ($ARGV[0] eq "--yaml");	# YAML (Simple format, used in the Website)
 }
 
 if ($mode eq "") {
-	print STDERR "Usage: $0 [--text | --cpp | --xml-docbook | --rtf | --stronghelp | --yaml]\n";
-	print STDERR " Just pass --text / --cpp / --xml-docbook / --rtf / --stronghelp / --yaml as parameter, and credits.pl\n";
+	print STDERR "Usage: $0 [--text | --cpp | --rtf | --stronghelp | --yaml]\n";
+	print STDERR " Just pass --text / --cpp / --rtf / --stronghelp / --yaml as parameter, and credits.pl\n";
 	print STDERR " will print out the corresponding version of the credits to stdout.\n";
 	exit 1;
 }
@@ -223,19 +220,6 @@ sub begin_credits {
 	} elsif ($mode eq "CPP") {
 		print "// This file was generated by credits.pl. Do not edit by hand!\n";
 		print "static const char *credits[] = {\n";
-	} elsif ($mode eq "XML-DOC") {
-		print "<?xml version='1.0'?>\n";
-		print "<!-- This file was generated by credits.pl. Do not edit by hand! -->\n";
-		print "<!DOCTYPE appendix PUBLIC '-//OASIS//DTD DocBook XML V4.2//EN'\n";
-		print "       'http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd'>\n";
-		print "<appendix id='credits'>\n";
-		print "  <title>" . $title . "</title>\n";
-		print "  <informaltable frame='none'>\n";
-		print "  <tgroup cols='3' align='left' colsep='0' rowsep='0'>\n";
-		print "  <colspec colname='start' colwidth='0.5cm'/>\n";
-		print "  <colspec colname='name' colwidth='4cm'/>\n";
-		print "  <colspec colname='job'/>\n";
-		print "  <tbody>\n";
 	} elsif ($mode eq "YAML") {
 		print "# This file was generated by credits.pl. Do not edit by hand!\n";
 		print "credits:\n";
@@ -251,11 +235,6 @@ sub end_credits {
 		print "}\n";
 	} elsif ($mode eq "CPP") {
 		print "};\n";
-	} elsif ($mode eq "XML-DOC") {
-		print "  </tbody>\n";
-		print "  </tgroup>\n";
-		print "  </informaltable>\n";
-		print "</appendix>\n";
 	}
 }
 
@@ -306,10 +285,6 @@ sub begin_section {
 			$title = html_entities_to_cpp($title);
 			print '"C1""'.$title.'",' . "\n";
 		}
-	} elsif ($mode eq "XML-DOC") {
-		print "  <row><entry namest='start' nameend='job'>";
-		print "<emphasis role='bold'>" . $title . ":</emphasis>";
-		print "</entry></row>\n";
 	} elsif ($mode eq "YAML") {
 		my $key = "section:\n";
 		$indent = "  " . ("  " x $section_level);
@@ -358,8 +333,6 @@ sub end_section {
 		# nothing
 	} elsif ($mode eq "CPP") {
 		print '"",' . "\n";
-	} elsif ($mode eq "XML-DOC") {
-		print "  <row><entry namest='start' nameend='job'> </entry></row>\n\n";
 	}
 }
 
@@ -442,10 +415,6 @@ sub add_person {
 			$desc = html_entities_to_cpp($desc);
 			print '"C2""'.$desc.'",' . "\n";
 		}
-	} elsif ($mode eq "XML-DOC") {
-		$name = $nick if $name eq "";
-		print "  <row><entry namest='name'>" . $name . "</entry>";
-		print "<entry>" . $desc . "</entry></row>\n";
 	} elsif ($mode eq "YAML") {
 		$indent = $group_indent . "  ";
 
@@ -490,9 +459,6 @@ sub add_paragraph {
 		my $line_end = '",';
 		print $line_start . $text . $line_end . "\n";
 		print $line_start . $line_end . "\n";
-	} elsif ($mode eq "XML-DOC") {
-		print "  <row><entry namest='start' nameend='job'>" . $text . "</entry></row>\n";
-		print "  <row><entry namest='start' nameend='job'> </entry></row>\n\n";
 	} elsif ($mode eq "YAML") {
 		$indent = "  " . ("  " x $section_level);
 		if ($paragraph_started eq 0) {
diff --git a/devtools/module.mk b/devtools/module.mk
index 53bf1e29c9..9d70b5ac93 100644
--- a/devtools/module.mk
+++ b/devtools/module.mk
@@ -62,7 +62,6 @@ credits:
 #	$(srcdir)/devtools/credits.pl --rtf > $(srcdir)/Credits.rtf
 	$(srcdir)/devtools/credits.pl --cpp > $(srcdir)/gui/credits.h
 	$(srcdir)/devtools/credits.pl --yaml > $(srcdir)/../scummvm-web/data/credits.yaml
-#	$(srcdir)/devtools/credits.pl --xml-docbook > $(srcdir)/../../docs/trunk/docbook/credits.xml
 
 md5scumm: devtools/md5table$(EXEEXT)
 	devtools/md5table$(EXEEXT) --c++ < $(srcdir)/devtools/scumm-md5.txt > $(srcdir)/engines/scumm/scumm-md5.h