r6115 - in trunk: gnue-common gnue-common/etc gnue-reports

[jcater]

Author: jcater
Date: 2004-08-01 14:28:35 -0500 (Sun, 01 Aug 2004)
New Revision: 6115

Removed:
   trunk/gnue-common/etc/sample.report-filters.conf
Modified:
   trunk/gnue-common/setup-cvs.py
   trunk/gnue-common/setup.cvs
   trunk/gnue-reports/setup.cvs
Log:
fixed the ./setup-cvs.py script to work correctly on new checkouts (.conf files 
weren't working right)

Deleted: trunk/gnue-common/etc/sample.report-filters.conf
===================================================================
--- trunk/gnue-common/etc/sample.report-filters.conf    2004-08-01 16:51:53 UTC 
(rev 6114)
+++ trunk/gnue-common/etc/sample.report-filters.conf    2004-08-01 19:28:35 UTC 
(rev 6115)
@@ -1,150 +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
-
-#
-# 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
-
-
-
-########################################################
-# 
-# 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
-
-[mailmerge:authorizations-rh.rtf]
-description = Reading At Home Authorizations
-engine = merge_rtf
-template = /public/data/merge-reports/authorizations-rh.rtf
-
-[mailmerge:authorizations-dm.rtf]
-description = Direct Mail Authorizations
-engine = merge_rtf
-template = /public/data/merge-reports/authorizations-dm.rtf
-
-[mailmerge:authorizations-xt.rtf]
-description = Magazine Xtra Authorizations
-engine = merge_rtf
-template = /public/data/merge-reports/authorizations-xt.rtf
-
-[mailmerge:auth.ps]
-description = Direct Mail Authorizations (PS)
-engine = merge_psfax
-template = /home/jason/h/tmp/auth.ps
-
-[mailmerge:amc8fax]
-description = AMC8 Fax
-engine = merge_psfax
-template = /home/jason/amcfax.ps
-
-
-
-###################################################
-#
-# 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-common/setup-cvs.py
===================================================================
--- trunk/gnue-common/setup-cvs.py      2004-08-01 16:51:53 UTC (rev 6114)
+++ trunk/gnue-common/setup-cvs.py      2004-08-01 19:28:35 UTC (rev 6115)
@@ -422,14 +422,14 @@
 
 rootCommands.append("""
     cd %(GNUEDIR)s
-    ln -f -s %(CVSDIR)s/gnue-common/module/base/__init__.py .
-    ln -f -s %(CVSDIR)s/gnue-common/src common
-    if [ -f %(CVSDIR)s/gnue-common/src/.GDTD.py ]; then rm -f 
%(CVSDIR)s/gnue-common/src/.GDTD.py; fi
-#    ln -f -s %(CVSDIR)s/gnue-common/scripts/gnuedtd 
%(CVSDIR)s/common/src/.GDTD.py
+    ln -f -s %(CVSDIR)s/gnue/gnue-common/module/base/__init__.py .
+    ln -f -s %(CVSDIR)s/gnue/gnue-common/src common
+    if [ -f %(CVSDIR)s/gnue/gnue-common/src/.GDTD.py ]; then rm -f 
%(CVSDIR)s/gnue/gnue-common/src/.GDTD.py; fi
+#    ln -f -s %(CVSDIR)s/gnue/gnue-common/scripts/gnuedtd 
%(CVSDIR)s/common/src/.GDTD.py
 
-    cd %(CONFDIR)s/etc
-    rm -f sample.*
-    ln -f -s %(CVSDIR)s/gnue-common/etc/sample.* .
+#    cd %(CONFDIR)s/etc
+#   rm -f sample.*
+#    ln -f -s %(CVSDIR)s/gnue/gnue-common/etc/sample.* .
 
     rm -rf %(CONFDIR)s/share/locale/*
     cd %(CONFDIR)s/share/locale
@@ -523,9 +523,9 @@
     print "we can create a symlinked gnue.conf file that always mirrors CVS. 
This"
     print "will not allow you to customize gnue.conf, however."
     if getYesNo ("Do you want to use a symlinked gnue.conf file?",'N',):
-      command = "ln -s %(CVSDIR)s/gnue-common/etc/sample.gnue.conf 
%(CONFDIR)s/etc/gnue.conf" % globals()
+      command = "ln -s %(CVSDIR)s/gnue/gnue-common/etc/sample.gnue.conf 
%(CONFDIR)s/etc/gnue.conf" % globals()
     else:
-      command = "cp %(CVSDIR)s/gnue-common/etc/sample.gnue.conf 
%(CONFDIR)s/etc/gnue.conf" % globals()
+      command = "cp %(CVSDIR)s/gnue/gnue-common/etc/sample.gnue.conf 
%(CONFDIR)s/etc/gnue.conf" % globals()
 
     rootCommands.append(command)
 
@@ -534,7 +534,7 @@
   print ""
   print "You do not currently have a connections.conf configuration file."
   if getYesNo("Do you want to create a connections.conf based on the supplied 
examples? (Yes,No,All,neVer)",'Y','autoconf'):
-    rootCommands.append("cp %(CVSDIR)s/gnue-common/etc/sample.connections.conf 
%(CONFDIR)s/etc/connections.conf" % globals())
+    rootCommands.append("cp 
%(CVSDIR)s/gnue/gnue-common/etc/sample.connections.conf 
%(CONFDIR)s/etc/connections.conf" % globals())
 
   print
   print "NOTE: Your connections.conf file will need to"
@@ -549,9 +549,9 @@
     print "we can create a symlinked report-filters.conf file that always 
mirrors CVS. This"
     print "will not allow you to customize report-filters.conf, however."
     if getYesNo ("Do you want to use a symlinked report-filters.conf file? 
(Yes,No,All,neVer)",'N', 'symconf'):
-      command = "ln -s %(CVSDIR)s/gnue-common/etc/sample.report-filters.conf 
%(CONFDIR)s/etc/report-filters.conf" % globals()
+      command = "ln -s 
%(CVSDIR)s/gnue/gnue-reports/etc/sample.report-filters.conf 
%(CONFDIR)s/etc/report-filters.conf" % globals()
     else:
-      command = "cp %(CVSDIR)s/gnue-common/etc/sample.report-filters.conf 
%(CONFDIR)s/etc/report-filters.conf" % globals()
+      command = "cp 
%(CVSDIR)s/gnue/gnue-reports/etc/sample.report-filters.conf 
%(CONFDIR)s/etc/report-filters.conf" % globals()
 
     rootCommands.append(command)
 

Modified: trunk/gnue-common/setup.cvs
===================================================================
--- trunk/gnue-common/setup.cvs 2004-08-01 16:51:53 UTC (rev 6114)
+++ trunk/gnue-common/setup.cvs 2004-08-01 19:28:35 UTC (rev 6115)
@@ -16,7 +16,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2001-2003 Free Software Foundation
+# Copyright 2001-2004 Free Software Foundation
 #
 # ********************
 # NOTE:
@@ -34,3 +34,5 @@
 #createShell ('gtestcvs','common/GTest.py')
 
 createLink ('images/*.*', '%s/share/gnue/images/' % CONFDIR)
+createLink ('etc/sample.gnue.conf', '%s/etc/' % CONFDIR)
+createLink ('etc/sample.connections..conf', '%s/etc/' % CONFDIR)

Modified: trunk/gnue-reports/setup.cvs
===================================================================
--- trunk/gnue-reports/setup.cvs        2004-08-01 16:51:53 UTC (rev 6114)
+++ trunk/gnue-reports/setup.cvs        2004-08-01 19:28:35 UTC (rev 6115)
@@ -16,7 +16,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# Copyright 2001-2003 Free Software Foundation
+# Copyright 2001-2004 Free Software Foundation
 #
 # ********************
 # NOTE:
@@ -33,6 +33,7 @@
 
 createLink ('src/adapters/filters/Labels/etc', '%s/share/gnue/filters/Labels' 
% CONFDIR, overwrite=1)
 createLink ('src/adapters/filters/SimpleTabulation/etc', 
'%s/share/gnue/filters/SimpleTabulation' % CONFDIR, overwrite=1)
+createLink ('etc/sample.report-filters.conf', '%s/etc' % CONFDIR, overwrite=1)
 
 # Add our GNUe RPC resource files to the config directory
 createLink ('grpc/GRServer.grpc', '%s/share/gnue/grpc/GRServer.grpc' % 
CONFDIR, overwrite=1)