[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-reports ./.cvsignore ./MANIFEST.in ./setup...
|
From: |
Reinhard Mueller |
|
Subject: |
gnue-reports ./.cvsignore ./MANIFEST.in ./setup... |
|
Date: |
Sun, 05 Oct 2003 13:12:08 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-reports
Branch:
Changes by: Reinhard Mueller <address@hidden> 03/10/05 13:12:08
Modified files:
. : .cvsignore MANIFEST.in setup.cvs setup.py
scripts : .cvsignore
src : __init__.py
src/server : GRServer.py
Removed files:
. : setup.cfg.in
scripts : gnue-reports-server.in gnue-reports.in
Log message:
Changed setup script to use GSetup.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/MANIFEST.in.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/setup.cvs.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/setup.py.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/scripts/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/__init__.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/server/GRServer.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: gnue-reports/.cvsignore
diff -c gnue-reports/.cvsignore:1.1 gnue-reports/.cvsignore:1.2
*** gnue-reports/.cvsignore:1.1 Mon Apr 22 11:46:21 2002
--- gnue-reports/.cvsignore Sun Oct 5 13:12:07 2003
***************
*** 1,35 ****
! *.lo
! *.bak
! *.pyc
! .deps
! .libs
! _libs
! Makefile
! Makefile.in
! aclocal.m4
! config.cache
! config.guess
! config.h
! config.h.in
! config.h.win32
! config.log
! config.status
! config.sub
! configure
! configure.scan
! libtool
! ltconfig
! ltmain.sh
! stamp-h
! stamp-h.in
! stamp.h
! version.h
! config.h.in
! .exrc
! install-sh
! missing
! mkinstalldirs
! ABOUT-NLS
build
- .cvsdevelbase
- setup.cfg
--- 1,3 ----
! MANIFEST
! dist
build
Index: gnue-reports/MANIFEST.in
diff -c gnue-reports/MANIFEST.in:1.7 gnue-reports/MANIFEST.in:1.8
*** gnue-reports/MANIFEST.in:1.7 Tue May 13 14:58:24 2003
--- gnue-reports/MANIFEST.in Sun Oct 5 13:12:07 2003
***************
*** 1,19 ****
include AUTHORS
- include BUGS
- include COPYING
include ChangeLog
! include INSTALL*
include NEWS
! include README*
include TODO
- include FAQ
! include setup.cfg.in
! recursive-include man *.1
! recursive-include scripts *.in
recursive-include samples *
- recursive-include doc *.txt *.pdf
- recursive-include src/adapters/filters/Labels/etc *
- recursive-include src/adapters/filters/SimpleTabulation/etc *
- recursive-include src/adapters/filters/MailMerge/etc *
- recursive-include src/adapters/filters/Universal/etc *
--- 1,19 ----
include AUTHORS
include ChangeLog
! include COPYING
! include FAQ
! include INSTALL
include NEWS
! include README
include TODO
! include scripts/gnue-*
! include src/adapters/filters/Labels/etc/*
! include src/adapters/filters/SimpleTabulation/etc/*
! include src/adapters/filters/MailMerge/etc/*
! include src/adapters/filters/Universal/etc/*
! include utils/*
!
! recursive-include doc *
! recursive-include packaging *
recursive-include samples *
Index: gnue-reports/scripts/.cvsignore
diff -c gnue-reports/scripts/.cvsignore:1.1 gnue-reports/scripts/.cvsignore:1.2
*** gnue-reports/scripts/.cvsignore:1.1 Tue May 21 01:33:11 2002
--- gnue-reports/scripts/.cvsignore Sun Oct 5 13:12:07 2003
***************
*** 1,37 ****
- *.lo
- *.bak
- *.pyc
- .deps
- .libs
- _libs
- Makefile
- Makefile.in
- aclocal.m4
- config.cache
- config.guess
- config.h
- config.h.in
- config.h.win32
- config.log
- config.status
- config.sub
- configure
- configure.scan
- libtool
- ltconfig
- ltmain.sh
- stamp-h
- stamp-h.in
- stamp.h
- version.h
- config.h.in
- .exrc
- install-sh
- missing
- mkinstalldirs
- ABOUT-NLS
- build
- .cvsdevelbase
- setup.cfg
grcvs
grdcvs
--- 1,2 ----
Index: gnue-reports/setup.cvs
diff -c gnue-reports/setup.cvs:1.2 gnue-reports/setup.cvs:1.3
*** gnue-reports/setup.cvs:1.2 Sat Oct 4 07:22:28 2003
--- gnue-reports/setup.cvs Sun Oct 5 13:12:07 2003
***************
*** 35,38 ****
createLink('src/adapters/filters/SimpleTabulation/etc','%s/share/gnue/filters/SimpleTabulation'
% CONFDIR, overwrite=1)
# Add our GNUe RPC resource files to the config directory
! createLink('grpc/GRServer.grpc','%s/shared/grpc/GRServer.grpc' % CONFDIR,
overwrite=1)
--- 35,38 ----
createLink('src/adapters/filters/SimpleTabulation/etc','%s/share/gnue/filters/SimpleTabulation'
% 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)
Index: gnue-reports/setup.py
diff -c gnue-reports/setup.py:1.33 gnue-reports/setup.py:1.34
*** gnue-reports/setup.py:1.33 Thu Sep 18 23:59:59 2003
--- gnue-reports/setup.py Sun Oct 5 13:12:07 2003
***************
*** 1,5 ****
--- 1,7 ----
#!/usr/bin/env python
#
+ # GNU Enterprise Reports - Installation Procedure
+ #
# Copyright 2001-2003 Free Software Foundation
#
# This file is part of GNU Enterprise.
***************
*** 19,303 ****
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
import sys
- import string
import os
- import os.path
-
- from src import VERSION
-
- try:
- import py2exe
- except:
- pass
-
-
- #
- # hack to deal w/ fact distutils won't
- # allow us to set absolute path prefix
- # on windows
- #
-
- if not 'sdist' in sys.argv:
- if sys.platform != 'win32' and '--prefix' not in sys.argv and '--root' not
in sys.argv:
- os.system ("""cp setup.cfg.in setup.cfg""")
- else:
- try:
- os.remove('setup.cfg')
- except:
- pass
-
-
-
try:
! from distutils.core import setup
! from distutils.command.build_scripts import build_scripts
except ImportError:
! print """
! Setup requires that python's distutils be
! installed. You can get a copy of it from
! http://www.python.org/sigs/distutils-sig/
! """
! sys.exit()
!
!
! if 'sdist' in sys.argv:
! print """
! *** Notes for creating source disto ***
!
! Make sure and create update the html and text docs
! prior to creating the source distribution.
! """
! raw_input ("Press Control-D to abort or any other key to continue")
!
! os.system ("""
! cd doc
! lyx --export text ReportingConcepts.lyx
! lyx --export pdf ReportingConcepts.lyx
! """)
!
!
! print "Now, we are going to create the man pages for our tools."
! os.system( """
! if [ ! -e man ]
! then
! mkdir man
! fi
! cd man
! ../scripts/grcvs --generate-man-page
! #../scripts/gnue-reports-server --generate-man-page
! """)
! # Site config stuff
! try:
! index = sys.argv.index('--cfg-file')
! site_config = os.path.join(os.path.abspath(sys.argv[index+1]))
! sys.argv.pop(index)
! sys.argv.pop(index)
! config_line = "os.environ['GNUE_INSTALLED_SITE_CFG']='%s'\n" % site_config
!
! except ValueError:
! config_line = ""
!
! #if ('build' in sys.argv) or ('install' in sys.argv):
! # # Verify that gnue-common is installed
! # try:
! # print "Checking for GNUe-Common....",
! # from gnue import common
! # if common.__dict__.has_key('VERSION'):
! # print "OK (version %s)" % common.VERSION
! # else:
! # print "OK"
! # except ImportError:
! # print """
! #You will need to install gnue-common
! #before gnuef will function. You can
! #obtain a copy from
! #
! #http://www.gnuenterprise.org/download.php
! #"""
! # sys.exit()
!
!
!
! class my_build_scripts(build_scripts):
! def finalize_options(self):
!
! build_scripts.finalize_options(self)
!
! if self.finalized:
! return
!
!
! if sys.platform != 'win32':
! dict = self.distribution.get_option_dict("install")
! install_prefix = dict['prefix'][1]
!
! gnue_env = \
! "#######\n" \
! + "# The following variable were set when GNUe was installed\n" \
! + "import os, sys\n" \
! + "sys.path.append('%s')\n" % dict['install_lib'][1] \
! + "INST_GNUE_CONNECTIONS='%s/etc/connections.conf'\n" %
dict['prefix'][1] \
! + "os.environ['INSTALL_LIB']='%s'\n" % dict['install_lib'][1] \
! + "os.environ['INSTALL_PREFIX']='%s'\n" % dict['prefix'][1] \
! + config_line \
! + "#######\n"
! else:
! gnue_env = \
! "#######\n" \
! + "# The following variables were set when GNUe was installed\n"
\
! + "# (Generated for a Win32 system)\n" \
! + "import os, sys\n" \
! + "if __name__ == '__main__': \n" \
! + " _BASE =
os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]),'..'))\n" \
! + " try:\n" \
! + " os.environ['PATH']=
os.path.abspath(os.path.dirname(sys.argv[0])) + ';' + os.environ['PATH']\n" \
! + " except KeyError:\n" \
! + " os.environ['PATH']=
os.path.abspath(os.path.dirname(sys.argv[0]))\n" \
! + "else: \n" \
! + " _BASE =
os.path.abspath(os.path.join(os.path.dirname(__file__),'..'))\n" \
! +
"INST_GNUE_CONNECTIONS=os.path.join(_BASE,'etc','connections.conf')\n" \
! + "os.environ['INSTALL_PREFIX']=_BASE\n" \
! + "os.environ['INSTALL_LIB']=_BASE\n" \
! + "os.putenv('PYTHONCASEOK','1')\n" \
! + config_line \
! + "if os.path.isdir(os.path.join(_BASE,'extras')):\n" \
! + " sys.path.append(os.path.join(_BASE,'extras'))\n" \
! + "#######\n\n"
!
! for script in self.scripts:
! print "Building %s..."% (script),
!
!
! fin = open(script+".in", "r")
! fout = open(script, "w")
!
! print "Generating script %s from %s.in" % (script,script)
!
! lines = fin.readlines()
!
! for i in range(0, len(lines)):
! if string.strip(lines[i]) == "__GNUEENV__":
! lines[i] = gnue_env
!
! fout.writelines(lines)
! fin.close()
! fout.close()
! print "OK"
!
!
! docfiles = []
! for file in ('doc/ReportingConcepts.txt',
! 'doc/ReportingConcepts.pdf'):
! if os.path.isfile(file):
! docfiles.append(file)
! else:
! print "WARNING: File %s does not exist... not installing!" % file
!
! manfiles = []
! for file in ('man/gnue-reports.1',
! 'man/gnue-reports-server.1'):
! if os.path.isfile(file):
! manfiles.append(file)
! else:
! print "WARNING: File %s does not exist... not installing!" % file
! #
! # You can run:
! # $ GNUE_VERSION_SUFFIX=-pre1 ./setup.py sdist
! # and the packages will be created as GNUe-App-0.x.x-pre1.tar.gz
! #
! try:
! suffix = os.environ['GNUE_VERSION_SUFFIX']
! except KeyError:
! suffix = ""
!
!
! setup (name = "GNUe-Reports",
! version = VERSION+suffix,
! description = "GNU Enterprise Reports",
! long_description = "",
! author = "GNUe Reports Team",
! author_email = "address@hidden",
! url = "http://www.gnue.org";,
!
! # Override certain command classes with our own ones
! cmdclass = {'build_scripts':my_build_scripts},
!
! data_files = [ ('doc/reports', docfiles),
! ('man/man1', manfiles),
! ('shared/filters/Labels',
['src/adapters/filters/Labels/etc/label-specs.dat']),
! ('shared/filters/SimpleTabulation', [
!
'src/adapters/filters/SimpleTabulation/etc/csv.xsl',
!
'src/adapters/filters/SimpleTabulation/etc/html.xsl',
!
'src/adapters/filters/SimpleTabulation/etc/text.xsl']
! ) ],
!
! packages = ["gnue.reports",
! "gnue.reports.adapters",
! "gnue.reports.adapters.destinations",
! "gnue.reports.adapters.destinations.email",
! "gnue.reports.adapters.destinations.fax",
! "gnue.reports.adapters.destinations.file",
! "gnue.reports.adapters.destinations.printer",
! "gnue.reports.adapters.filters",
! "gnue.reports.adapters.filters.Labels",
! "gnue.reports.adapters.filters.Labels.labels",
! "gnue.reports.adapters.filters.Labels.labels.formatters",
! "gnue.reports.adapters.filters.MailMerge",
! "gnue.reports.adapters.filters.MailMerge._merge",
! "gnue.reports.adapters.filters.MailMerge.merge_latex",
! "gnue.reports.adapters.filters.MailMerge.merge_ps",
! "gnue.reports.adapters.filters.MailMerge.merge_psfax",
! "gnue.reports.adapters.filters.MailMerge.merge_rtf",
! "gnue.reports.adapters.filters.SimpleTabulation",
! "gnue.reports.adapters.filters.SimpleTabulation.tabulator",
!
"gnue.reports.adapters.filters.SimpleTabulation.tabulator.formatters",
! "gnue.reports.adapters.filters.general",
! "gnue.reports.adapters.filters.general.4xslt",
! "gnue.reports.adapters.filters.general.raw",
! "gnue.reports.adapters.filters.general.sablotron",
! "gnue.reports.adapters.filters.Universal",
! "gnue.reports.adapters.filters.Universal.Base",
! "gnue.reports.adapters.filters.Universal.Base.Objects",
! "gnue.reports.adapters.filters.Universal.postscript",
!
"gnue.reports.adapters.filters.Universal.postscript.psutils",
! "gnue.reports.adapters.filters.Universal.pcl5",
! "gnue.reports.adapters.filters.Universal.html",
! "gnue.reports.adapters.filters.Universal.xhtml",
! "gnue.reports.adapters.filters.Universal.rtf",
! "gnue.reports.adapters.filters.Universal.tex",
! "gnue.reports.adapters.filters.Universal.lineprinter",
! "gnue.reports.adapters.filters.Universal.Base.styles",
!
"gnue.reports.adapters.filters.Universal.Base.styles.Objects",
! "gnue.reports.adapters.filters.Universal.Base.Helpers",
! "gnue.reports.adapters.filters.Universal.Base.Writers",
! "gnue.reports.base",
! "gnue.reports.base.layout",
! "gnue.reports.client",
! "gnue.reports.server",
! ],
!
! package_dir = {"gnue.reports" : "src"},
!
! scripts = ["scripts/gnue-reports", ] # "scripts/gnue-reports-server"]
! )
!
! if 'install' in sys.argv:
! print """
! Note:
! Warnings about the files not being installed in pythons search path can
be ignored.
!
! Make sure you have a default gnue.conf file (typically in
/usr/local/gnue/etc.
! A sample is provided in that directory that you can typically just copy
over.
! """
!
! if not 'sdist' in sys.argv:
! if sys.platform != 'win32':
! os.system (""" /bin/rm -rf setup.cfg""")
--- 21,98 ----
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
+ # $Id: setup.py,v 1.34 2003/10/05 17:12:07 reinhard Exp $
import sys
import os
+ from src import PACKAGE, VERSION
try:
! from gnue.common.setup import GSetup
except ImportError:
! print "You need GNUe-Common 0.5.2 or newer installed to install %s" %
PACKAGE
! sys.exit (1)
+ #
=============================================================================
! class setup (GSetup):
+ #
---------------------------------------------------------------------------
+ # Definition of basic parameters for distribution and installation.
+ # Please add new files/directories that should be installed here.
+ # Note that you also have to add them to MANIFEST.in.
+ #
---------------------------------------------------------------------------
+
+ def set_params (self, params):
+
+ # The Work
+ params ["name"] = PACKAGE
+ params ["version"] = VERSION
+ params ["description"] = "GNU Enterprise Reports"
+ params ["long_description"] = ""
+ params ["license"] = "GPL"
+
+ # The Author
+ params ["author"] = "GNU Enterprise Team"
+ params ["author_email"] = "address@hidden"
+ params ["url"] = "http://www.gnue.org";
+
+ # The Programs
+ params ["package_dir"] = {"gnue.reports": "src"}
+ params ["scripts"] = ["scripts/gnue-reports"]
+
+ # The Data
+ filterLabels = self.allfiles ("src/adapters/filters/Labels/etc/")
+ filterSimple = self.allfiles
("src/adapters/filters/SimpleTabulation/etc/")
+ docfiles = self.allfiles ("doc")
+
+ params ["data_files"] = \
+ [("share/gnue/filters/Labels", filterLabels),
+ ("share/gnue/filters/SimpleTabulation", filterSimple),
+ ("share/doc/gnue-reports", docfiles)]
+
+ #
---------------------------------------------------------------------------
+ # Build files to be distributed and installed:
+ # Should generate the files that go in a distribution but aren't in CVS.
+ # Gets called on sdist (always) and on build/install (only when run from
CVS).
+ #
---------------------------------------------------------------------------
+
+ def build_files (self):
+ # nothing to do here
+ pass
+
+ #
---------------------------------------------------------------------------
+ # Check dependencies for installation:
+ # Should sys.exit(1) in case any requirement isn't met.
+ # Gets called on install.
+ #
---------------------------------------------------------------------------
+
+ def check_dependencies (self):
+ # TODO
+ pass
! #
=============================================================================
!
! if __name__ == "__main__":
! setup().run()
Index: gnue-reports/src/__init__.py
diff -c gnue-reports/src/__init__.py:1.17 gnue-reports/src/__init__.py:1.18
*** gnue-reports/src/__init__.py:1.17 Thu Aug 21 11:57:53 2003
--- gnue-reports/src/__init__.py Sun Oct 5 13:12:07 2003
***************
*** 56,59 ****
__hexversion__ = HEXVERSION
! PACKAGE="GNUe Reports"
--- 56,59 ----
__hexversion__ = HEXVERSION
! PACKAGE="GNUe-Reports"
Index: gnue-reports/src/server/GRServer.py
diff -c gnue-reports/src/server/GRServer.py:1.12
gnue-reports/src/server/GRServer.py:1.13
*** gnue-reports/src/server/GRServer.py:1.12 Mon Feb 17 02:32:55 2003
--- gnue-reports/src/server/GRServer.py Sun Oct 5 13:12:08 2003
***************
*** 103,109 ****
# Create the various servers
servers=GComm.bind (GConfig.getInstalledBase('install_prefix')+\
! '/shared/grpc/GRServer.grpc',
self._transports,
{'GReportServer': self.requestServer })
--- 103,109 ----
# Create the various servers
servers=GComm.bind (GConfig.getInstalledBase('install_prefix')+\
! '/share/gnue/grpc/GRServer.grpc',
self._transports,
{'GReportServer': self.requestServer })
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-reports ./.cvsignore ./MANIFEST.in ./setup...,
Reinhard Mueller <=