commit-gnue
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnue-common ./setup.py src/__init__.py


From: Reinhard Mueller
Subject: gnue-common ./setup.py src/__init__.py
Date: Sat, 27 Sep 2003 19:23:02 -0400

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         
Changes by:     Reinhard Mueller <address@hidden>       03/09/27 19:23:02

Modified files:
        .              : setup.py 
        src            : __init__.py 

Log message:
        Restructured installation routine. I really like it now.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/setup.py.diff?tr1=1.74&tr2=1.75&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/__init__.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text

Patches:
Index: gnue-common/setup.py
diff -c gnue-common/setup.py:1.74 gnue-common/setup.py:1.75
*** gnue-common/setup.py:1.74   Fri Sep 26 10:24:54 2003
--- gnue-common/setup.py        Sat Sep 27 19:23:01 2003
***************
*** 25,40 ****
  import string
  import os
  
  from distutils.core import setup
  from distutils.util import change_root
  from distutils.sysconfig import get_python_lib
! from distutils.command.build import build
! from distutils.command.install import install
! from distutils.command.install_lib import install_lib
  from setupext import Data_Files, install_Data_Files
  
- from src import PACKAGE, VERSION
- 
  # 
-----------------------------------------------------------------------------
  # Check Python version
  # 
-----------------------------------------------------------------------------
--- 25,139 ----
  import string
  import os
  
+ from src import PACKAGE, VERSION
+ 
+ # 
=============================================================================
+ # Please keep these routines up to date
+ # 
=============================================================================
+ 
+ # 
-----------------------------------------------------------------------------
+ # 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 (params):
+   
+   # The Work
+   params ["name"]             = PACKAGE
+   params ["version"]          = VERSION
+   params ["description"]      = "GNU Enterprise Common Base"
+   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":                  "module/base",
+                             "gnue.common":           "src",
+                             "gnue.common.installer": "installer"}
+   params ["scripts"] = ["scripts/gnue-schema"]
+ 
+   # The Data
+   # TODO: get rid of setupext!
+   params ["data_files"] = \
+     [Data_Files (base_dir = 'install_data',
+                  copy_to = 'shared',
+                  template = ['recursive-include images *.png',
+                              'recursive-include images *.xpm',
+                              'recursive-include images *.ico',
+                              'recursive-include images *.bmp'],
+                  preserve_path = 1),
+      Data_Files (base_dir = 'install_config',
+                  copy_to = '',
+                  template = ['recursive-include etc *',
+                              'prune etc/CVS'],
+                  preserve_path = 0),
+      Data_Files (base_dir = 'install_data',
+                  copy_to = '',
+                  template = ['recursive-include translations *',
+                              'prune translations/CVS'],
+                  preserve_path = 1),
+      Data_Files (base_dir = 'install_data',
+                  copy_to = 'share/man/man1',
+                  template = ['recursive-include man *.1'],
+                  preserve_path = 0),
+      Data_Files (base_dir = 'install_data',
+                  copy_to = 'share/doc/gnue-common',
+                  template = ['recursive-include doc *',
+                              'prune doc/CVS',
+                              'prune doc/technotes/CVS'],
+                  strip_dirs = 1, # This is a number, not true/false
+                  preserve_path = 1)]
+ 
+ # 
-----------------------------------------------------------------------------
+ # 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 ():
+   # First check if we have everything installed we need to build the
+   # distribution
+ 
+   # is gsscvs available (to build man pages)?
+   if not os.path.isfile ("scripts/gsscvs"):
+     print "Could not find file 'scripts/gsscvs'.  Please run 'setup-cvs.py'."
+     sys.exit (1)
+ 
+   # 
---------------------------------------------------------------------------
+ 
+   print "building man page"
+   if os.system ("mkdir -p man && cd man " \
+                  + " && ../scripts/gsscvs --generate-man-page") != 0:
+     sys.exit (1)
+ 
+ # 
-----------------------------------------------------------------------------
+ # Check dependencies for installation:
+ # Should sys.exit(1) in case any requirement isn't met.
+ # Gets called on install.
+ # 
-----------------------------------------------------------------------------
+ 
+ def check_dependencies ():
+ 
+   # TODO!
+   pass
+ 
+ # 
=============================================================================
+ # No changes should be required below this line
+ # 
=============================================================================
+ 
  from distutils.core import setup
  from distutils.util import change_root
  from distutils.sysconfig import get_python_lib
! import distutils.command.sdist
! import distutils.command.build
! import distutils.command.install
  from setupext import Data_Files, install_Data_Files
  
  # 
-----------------------------------------------------------------------------
  # Check Python version
  # 
-----------------------------------------------------------------------------
***************
*** 90,153 ****
    except:
      pass
  
! # 
-----------------------------------------------------------------------------
! # Save sys.path for later
! # 
-----------------------------------------------------------------------------
! 
! orig_sys_path = list (sys.path)         # list () is needed to make a copy
! 
! # 
-----------------------------------------------------------------------------
! # Build files to be distributed and installed
! # 
-----------------------------------------------------------------------------
! 
! def build_files ():
!   # First check if we have everything installed we need to build the
!   # distribution
! 
!   # is gsscvs available (to build man pages)?
!   if not os.path.isfile ("scripts/gsscvs"):
!     print "Could not find file 'scripts/gsscvs'.  Please run 'setup-cvs.py'."
!     sys.exit (1)
! 
!   # 
---------------------------------------------------------------------------
! 
!   print "building man page"
!   if os.system ("mkdir -p man && cd man " \
!                  + " && ../scripts/gsscvs --generate-man-page") != 0:
!     sys.exit (1)
  
! # 
-----------------------------------------------------------------------------
! # Source distribution: Build files to be distributed
! # 
-----------------------------------------------------------------------------
  
! if "sdist" in sys.argv:
!   # if a paths.py exists, it would get distributed if we didn't remove it
!   if os.path.isfile ("module/base/paths.py"):
!     os.remove ("module/base/paths.py")
!   build_files ()
  
  # 
=============================================================================
! # Before build: if done from CVS, build files to be installed
  # 
=============================================================================
  
! class gnue_build (build):
! 
!   def finalize_options (self):
!     build.finalize_options (self)
!     if self.finalized:
!       return
  
      if not os.path.isfile ("PKG-INFO"):         # downloaded from CVS?
!       if sys.platform != 'win32':
!         build_files ()
  
  # 
=============================================================================
! # Before installation: check dependencies and create real scripts
  # 
=============================================================================
  
! class gnue_install (install):
  
!   user_options = install.user_options
    i = 0
    for option in user_options:
      i = i + 1
--- 189,222 ----
    except:
      pass
  
! # 
=============================================================================
! # sdist: build files to be distributed first
! # 
=============================================================================
  
! class sdist (distutils.command.sdist.sdist):
  
!   def run (self):
!     build_files ()
!     distutils.command.sdist.sdist.run (self)
  
  # 
=============================================================================
! # build: if done from CVS, build files to be installed first
  # 
=============================================================================
  
! class build (distutils.command.build.build):
  
+   def run (self):
      if not os.path.isfile ("PKG-INFO"):         # downloaded from CVS?
!       build_files ()
!     distutils.command.build.build.run (self)
  
  # 
=============================================================================
! # install: New option, generate path dependent files
  # 
=============================================================================
  
! class install (distutils.command.install.install):
  
!   user_options = distutils.command.install.install.user_options
    i = 0
    for option in user_options:
      i = i + 1
***************
*** 161,197 ****
    # 
---------------------------------------------------------------------------
  
    def initialize_options (self):
!     install.initialize_options (self)
      self.install_config = None
  
    # 
---------------------------------------------------------------------------
!   # Check dependencies
!   # 
---------------------------------------------------------------------------
! 
!   def _check_dependencies (self):
! 
!     # TODO!
!     pass
! 
!   # 
---------------------------------------------------------------------------
!   # Create paths.py
    # 
---------------------------------------------------------------------------
  
!   def _write_paths_py (self):
  
!     output = open ("module/base/paths.py", "w")
!     output.write ("# This file was generated during installation.\n")
!     output.write ("\n")
!     if sys.platform == "win32":
!       # "c:\python23\lib\site-packages\" is not a valid string literal
!       # even a raw string cannot end in an odd number of backslashes
!       output.write ("lib = \"%s\"\n" % self.install_lib.replace("\\","\\\\"))
!     else:
!       output.write ("lib = \"%s\"\n" % self.install_lib)
!     output.write ("scripts = \"%s\"\n" % self.install_scripts)
!     output.write ("data = \"%s\"\n" % self.install_data)
!     output.write ("config = \"%s\"\n" % self.install_config)
!     output.close ()
  
    # 
---------------------------------------------------------------------------
    # Build the commands to place into the scripts
--- 230,253 ----
    # 
---------------------------------------------------------------------------
  
    def initialize_options (self):
!     distutils.command.install.install.initialize_options (self)
      self.install_config = None
  
    # 
---------------------------------------------------------------------------
!   # Finalize options (i.e. provide default if not set by user)
    # 
---------------------------------------------------------------------------
  
!   def finalize_options (self):
!     distutils.command.install.install.finalize_options (self)
  
!     # try to set a reasonable default for --install-config
!     if self.install_config is None:
!       if self.home == "/usr" or self.prefix == "/usr":
!         self.install_config = "/etc"
!       elif self.home == "/opt/gnue" or self.prefix == "/opt/gnue":
!         self.install_config = "/etc/opt/gnue"
!       else:
!         self.install_config = os.path.join (self.install_data, "etc")
  
    # 
---------------------------------------------------------------------------
    # Build the commands to place into the scripts
***************
*** 201,206 ****
--- 257,264 ----
      if sys.platform != 'win32':
        gnue_env = ""
      else:
+       # FIXME: Can this be moved into BaseApp.py ?
+       #        Or into the scripts ?
        gnue_env = \
          "#######\n" \
          + "# The following variables were set when GNUe was installed\n"    \
***************
*** 245,317 ****
        fout.close()
  
    # 
---------------------------------------------------------------------------
!   # Do it all - this is called by setup () if option install is given
    # 
---------------------------------------------------------------------------
  
!   def finalize_options (self):
!     install.finalize_options (self)
!     if self.finalized:
!       return
! 
!     # try to set a reasonable default for --install-config
!     if self.install_config is None:
!       if self.home == "/usr" or self.prefix == "/usr":
!         self.install_config = "/etc"
!       elif self.home == "/opt/gnue" or self.prefix == "/opt/gnue":
!         self.install_config = "/etc/opt/gnue"
!       else:
!         self.install_config = os.path.join (self.install_data, "etc")
! 
!     # if install directory isn't in Python's search path, add it there
!     if self.install_lib not in sys.path:
!       sys.path.append (self.install_lib)
! 
!     self._write_paths_py ()
! 
!     self._check_dependencies ()
! 
!     self._generate_scripts ()
! 
! # 
=============================================================================
! # After installation of lib, create gnue.py in python's search path
! # 
=============================================================================
  
! class gnue_install_lib (install_lib):
  
!   def run (self):
!     install_lib.run (self)
  
!     # we need gnue.py only if we don't install in python's search path
!     if self.install_dir not in orig_sys_path:
!       # --root parameter
!       root = self.get_finalized_command("install").root
!       # the location we have to add to the search path
!       inst_dir = self.install_dir
!       # where to install gnue.py
        site_dir = get_python_lib ()
!       if root:
!         # remove --root from installation directory
!         inst_dir = inst_dir [len(root):]
          # add --root to target directory for gnue.py
!         site_dir = change_root (root, site_dir)
        # especially if we have --root, the directory might not exist
        if not os.path.isdir (site_dir):
          os.makedirs (site_dir)
!       file = os.path.join (site_dir, "gnue.py")
        # now create the file
        try:
          output = open (file, "w")
!         output.write ("# This file was generated during installation.\n")
!         output.write ("import sys\n")
!         output.write ("sys.path.insert (0, \"%s\")\n" % inst_dir)
!         output.write ("del sys.modules [\"gnue\"]\n")
!         output.write ("import gnue")
          output.close ()
        except:
!         # file could not be created:
!         # simply restore original sys.path so the warning appears at the end
!         # of the installation
!         sys.path = orig_sys_path
  
  # 
-----------------------------------------------------------------------------
  # GNUE_VERSION_SUFFIX handling
--- 303,397 ----
        fout.close()
  
    # 
---------------------------------------------------------------------------
!   # Quote a path: remove --root and duplicate backslashes
    # 
---------------------------------------------------------------------------
  
!   def _quote (self, path):
!     if self.root:
!       p = path [len(self.root):]
!     else:
!       p = path
!     return p.replace("\\","\\\\")
  
!   # 
---------------------------------------------------------------------------
!   # Create gnue.pth
!   # 
---------------------------------------------------------------------------
  
!   def _write_gnue_pth (self):
  
!     # we need gnue.pth only if we don't install in python's search path
!     if self.install_lib not in sys.path:
!       # where to install gnue.pth
        site_dir = get_python_lib ()
!       if self.root:
          # add --root to target directory for gnue.py
!         site_dir = change_root (self.root, site_dir)
! 
        # especially if we have --root, the directory might not exist
        if not os.path.isdir (site_dir):
          os.makedirs (site_dir)
! 
        # now create the file
+       file = os.path.join (site_dir, "gnue.pth")
+       print "trying to create %s" % file
        try:
          output = open (file, "w")
!         output.write (self._quote (self.install_lib))
          output.close ()
+         # It worked. Turn off error message about installing into directory
+         # not in path.
+         sys.path.append (self.install_lib)
        except:
!         pass
! 
!   # 
---------------------------------------------------------------------------
!   # Create paths.py
!   # 
---------------------------------------------------------------------------
! 
!   def _write_paths_py (self):
!     dir = os.path.join (self.install_lib, "gnue")
!     if not os.path.isdir (dir):
!       os.makedirs (dir)
!     file = os.path.join (dir, "paths.py")
!     print "creating %s" % file
!     output = open (file, "w")
!     output.write ("# This file was generated during installation.\n")
!     output.write ("\n")
!     output.write ("lib     = \"%s\"\n" % self._quote (self.install_lib))
!     output.write ("scripts = \"%s\"\n" % self._quote (self.install_scripts))
!     output.write ("data    = \"%s\"\n" % self._quote (self.install_data))
!     output.write ("config  = \"%s\"\n" % self._quote (self.install_config))
!     output.close ()
! 
!   # 
---------------------------------------------------------------------------
!   # install.run: generate and install path dependent files afterwards
!   # 
---------------------------------------------------------------------------
! 
!   def run (self):
!     check_dependencies ()
! 
!     self._generate_scripts ()
! 
!     self._write_gnue_pth ()
! 
!     self._write_paths_py ()
! 
!     distutils.command.install.install.run (self)
! 
! # 
-----------------------------------------------------------------------------
! # Get all packages in a directory
! # 
-----------------------------------------------------------------------------
! 
! def get_packages (directory, package):
!   content = os.listdir (directory)
!   result = []
!   if "__init__.py" in content:
!     result = [package]
!     for name in content:
!       fullname = os.path.join (directory, name)
!       if os.path.isdir (fullname):
!         result = result + get_packages (fullname, package + "." + name)
!   return result
  
  # 
-----------------------------------------------------------------------------
  # GNUE_VERSION_SUFFIX handling
***************
*** 330,527 ****
  # Call the actual setup routine
  # 
-----------------------------------------------------------------------------
  
! dfiles = [
!   Data_Files(
!              base_dir = 'install_data',
!              copy_to = 'shared',
!              template = ['recursive-include images *.png',
!                          'recursive-include images *.xpm',
!                          'recursive-include images *.ico',
!                          'recursive-include images *.bmp',
!                          'prune images/CVS'],
!              preserve_path = 1),
!   Data_Files(
!              base_dir = 'install_config',
!              copy_to = '',
!              template = ['recursive-include etc *',
!                          'prune etc/CVS'],
!              preserve_path = 0),
!   Data_Files(
!              base_dir = 'install_data',
!              copy_to = '',
!              template = ['recursive-include translations *',
!                          'prune translations/CVS'],
!              preserve_path = 1),
!   Data_Files(
!              base_dir = 'install_data',
!              copy_to = 'share/man/man1',
!              template = ['recursive-include man *.1'],
!              preserve_path = 0),
!   Data_Files(
!              base_dir = 'install_data',
!              copy_to = 'share/doc/gnue-common',
!              template = ['recursive-include doc *',
!                          'prune doc/CVS',
!                          'prune doc/technotes/CVS'],
!              strip_dirs = 1, # This is a number, not true/false
!              preserve_path = 1)
!   ]
! 
! setup (name = "GNUe-Common",
!        version = VERSION + suffix,
!        description = "Base files of a GNU Enterprise Tools install",
!        long_description = "",
!        author = "GNUe Team",
!        author_email = "address@hidden",
!        url = "http://www.gnue.org";,
!        license = "GPL",
  
!        # Override certain command classes with our own ones
!        cmdclass = {"build": gnue_build,
!                    "install": gnue_install,
!                    "install_lib": gnue_install_lib,
!                    "install_data": install_Data_Files},
! 
!        data_files = dfiles,
! 
!        packages = ["gnue",
!                    "gnue.common",
!                    "gnue.common.apps",
!                    "gnue.common.cursing",
!                    "gnue.common.datasources",
!                    "gnue.common.datasources.drivers",
!                    "gnue.common.datasources.drivers.Base",
!                    "gnue.common.datasources.drivers.special",
!                    "gnue.common.datasources.drivers.special.static",
!                    "gnue.common.datasources.drivers.special.unbound",
!                    "gnue.common.datasources.drivers.special.configfile",
!                    "gnue.common.datasources.drivers.odbc",
!                    "gnue.common.datasources.drivers.odbc.wodbc",
!                    "gnue.common.datasources.drivers.odbc.mxodbc",
!                    "gnue.common.datasources.drivers.adodbapi",
!                    "gnue.common.datasources.drivers.adodbapi.Schema",
!                    "gnue.common.datasources.drivers.adodbapi.Schema.Creation",
!                    
"gnue.common.datasources.drivers.adodbapi.Schema.Discovery",
!                    "gnue.common.datasources.drivers.adodbapi.Extensions",
!                    "gnue.common.datasources.drivers.adodbapi.adodbapi",
!                    "gnue.common.datasources.drivers.postgresql",
!                    "gnue.common.datasources.drivers.postgresql.Base",
!                    "gnue.common.datasources.drivers.postgresql.Schema",
!                    
"gnue.common.datasources.drivers.postgresql.Schema.Creation",
!                    
"gnue.common.datasources.drivers.postgresql.Schema.Discovery",
!                    "gnue.common.datasources.drivers.postgresql.Extensions",
!                    "gnue.common.datasources.drivers.postgresql.popy",
!                    "gnue.common.datasources.drivers.postgresql.pygresql",
!                    "gnue.common.datasources.drivers.postgresql.psycopg",
!                    "gnue.common.datasources.drivers.postgresql.pypgsql",
!                    "gnue.common.datasources.drivers.oracle",
!                    "gnue.common.datasources.drivers.oracle.Base",
!                    "gnue.common.datasources.drivers.oracle.Schema",
!                    "gnue.common.datasources.drivers.oracle.Schema.Creation",
!                    "gnue.common.datasources.drivers.oracle.Schema.Discovery",
!                    "gnue.common.datasources.drivers.oracle.Extensions",
!                    "gnue.common.datasources.drivers.oracle.cxoracle",
!                    "gnue.common.datasources.drivers.oracle.dcoracle",
!                    "gnue.common.datasources.drivers.appserver",
!                    "gnue.common.datasources.drivers.appserver.Schema",
!                    
"gnue.common.datasources.drivers.appserver.Schema.Creation",
!                    
"gnue.common.datasources.drivers.appserver.Schema.Discovery",
!                    "gnue.common.datasources.drivers.appserver.Extensions",
!                    "gnue.common.datasources.drivers.appserver.appserver",
!                    "gnue.common.datasources.drivers.db2",
!                    "gnue.common.datasources.drivers.db2.Schema",
!                    "gnue.common.datasources.drivers.db2.Schema.Creation",
!                    "gnue.common.datasources.drivers.db2.Schema.Discovery",
!                    "gnue.common.datasources.drivers.db2.Extensions",
!                    "gnue.common.datasources.drivers.db2.db2",
!                    "gnue.common.datasources.drivers.dbf",
!                    "gnue.common.datasources.drivers.dbf.Schema",
!                    "gnue.common.datasources.drivers.dbf.Schema.Creation",
!                    "gnue.common.datasources.drivers.dbf.Schema.Discovery",
!                    "gnue.common.datasources.drivers.dbf.Extensions",
!                    "gnue.common.datasources.drivers.dbf.dbf",
!                    "gnue.common.datasources.drivers.gadfly",
!                    "gnue.common.datasources.drivers.gadfly.Schema",
!                    "gnue.common.datasources.drivers.gadfly.Schema.Creation",
!                    "gnue.common.datasources.drivers.gadfly.Schema.Discovery",
!                    "gnue.common.datasources.drivers.gadfly.Extensions",
!                    "gnue.common.datasources.drivers.gadfly.gadfly",
!                    "gnue.common.datasources.drivers.informix",
!                    "gnue.common.datasources.drivers.informix.Schema",
!                    "gnue.common.datasources.drivers.informix.Schema.Creation",
!                    
"gnue.common.datasources.drivers.informix.Schema.Discovery",
!                    "gnue.common.datasources.drivers.informix.Extensions",
!                    "gnue.common.datasources.drivers.informix.informix",
!                    "gnue.common.datasources.drivers.ingres",
!                    "gnue.common.datasources.drivers.ingres.Schema",
!                    "gnue.common.datasources.drivers.ingres.Schema.Creation",
!                    "gnue.common.datasources.drivers.ingres.Schema.Discovery",
!                    "gnue.common.datasources.drivers.ingres.Extensions",
!                    "gnue.common.datasources.drivers.ingres.ingres",
!                    "gnue.common.datasources.drivers.interbase",
!                    "gnue.common.datasources.drivers.interbase.Schema",
!                    
"gnue.common.datasources.drivers.interbase.Schema.Creation",
!                    
"gnue.common.datasources.drivers.interbase.Schema.Discovery",
!                    "gnue.common.datasources.drivers.interbase.Extensions",
!                    "gnue.common.datasources.drivers.interbase.interbase",
!                    "gnue.common.datasources.drivers.ldap",
!                    "gnue.common.datasources.drivers.mysql",
!                    "gnue.common.datasources.drivers.mysql.Schema",
!                    "gnue.common.datasources.drivers.mysql.Schema.Creation",
!                    "gnue.common.datasources.drivers.mysql.Schema.Discovery",
!                    "gnue.common.datasources.drivers.mysql.Extensions",
!                    "gnue.common.datasources.drivers.mysql.mysql",
!                    "gnue.common.datasources.drivers.sapdb",
!                    "gnue.common.datasources.drivers.sapdb.Schema",
!                    "gnue.common.datasources.drivers.sapdb.Schema.Creation",
!                    "gnue.common.datasources.drivers.sapdb.Schema.Discovery",
!                    "gnue.common.datasources.drivers.sapdb.Extensions",
!                    "gnue.common.datasources.drivers.sapdb.sapdb",
!                    "gnue.common.datasources.drivers.sqlite",
!                    "gnue.common.datasources.drivers.sqlite.Schema",
!                    "gnue.common.datasources.drivers.sqlite.Schema.Creation",
!                    "gnue.common.datasources.drivers.sqlite.Schema.Discovery",
!                    "gnue.common.datasources.drivers.sqlite.Extensions",
!                    "gnue.common.datasources.drivers.sqlite.sqlite",
!                    "gnue.common.datasources.drivers.sybase",
!                    "gnue.common.datasources.drivers.sybase.Schema",
!                    "gnue.common.datasources.drivers.sybase.Schema.Creation",
!                    "gnue.common.datasources.drivers.sybase.Schema.Discovery",
!                    "gnue.common.datasources.drivers.sybase.Extensions",
!                    "gnue.common.datasources.drivers.sybase.sybase",
!                    "gnue.common.datasources.drivers.sqlrelay",
!                    "gnue.common.datasources.drivers.sqlrelay.sqlrelay",
!                    "gnue.common.datasources.drivers.DBSIG2",
!                    "gnue.common.definitions",
!                    "gnue.common.events",
!                    "gnue.common.external",
!                    "gnue.common.formatting",
!                    "gnue.common.gear",
!                    "gnue.common.logic",
!                    "gnue.common.rpc",
!                    "gnue.common.rpc.parser",
!                    "gnue.common.rpc.test",
!                    "gnue.common.rpc.drivers",
!                    "gnue.common.rpc.drivers.corba",
!                    "gnue.common.rpc.drivers._helpers",
!                    "gnue.common.rpc.drivers.proxy",
!                    "gnue.common.rpc.drivers.pyro",
!                    "gnue.common.rpc.drivers.soap",
!                    "gnue.common.rpc.drivers.sockets",
!                    "gnue.common.rpc.drivers.xmlrpc",
!                    "gnue.common.rpc.drivers.xmlrpc.py_xmlrpc",
!                    "gnue.common.rpc.drivers.xmlrpc.pw_xmlrpc",
!                    "gnue.common.schema",
!                    "gnue.common.schema.scripter",
!                    "gnue.common.schema.scripter.processors",
!                    "gnue.common.utils"],
! 
!        package_dir = {"gnue": "module/base",
!                       "gnue.common": "src",
!                       "gnue.common.installer": "installer"},
  
!        scripts = ["scripts/gnue-schema"],
!        )
  
  # 
-----------------------------------------------------------------------------
  # Clean up
--- 410,442 ----
  # Call the actual setup routine
  # 
-----------------------------------------------------------------------------
  
! setup_params = {}
  
! set_params (setup_params)
  
! if not setup_params.has_key ("packages"):
!   packages = []
!   for module, directory in setup_params["package_dir"].items ():
!     packages = packages + get_packages (directory, module)
!   setup_params ["packages"] = packages
! 
! setup (name             = setup_params ["name"],
!        version          = setup_params ["version"] + suffix,
!        description      = setup_params ["description"],
!        long_description = setup_params ["long_description"],
!        author           = setup_params ["author"],
!        author_email     = setup_params ["author_email"],
!        url              = setup_params ["url"],
!        license          = setup_params ["license"],
!        packages         = setup_params ["packages"],
!        package_dir      = setup_params ["package_dir"],
!        scripts          = setup_params ["scripts"],
!        data_files       = setup_params ["data_files"],
! 
!        # Override certain command classes with our own ones
!        cmdclass = {"build": build,
!                    "install": install,
!                    "install_data": install_Data_Files})
  
  # 
-----------------------------------------------------------------------------
  # Clean up
Index: gnue-common/src/__init__.py
diff -c gnue-common/src/__init__.py:1.30 gnue-common/src/__init__.py:1.31
*** gnue-common/src/__init__.py:1.30    Thu Aug 21 11:57:16 2003
--- gnue-common/src/__init__.py Sat Sep 27 19:23:02 2003
***************
*** 56,59 ****
  __version__ = VERSION
  __hexversion__ = HEXVERSION
  
! PACKAGE="GNUe Common"
--- 56,59 ----
  __version__ = VERSION
  __hexversion__ = HEXVERSION
  
! PACKAGE="GNUe-Common"




reply via email to

[Prev in Thread] Current Thread [Next in Thread]