[gnue] r10088 - in trunk/gnue-reports: . etc

[reinhard]

Author: reinhard
Date: 2009-12-05 13:45:56 -0600 (Sat, 05 Dec 2009)
New Revision: 10088

Added:
   trunk/gnue-reports/etc/report-filters.conf
Removed:
   trunk/gnue-reports/etc/sample.report-filters.conf
Modified:
   trunk/gnue-reports/setup.py
Log:
Include report-filters.conf in distribution.


Copied: trunk/gnue-reports/etc/report-filters.conf (from rev 10078, 
trunk/gnue-reports/etc/sample.report-filters.conf)
===================================================================
--- trunk/gnue-reports/etc/report-filters.conf                          (rev 0)
+++ trunk/gnue-reports/etc/report-filters.conf  2009-12-05 19:45:56 UTC (rev 
10088)
@@ -0,0 +1,145 @@
+#
+# This creates a nickname for the various report types.
+#
+[mappings]
+simple = GNUe:Reports:SimpleTabulation
+mailmerge = GNUe:Reports:MailMerge
+labels = GNUe:Reports:Labels
+standard = GNUe:Reports:Standard
+char = GNUe:Reports:Char
+
+#
+# Settings for the different filters
+#
+# Common parameters:
+#    engine : the engine to do the processing. Can be a
+#             XSLT processor (choose between 'sablotron','libxslt',...
+#             or a customized python processor like 'tabulator' for
+#             the Simple tabulation example
+
+
+########################################################
+# 
+# Char filter
+#
+
+[char:text]
+engine = char
+formatter = text
+mimetype = text/plain
+
+[char:escp]
+engine = char
+formatter = escp
+mimetype = text/plain
+
+[char:pcl5]
+engine = char
+formatter = pcl5
+mimetype = text/plain
+
+
+########################################################
+# 
+# Simple tabulation filter
+#
+
+
+[simple:text]
+description = Basic text without any formatting
+mimetype = text/plain
+
+# using XSLT
+engine = sablotron
+template = text.xsl
+
+# using tabulator engine
+engine = tabulator
+formatter = text
+encoding = iso8859-1
+
+
+[simple:html]
+description = HTML 3.0-compatable markup.
+mimetype = text/html
+
+# using XSLT
+engine = sablotron
+template = html.xsl
+
+# using tabulator engine
+engine = tabulator
+formatter = html
+encoding = utf-8
+
+[simple:pdf]
+description = PDF Output.
+mimetype = text/pdf
+
+# using XSLT (broken?)
+#engine = sablotron
+#template = html.xsl
+
+# using tabulator engine
+engine = tabulator
+formatter = pdf
+
+
+# postprocessor doesn't work
+#[simple:ps]
+#description = Postscript output (generated using html2ps)
+#engine = sablotron
+#template = html.xsl
+#mimetype = text/postscript
+#postprocessor1 = html2ps
+
+
+[simple:csv]
+description = Comma Separated Values text format.
+mimetype = text/comma-separated-values
+# using XSLT
+engine = sablotron
+template = csv.xsl
+
+# using tabulator engine
+engine = tabulator
+formatter = csv
+encoding = iso8859-1
+
+
+########################################################
+# 
+# These are MailMerge examples
+#
+
+#[mailmerge:demo.rtf]
+#description = My Sample RTF template
+#engine = merge_rtf
+#template = 
/home/jason/cvs/gnue/reports/samples/mailmerge/gnue-intro-letter.abiword.rtf
+
+
+###################################################
+#
+# label adapters
+# (these won't have to change, normally)
+#
+
+[labels:text]
+description = Basic text without any formatting
+engine = labels
+formatter = text
+mimetype = text/plain
+
+
+[labels:postscript]
+description = Postscript output
+engine = labels
+formatter = postscript
+mimetype = text/postscript
+
+
+#
+# It is not necessary to define 'raw' drivers
+# GNUe Reports automatically associates a "raw"
+# output for each mapping.
+#

Deleted: trunk/gnue-reports/etc/sample.report-filters.conf
===================================================================
--- trunk/gnue-reports/etc/sample.report-filters.conf   2009-12-05 19:38:27 UTC 
(rev 10087)
+++ trunk/gnue-reports/etc/sample.report-filters.conf   2009-12-05 19:45:56 UTC 
(rev 10088)
@@ -1,145 +0,0 @@
-#
-# This creates a nickname for the various report types.
-#
-[mappings]
-simple = GNUe:Reports:SimpleTabulation
-mailmerge = GNUe:Reports:MailMerge
-labels = GNUe:Reports:Labels
-standard = GNUe:Reports:Standard
-char = GNUe:Reports:Char
-
-#
-# Settings for the different filters
-#
-# Common parameters:
-#    engine : the engine to do the processing. Can be a
-#             XSLT processor (choose between 'sablotron','libxslt',...
-#             or a customized python processor like 'tabulator' for
-#             the Simple tabulation example
-
-
-########################################################
-# 
-# Char filter
-#
-
-[char:text]
-engine = char
-formatter = text
-mimetype = text/plain
-
-[char:escp]
-engine = char
-formatter = escp
-mimetype = text/plain
-
-[char:pcl5]
-engine = char
-formatter = pcl5
-mimetype = text/plain
-
-
-########################################################
-# 
-# Simple tabulation filter
-#
-
-
-[simple:text]
-description = Basic text without any formatting
-mimetype = text/plain
-
-# using XSLT
-engine = sablotron
-template = text.xsl
-
-# using tabulator engine
-engine = tabulator
-formatter = text
-encoding = iso8859-1
-
-
-[simple:html]
-description = HTML 3.0-compatable markup.
-mimetype = text/html
-
-# using XSLT
-engine = sablotron
-template = html.xsl
-
-# using tabulator engine
-engine = tabulator
-formatter = html
-encoding = utf-8
-
-[simple:pdf]
-description = PDF Output.
-mimetype = text/pdf
-
-# using XSLT (broken?)
-#engine = sablotron
-#template = html.xsl
-
-# using tabulator engine
-engine = tabulator
-formatter = pdf
-
-
-# postprocessor doesn't work
-#[simple:ps]
-#description = Postscript output (generated using html2ps)
-#engine = sablotron
-#template = html.xsl
-#mimetype = text/postscript
-#postprocessor1 = html2ps
-
-
-[simple:csv]
-description = Comma Separated Values text format.
-mimetype = text/comma-separated-values
-# using XSLT
-engine = sablotron
-template = csv.xsl
-
-# using tabulator engine
-engine = tabulator
-formatter = csv
-encoding = iso8859-1
-
-
-########################################################
-# 
-# These are MailMerge examples
-#
-
-[mailmerge:demo.rtf]
-description = My Sample RTF template
-engine = merge_rtf
-template = 
/home/jason/cvs/gnue/reports/samples/mailmerge/gnue-intro-letter.abiword.rtf
-
-
-###################################################
-#
-# label adapters
-# (these won't have to change, normally)
-#
-
-[labels:text]
-description = Basic text without any formatting
-engine = labels
-formatter = text
-mimetype = text/plain
-
-
-[labels:postscript]
-description = Postscript output
-engine = labels
-formatter = postscript
-mimetype = text/postscript
-
-
-#
-# It is not necessary to define 'raw' drivers
-# GNUe Reports automatically associates a "raw"
-# output for each mapping.
-#

Modified: trunk/gnue-reports/setup.py
===================================================================
--- trunk/gnue-reports/setup.py 2009-12-05 19:38:27 UTC (rev 10087)
+++ trunk/gnue-reports/setup.py 2009-12-05 19:45:56 UTC (rev 10088)
@@ -31,7 +31,7 @@
 try:
   from gnue.common.setup import GSetup
 except ImportError:
-  print "You need GNUe-Common 0.5.2 or newer installed to install %s" % PACKAGE
+  print "You need GNUe-Common 0.6.8 or newer installed to install %s" % PACKAGE
   sys.exit (1)
 
 # =============================================================================
@@ -69,7 +69,7 @@
     filterSimple = self.allfiles ("src/adapters/filters/SimpleTabulation/etc/")
     filterChar = self.allfiles ("src/adapters/filters/Char/etc/printdef/")
     man1files    = self.allfiles ("doc/man")
-    docfiles     = self.allfiles ("doc") + ["etc/sample.report-filters.conf"]
+    docfiles     = self.allfiles ("doc")
     samp01files  = self.allfiles ("samples/cross-tabulation")
     samp02files  = self.allfiles ("samples/dcl")
     samp03files  = self.allfiles ("samples/docbook")
@@ -92,6 +92,8 @@
        ("share/doc/gnue-reports/examples/location",         samp06files),
        ("share/doc/gnue-reports/examples/mailmerge",        samp07files)]
 
+    params ["config_files"] = [("", ["etc/report-filters.conf"])]
+
   # ---------------------------------------------------------------------------
   # Build files to be distributed and installed:
   # Should generate the files that go in a distribution but aren't in SVN.