summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2018-09-01 02:25:50 +0200
committerMichael Adam <obnox@samba.org>2018-09-01 04:06:59 +0200
commit3eb3c2c099a6097cd821e96c22a247648784c14b (patch)
treede63ff6fd943b0a774ea65426e8aa6a944677831
parenta5e6d343d78462f9233015af9b7b0a1911d5e6db (diff)
Remove xml-based AUTHORS mechanism. AUTHORS is checked in.
Signed-off-by: Michael Adam <obnox@samba.org>
-rw-r--r--Makefile.am20
-rw-r--r--authors.dtd12
-rw-r--r--authors.xml36
-rw-r--r--authors.xsl57
4 files changed, 1 insertions, 124 deletions
diff --git a/Makefile.am b/Makefile.am
index 9d62d2c..e9113c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,22 +9,7 @@ SUBDIRS = \
# tools want this on a single line
ACLOCAL_AMFLAGS = -I m4macros
-AUTHORS: authors.xml authors.xsl
-if HAVE_XSLTPROC
- $(AM_V_GEN) $(XSLTPROC) authors.xsl $< > $(@) || rm -f $(@)
-else
- @echo "*** xsltproc is required to regenerate $(@) ***"; exit 1;
-endif
-
-validate-authors:
-if HAVE_XMLLINT
- @$(XMLLINT) --noout --path $(srcdir) --valid authors.xml || \
- ( echo "*** authors.xml IS INVALID ***"; exit 1; )
-endif
-
-all-local: AUTHORS
-
-check-local: validate-authors
+all-local:
dist_doc_DATA = \
AUTHORS \
@@ -33,9 +18,6 @@ dist_doc_DATA = \
README.md
EXTRA_DIST = \
- authors.dtd \
- authors.xml \
- authors.xsl \
autogen.sh \
tinyproxy-indent.sh \
TODO
diff --git a/authors.dtd b/authors.dtd
deleted file mode 100644
index 77d43c5..0000000
--- a/authors.dtd
+++ /dev/null
@@ -1,12 +0,0 @@
-<!--
-
- Simple DTD for Tinyproxy authors. This file was adapted from GIMP.
-
--->
-
-<!ELEMENT authors (contributor+)>
-<!ATTLIST authors xmlns CDATA #FIXED "http://purl.org/dc/elements/1.1/">
-
-<!ELEMENT contributor (#PCDATA)>
-<!ATTLIST contributor role CDATA #REQUIRED>
-<!ATTLIST contributor last-active CDATA #REQUIRED>
diff --git a/authors.xml b/authors.xml
deleted file mode 100644
index 7fc94f2..0000000
--- a/authors.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE authors SYSTEM "authors.dtd">
-
-<!--
-
- This file is supposed to list all authors and contributors. It's in
- XML format so that it can easily be used in source code. When
- changing this file, please keep the alphabetical order. This file
- was adapted from GIMP.
-
--->
-
-<authors xmlns="http://purl.org/dc/elements/1.1/">
-
- <contributor role="author" last-active="1.7">Andrew Stribblehill</contributor>
- <contributor role="author" last-active="1.6">Chris Lightfoot</contributor>
- <contributor role="author" last-active="1.8">Daniel Egger</contributor>
- <contributor role="author" last-active="1.8">David Shanks</contributor>
- <contributor role="author" last-active="1.8">Dmitry Semyonov</contributor>
- <contributor role="author" last-active="1.6">George Talusan</contributor>
- <contributor role="author" last-active="1.6">James E. Flemer</contributor>
- <contributor role="author" last-active="1.7">Jeremy Hinegardner</contributor>
- <contributor role="author" last-active="1.8">John van der Kamp</contributor>
- <contributor role="author" last-active="1.8">Jordi Mallach</contributor>
- <contributor role="author" last-active="1.7">Kim Holviala</contributor>
- <contributor role="documenter" last-active="1.7">Marc Silver</contributor>
- <contributor role="author" last-active="1.8">Mathew Mrosko</contributor>
- <contributor role="author" last-active="1.7">Matthew Dempsky</contributor>
- <contributor role="author,documenter" last-active="1.8">Michael Adam</contributor>
- <contributor role="author" last-active="1.8">Moritz Muehlenhoff</contributor>
- <contributor role="author,documenter" last-active="1.8">Mukund Sivaraman</contributor>
- <contributor role="author" last-active="1.6">Petr Lampa</contributor>
- <contributor role="author,documenter" last-active="1.7">Robert James Kaes</contributor>
- <contributor role="author,documenter" last-active="1.7">Steven Young</contributor>
-
-</authors>
diff --git a/authors.xsl b/authors.xsl
deleted file mode 100644
index 77ba4e0..0000000
--- a/authors.xsl
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-
- Simple XSL transformation to create a text version AUTHORS file from
- authors.xml. This file was adapted from GIMP.
-
--->
-
-<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
-
- <xsl:output method="text" />
-
- <xsl:template name="contributor">
- <xsl:param name="role" />
- <xsl:apply-templates select="dc:contributor[contains(@role, $role)]" />
- </xsl:template>
-
- <xsl:template match="/dc:authors">
- <xsl:text>Tinyproxy AUTHORS
-=================
-
-////
-This file is generated from authors.xml, do not edit it directly.
-////
-
-Coding
-------
-
-The following people have contributed code to Tinyproxy:
-
-</xsl:text>
- <xsl:call-template name="contributor">
- <xsl:with-param name="role" select="'author'"/>
- </xsl:call-template>
- <xsl:text>
-
-Documentation
--------------
-
-The following people have helped to document Tinyproxy:
-
-</xsl:text>
- <xsl:call-template name="contributor">
- <xsl:with-param name="role" select="'documenter'"/>
- </xsl:call-template>
-
- </xsl:template>
-
- <xsl:template match="dc:contributor">
- <xsl:text> * </xsl:text><xsl:apply-templates /><xsl:text>
-</xsl:text>
- </xsl:template>
-
-</xsl:stylesheet>