diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-12-04 11:14:28 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-12-04 11:14:28 +0000 |
commit | 14ca0de18414bfc9fbfbaa07a666eb147c07caa1 (patch) | |
tree | 57ee33480430cd1be5c2fc4fed2bc4829bbf641b /tools | |
parent | 4668f7cd43a9e7ad729a22c824d6dda7d87febca (diff) |
Remove tools that are no longer needed
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile.am | 5 | ||||
-rw-r--r-- | tools/make-all-async.xsl | 43 | ||||
-rw-r--r-- | tools/spec-to-introspect.xsl | 51 | ||||
-rw-r--r-- | tools/update-spec-gen-am.sh | 75 |
4 files changed, 1 insertions, 173 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index f4e658c2c..a1acdab37 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -10,10 +10,7 @@ EXTRA_DIST = \ glib-signals-marshal-gen.py \ identity.xsl \ libglibcodegen.py \ - ls-interfaces.xsl \ - make-all-async.xsl \ - spec-to-introspect.xsl \ - update-spec-gen-am.sh + ls-interfaces.xsl TELEPATHY_GLIB_SRCDIR = $(top_srcdir)/../telepathy-glib maintainer-update-from-telepathy-glib: diff --git a/tools/make-all-async.xsl b/tools/make-all-async.xsl deleted file mode 100644 index 271bec5a5..000000000 --- a/tools/make-all-async.xsl +++ /dev/null @@ -1,43 +0,0 @@ -<!-- Alter a D-Bus introspection XML file to add the DBus.GLib.Async annotation -to all methods. -The master copy of this stylesheet is in the telepathy-glib repository - -please make any changes there. - -Copyright (C) 2006, 2007 Collabora Limited - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ---> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <xsl:output method="xml" indent="yes" encoding="ascii"/> - - <xsl:template match="method"> - <xsl:copy> - <xsl:apply-templates select="@*|node()"/> - <xsl:if test="not(annotation[name='org.freedesktop.DBus.GLib.Async'])"> - <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> - </xsl:if> - </xsl:copy> - </xsl:template> - - <xsl:template match="@*|node()"> - <xsl:copy> - <xsl:apply-templates select="@*|node()"/> - </xsl:copy> - </xsl:template> - -</xsl:stylesheet> - -<!-- vim:set sw=2 sts=2 et: --> diff --git a/tools/spec-to-introspect.xsl b/tools/spec-to-introspect.xsl deleted file mode 100644 index 3def76610..000000000 --- a/tools/spec-to-introspect.xsl +++ /dev/null @@ -1,51 +0,0 @@ -<!-- Remove Telepathy extensions from a D-Bus interface, trying to leave only -DTD-compliant introspection XML. The output still needs to be subjected to the -following sed filter: -sed -e 's@xmlns:tp="http://telepathy\.freedesktop\.org/wiki/DbusSpec.extensions-v0"@@g' - -The master copy of this stylesheet is in the Telepathy spec repository - -please make any changes there. - -Copyright (C) 2006, 2007 Collabora Limited - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ---> - -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" - exclude-result-prefixes="tp"> - - <xsl:template match="*"> - <xsl:copy> - <xsl:for-each select="@*"> - <xsl:if test="not(starts-with(name(), 'tp:'))"> - <xsl:copy/> - </xsl:if> - </xsl:for-each> - <xsl:apply-templates/> - </xsl:copy> - </xsl:template> - - <xsl:template match="tp:*"/> - <xsl:template match="text()"/> - - <xsl:output method="xml" indent="yes" encoding="UTF-8" - omit-xml-declaration="no" - doctype-system="http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" - doctype-public="-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" /> - -</xsl:stylesheet> - -<!-- vim:set sw=2 sts=2 et: --> diff --git a/tools/update-spec-gen-am.sh b/tools/update-spec-gen-am.sh deleted file mode 100644 index ea8fc771a..000000000 --- a/tools/update-spec-gen-am.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh - -mk_specdir="extensions" -mk_toolsdir="tools" - -test -n "$XSLTPROC" || XSLTPROC=xsltproc -test -n "$TOP_SRCDIR" || TOP_SRCDIR=.. - -toolsdir="${TOP_SRCDIR}/${mk_toolsdir}" -specdir="${TOP_SRCDIR}/${mk_specdir}" - -outfile="$1" -gendir="$2" -whitelist="$3" - -SPEC_INTERFACES="`$XSLTPROC --nonet --novalid --xinclude $toolsdir/ls-interfaces.xsl $specdir/all.xml`" - -install -d ./`dirname "$outfile"` -exec > "$outfile.tmp" - -echo "# Rules to re-generate this file" -printf "$outfile: \$(top_srcdir)/$mk_specdir/all.xml $whitelist \\\\\\n" -printf "\\t\\t\$(top_srcdir)/$mk_specdir/all.xml \\\\\\n" -printf "\\t\\t\$(SPEC_INTERFACE_XMLS) \\\\\\n" -printf "\\t\\t\$(top_srcdir)/$mk_toolsdir/ls-interfaces.xsl \\\\\\n" -printf "\\t\\t\$(top_builddir)/$mk_toolsdir/update-spec-gen-am.sh\\n" -printf "\\tXSLTPROC=xsltproc TOP_SRCDIR=\$(top_srcdir) \$(SHELL) \$(top_builddir)/$mk_toolsdir/update-spec-gen-am.sh $outfile $gendir $whitelist\\n" -echo - -for class in INTERFACES INTERFACE_XMLS GENERATED_CS GENERATED_HS \ - GENERATED_LISTS GLUE_HS -do - if test -z "$whitelist" - then - echo "SPEC_$class =" - else - echo "STABLE_SPEC_$class =" - echo "UNSTABLE_SPEC_$class =" - fi -done - -for iface in $SPEC_INTERFACES -do - if test -z "$whitelist" - then - # just output the combined variables directly - stability= - elif grep "^$iface\$" "$whitelist" >/dev/null - then - stability=STABLE_ - else - stability=UNSTABLE_ - fi - echo "${stability}SPEC_INTERFACES += $iface" - echo "${stability}SPEC_INTERFACE_XMLS += \$(top_srcdir)/$mk_specdir/$iface.xml" - if test -n "$gendir" - then - echo "${stability}SPEC_GENERATED_CS += $gendir/svc-$iface.c" - echo "${stability}SPEC_GENERATED_HS += $gendir/svc-$iface.h" - echo "${stability}SPEC_GLUE_HS += $gendir/svc-$iface-glue.h" - echo "${stability}SPEC_GENERATED_LISTS +="\ - "$gendir/svc-$iface-signals-marshal.list" - fi -done - -if test -n "$whitelist" -then - for class in INTERFACES INTERFACE_XMLS GENERATED_CS GENERATED_HS \ - GENERATED_LISTS GLUE_HS - do - echo "SPEC_$class = \$(STABLE_SPEC_$class) \$(UNSTABLE_SPEC_$class)" - done -fi - -mv "$outfile.tmp" "$outfile" |