/[thuban]/branches/WIP-pyshapelib-bramz/setup.py

Diff of /branches/WIP-pyshapelib-bramz/setup.py

Parent Directory | Revision Log | View Patch Patch

-revision 19 by bh,
Tue Sep  4 15:11:27 2001 UTC
+revision 1229 by jonathan,
Wed Jun 18 14:46:30 2003 UTC
 Line 1
- # Copyright (c) 2001 by Intevation GmbH
+ # Copyright (c) 2001, 2002, 2003 by Intevation GmbH
  # Authors:
  # Bernhard Herzog <[email protected]>
  #
 Line 17 
 __version__ = "$Revision$"
  import os
  from types import TupleType
+ import glob
  from distutils.core import setup, Extension, Command
- from distutils.command.install import install
+ from distutils.command.install import install, INSTALL_SCHEMES, subst_vars
  from distutils.command.build_py import build_py
  from distutils.command.bdist_rpm import bdist_rpm
+ from distutils.command.build_ext import build_ext
  from distutils.file_util import write_file
+ from distutils.filelist import FileList
  from distutils.util import convert_path, change_root
+ from distutils import archive_util, dir_util
  import distutils
  from string import split
  import string
+ # config script parameter list indices
+ CS_DEFS, CS_INCDIRS, CS_LIBDIRS, CS_LIBS, CS_NUM_PARAMS = range(5)
+ # support for gdal is on by default, but under posix we try to
+ # detect it anyway. Set this to False to disable GDAL.
+ include_gdal = True
  if os.name == "posix":
      ###################################################################
      # Posix configuration. Adapt this if you're running some kind of
-Line 41 
 if os.name == "posix":
+Line 52 
 if os.name == "posix":
      proj4_lib = "proj"
-     # You shpuldn't have to modify anything below here
+     # You shouldn't have to modify anything below here
      ###################################################################
      # The installation prefix (similar to autoconf's --prefix). This is
      # only the default value, you can override it on the command line
-     # with the install command's --prefix option
+     # with the install command's --prefix option.
+     #
+     # Note that there's a separate prefix option for the bdist_rpm
+     # command completely independent of this one.
      prefix = "/usr/local/"
+     # Whether to create the thubaninit module. You can override this
+     # value on the commandline with the --create-init-module to the
+     # install command.
+     create_init_module = 1
      # On POSIX-systems we run wxgtk-config to determine the C++-compiler
      # flags
      wx_config_script = "wx-config"
      # These lists will be filled automatically below
-     wx_defs = []
+     wx_cs_params = [[] for i in range(CS_NUM_PARAMS)]
-     wx_incdirs = []
-     wx_libdirs = []
+     gdal_config_script = "gdal-config"
-     wx_libs = []
+     gdal_cs_params = [[] for i in range(CS_NUM_PARAMS)]
  elif os.name == "nt":
      #################################################################
-Line 69 
 elif os.name == "nt":
+Line 88 
 elif os.name == "nt":
      proj4_libdir =  proj4_prefix
      proj4_lib = "proj_i"
-     # Define include and lib directories for wxWindows and
+     # Define include and lib directories for wxWindows
-     wx_prefix = r"D:\wx230"
+     wx_prefix = r"D:\wx240"
-     wx_inc =  os.path.join(wx_prefix, "include")
+     wx_inc = [os.path.join(wx_prefix, 'lib', 'mswdllh'),
-     wx_lib =  os.path.join(wx_prefix, "lib")
+               os.path.join(wx_prefix, "include")]
+     wx_lib = [os.path.join(wx_prefix, "lib")]
+     # Define include and lib directories for GDAL
+     gdal_prefix = r"D:\cygwin\home\user\build\gdal-1.1.8"
+     gdal_inc = [os.path.join(gdal_prefix, 'alg'),
+                 os.path.join(gdal_prefix, 'ogr'),
+                 os.path.join(gdal_prefix, 'port'),
+                 os.path.join(gdal_prefix, 'core')]
+     gdal_lib = gdal_prefix
      #
-     # Unless you use a wxPython version other than 2.3.1, you probably
+     # Unless you use a wxPython version other than 2.4.0, you probably
      # shouldn't have to modify anything below here
      ##################################################################
-Line 84 
 elif os.name == "nt":
+Line 112 
 elif os.name == "nt":
      # the command line with the install command's --prefix option
      prefix = r"install"
+     # Whether to create the thubaninit module. You can override this
+     # value on the commandline with the --create-init-module to the
+     # install command. By default we don't create it under NT because we
+     # most often run install only as part of bdist_inno where we can't
+     # really create because it needs information only known at install
+     # time.
+     create_init_module = 0
      # There doesn't seem to be an easy way to get at the wx compiler
      # flags, so we define them here. These flags work for us with
      # wxPython 2.3.1. They may have to be modified for other versions.
-Line 91 
 elif os.name == "nt":
+Line 127 
 elif os.name == "nt":
      # there's no config script.
      wx_config_script = ""
+     wx_cs_params = [[] for i in range(CS_NUM_PARAMS)]
      # the values of wx_defs and wx_libs. copied from the wxPython
      # setup.py
-     wx_defs = [ ('WIN32', None),        # Some of these are no longer
+     wx_cs_params[CS_DEFS] = \
+               [ ('WIN32', None),        # Some of these are no longer
                  ('__WIN32__', None),    # necessary.  Anybody know which?
                  ('_WINDOWS', None),
                  ('__WINDOWS__', None),
-Line 109 
 elif os.name == "nt":
+Line 148 
 elif os.name == "nt":
                  ('WXP_USE_THREAD', '1'),
                  ]
-     wx_incdirs = [wx_inc]
+     wx_cs_params[CS_INCDIRS] = wx_inc
-     wx_libdirs = [wx_lib]
+     wx_cs_params[CS_LIBDIRS] = wx_lib
-     wx_libs = ["wx23_1h"]
+     wx_cs_params[CS_LIBS] = ["wxmsw24h"] \
-     wx_libs = wx_libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
+                       + ['kernel32', 'user32', 'gdi32', 'comdlg32',
                           'winspool', 'winmm', 'shell32', 'oldnames',
                           'comctl32', 'ctl3d32', 'odbc32', 'ole32', 'oleaut32',
                           'uuid', 'rpcrt4', 'advapi32', 'wsock32']
+     gdal_config_script = ""
+     gdal_cs_params = [[] for i in range(CS_NUM_PARAMS)]
+     gdal_cs_params[CS_INCDIRS] = gdal_inc
+     gdal_cs_params[CS_LIBDIRS] = gdal_lib
+     gdal_cs_params[CS_LIBS] = ["gdal_i"]
  else:
      raise RuntimeError("Unsupported platform " + os.name)
-Line 142 
 def run_script(cmdline):
+Line 189 
 def run_script(cmdline):
      return result
- def run_wx_script(command):
+ def run_cs_script(command, store):
      # first, determine the C++ preprocessor flags Use --cflags here
      # because it seems that older version don't have --cxxflags and
      # newer ones return the same result for both
      flags = run_script(command + ' --cflags ')
      if flags is None:
-         return 0
+         return False
      for flag in split(flags):
          start = flag[:2]
          value = flag[2:]
          if start == "-I":
-             wx_incdirs.append(value)
+             store[CS_INCDIRS].append(value)
          elif start == "-D":
-             wx_defs.append((value, None))
+             store[CS_DEFS].append((value, None))
      # determine the library flags
      flags = run_script(command + ' --libs')
      if flags is None:
-         return 0
+         return False
      for flag in split(flags):
          start = flag[:2]
          value = flag[2:]
          if start == "-L":
-             wx_libdirs.append(value)
+             store[CS_LIBDIRS].append(value)
          elif start == "-l":
-             wx_libs.append(value)
+             store[CS_LIBS].append(value)
+     return True
  if wx_config_script:
      # if there's a wx config script, run it to determine the configuration
-     run_wx_script(wx_config_script)
+     run_cs_script(wx_config_script, wx_cs_params)
+ if gdal_config_script:
+     # if there's a gdal config script, run it to determine the configuration
+     include_gdal = include_gdal \
+                    and run_cs_script(gdal_config_script, gdal_cs_params)
  #
  # Define some extension and python modules
-Line 198 
 py_modules = []
+Line 250 
 py_modules = []
  #
  extensions.append(Extension("Lib.wxproj",
-                             [ext_dir + "/thuban/wxproj.cpp",
+                             [ext_dir + "/thuban/wxproj.cpp"],
-                              shp_dir + "/shpopen.c"],
+                             include_dirs = ([shp_dir, proj4_incdir,
-                             include_dirs = [shp_dir, proj4_incdir] +wx_incdirs,
+                                              ext_dir + "/pyshapelib/"]
-                             define_macros = wx_defs,
+                                             + wx_cs_params[CS_INCDIRS]),
-                             library_dirs = [proj4_libdir] + wx_libdirs,
+                             define_macros = wx_cs_params[CS_DEFS],
-                             libraries = [proj4_lib] + wx_libs))
+                             library_dirs = [proj4_libdir] +
+                                            wx_cs_params[CS_LIBDIRS],
+                             libraries = [proj4_lib] + wx_cs_params[CS_LIBS]))
  #
  # shapelib wrappers are also distributed with thuban
-Line 211 
 extensions.append(Extension("Lib.wxproj"
+Line 266 
 extensions.append(Extension("Lib.wxproj"
  extensions.append(Extension("Lib.shapelibc",
                              [ext_dir + "/pyshapelib/shapelib_wrap.c",
-                              shp_dir + "/shpopen.c"],
+                              shp_dir + "/shpopen.c",
+                              shp_dir + "/shptree.c"],
+                             include_dirs = [shp_dir]))
+ extensions.append(Extension("Lib.shptree",
+                             [ext_dir + "/pyshapelib/shptreemodule.c"],
                              include_dirs = [shp_dir]))
  extensions.append(Extension("Lib.dbflibc",
                              [ext_dir + "/pyshapelib/dbflib_wrap.c",
-Line 238 
 py_modules.append(ext_dir + "/pyprojecti
+Line 297 
 py_modules.append(ext_dir + "/pyprojecti
  data_files = []
  # bitmaps
- dir = "Resources/Bitmaps"
+ for d, pattern in [("Resources/Bitmaps", "Resources/Bitmaps/*.xpm"),
- bitmaps = []
+                    ("Resources/Locale", "Resources/Locale/*/LC_MESSAGES/*.mo")
- for file in os.listdir(os.path.join("Resources", "Bitmaps")):
+                    ]:
-     if string.lower(file[-4:]) == ".xpm":
+     data_files.append((d, glob.glob(pattern)))
-         bitmaps.append(dir + '/' +  file)
- data_files.append((dir, bitmaps))
  #
  #       Command definitions
  #
  # So far distutils are only meant to distribute python extensions, not
  # complete applications, so we have to redefine a few commands
+ #
+ # Much of the data_dist command is directly copied from the distutils'
+ # sdist command
+ class data_dist(Command):
+     description = "create a data distribution (tarball, zip file, etc.)"
+     user_options = [
+         ('formats=', None,
+          "formats for source distribution (comma-separated list)"),
+         ('keep-temp', 'k',
+          "keep the distribution tree around after creating " +
+          "archive file(s)"),
+         ('dist-dir=', 'd',
+          "directory to put the source distribution archive(s) in "
+          "[default: dist]"),
+         ]
+     boolean_options = ['keep-temp']
+     def initialize_options (self):
+         self.formats = None
+         self.keep_temp = 0
+         self.dist_dir = None
+     def finalize_options (self):
+         self.ensure_string_list('formats')
+         if self.formats is None:
+             self.formats = ["zip"]
+         bad_format = archive_util.check_archive_formats(self.formats)
+         if bad_format:
+             raise DistutilsOptionError, \
+                   "unknown archive format '%s'" % bad_format
+         if self.dist_dir is None:
+             self.dist_dir = "dist"
+     def run(self):
+         # 'filelist' contains the list of files that will make up the
+         # manifest
+         self.filelist = FileList()
+         # Do whatever it takes to get the list of files to process.
+         # File list is accumulated in 'self.filelist'.
+         self.get_file_list()
+         # Otherwise, go ahead and create the source distribution tarball,
+         # or zipfile, or whatever.
+         self.make_distribution()
+     def get_file_list(self):
+         """Figure out the list of files to include in the data
+         distribution, and put it in 'self.filelist'.
+         """
+         self.filelist.findall("Data")
+         self.filelist.include_pattern("*", anchor = 0)
+         self.filelist.exclude_pattern(r'/(RCS|CVS)/.*', is_regex=1)
+         self.filelist.sort()
+         self.filelist.remove_duplicates()
+     def make_release_tree(self, base_dir, files):
+         """Create the directory tree that will become the source
+         distribution archive.  All directories implied by the filenames in
+         'files' are created under 'base_dir', and then we hard link or copy
+         (if hard linking is unavailable) those files into place.
+         Essentially, this duplicates the developer's source tree, but in a
+         directory named after the distribution, containing only the files
+         to be distributed.
+         """
+         # Create all the directories under 'base_dir' necessary to
+         # put 'files' there; the 'mkpath()' is just so we don't die
+         # if the manifest happens to be empty.
+         self.mkpath(base_dir)
+         dir_util.create_tree(base_dir, files,
+                              verbose=self.verbose, dry_run=self.dry_run)
+         # And walk over the list of files, either making a hard link (if
+         # os.link exists) to each one that doesn't already exist in its
+         # corresponding location under 'base_dir', or copying each file
+         # that's out-of-date in 'base_dir'.  (Usually, all files will be
+         # out-of-date, because by default we blow away 'base_dir' when
+         # we're done making the distribution archives.)
+         if hasattr(os, 'link'):        # can make hard links on this system
+             link = 'hard'
+             msg = "making hard links in %s..." % base_dir
+         else:                           # nope, have to copy
+             link = None
+             msg = "copying files to %s..." % base_dir
+         if not files:
+             self.warn("no files to distribute -- empty manifest?")
+         else:
+             self.announce(msg)
+         for file in files:
+             if not os.path.isfile(file):
+                 self.warn("'%s' not a regular file -- skipping" % file)
+             else:
+                 dest = os.path.join(base_dir, file)
+                 self.copy_file(file, dest, link=link)
+     def make_distribution (self):
+         """Create the source distribution(s).  First, we create the release
+         tree with 'make_release_tree()'; then, we create all required
+         archive files (according to 'self.formats') from the release tree.
+         Finally, we clean up by blowing away the release tree (unless
+         'self.keep_temp' is true).  The list of archive files created is
+         stored so it can be retrieved later by 'get_archive_files()'.
+         """
+         # Don't warn about missing meta-data here -- should be (and is!)
+         # done elsewhere.
+         base_dir = "Thuban-data-" + self.distribution.get_version()
+         base_name = os.path.join(self.dist_dir, base_dir)
+         self.make_release_tree(base_dir, self.filelist.files)
+         archive_files = []              # remember names of files we create
+         for fmt in self.formats:
+             file = self.make_archive(base_name, fmt, base_dir=base_dir)
+             archive_files.append(file)
+         self.archive_files = archive_files
+         if not self.keep_temp:
+             dir_util.remove_tree(base_dir, self.verbose, self.dry_run)
-Line 262 
 class InstallLocal(Command):
+Line 447 
 class InstallLocal(Command):
      """
      description =\
-         "Create some symlink so you can run thubanfrom the source directory"
+         "Create some symlinks so you can run thuban from the source directory"
      user_options = [
          ('skip-build', None, "skip the build steps"),
+         ('create-init-module', None,
+          "Create the thubaninit.py module to ease use of Thuban as a library"),
+         ('dont-create-init-module', None,
+          "Do not create the thubaninit.py module"),
          ]
+     boolean_options = ["create-init-module"]
+     negative_opt = {'dont-create-init-module' : 'create-init-module'}
      def initialize_options (self):
          self.extensions = None
          self.build_dir = None
          self.skip_build = None
+         self.create_init_module = None
      def finalize_options (self):
          self.set_undefined_options("install",
                                     ("build_lib", "build_dir"),
                                     ('skip_build', 'skip_build'))
          self.extensions = self.distribution.ext_modules
+         if self.create_init_module is None:
+             # by default we create the init module
+             self.create_init_module = 1
      def run(self):
          # Make sure we have built everything we need first
-Line 286 
 class InstallLocal(Command):
+Line 483 
 class InstallLocal(Command):
          # now do the work. Simply link or copy the Lib dir
          libdir = os.path.join(self.build_dir, "Lib")
          if os.name == "posix":
-             # on posix, just lilnk the Lib dir
+             # on posix, just link the Lib dir
              self.link_dir(libdir, "Lib")
          else:
              self.copy_tree(libdir, "Lib")
+         # create the init module if desired
+         if self.create_init_module:
+             # create the init module
+             initfilename = "thubaninit.py"
+             contents = thubaninit_contents("")
+             self.execute(write_file, (initfilename, contents),
+                          "Create %s" % initfilename)
      def link_dir(self, src, dest):
          """Create a symbolic link dest pointing to src"""
          if self.verbose:
-Line 317 
 class thuban_build_py(build_py):
+Line 522 
 class thuban_build_py(build_py):
      distribution.
      """
+     # FIXME: When Thuban can rely on Python 2.3 as the oldest supported
+     # Python release we don't need to override the run and
+     # find_all_modules methods anymore. distutils will allow both python
+     # modules and packages starting with 2.3.
      def run(self):
          """The same the as the original in build_py revision 1.33 except
          that this allows both packages and modules to be in one
-Line 368 
 class thuban_build_py(build_py):
+Line 578 
 class thuban_build_py(build_py):
          return modules
+ thubaninit_contents_start = """
+ # This module was automatically generated by Thuban's install script
+ '''Import this module once per program (best place is probably the file
+ that ends up as your __main__ module) to be able to import Thuban
+ afterwards.
+ Usage:
+ import thubaninit
+ import Thuban
+ '''
+ import sys, os
+ """
+ thubaninit_contents_thubaninitdir = """
+ sys.path.insert(0, %(thubandir)s)
+ """
+ thubaninit_contents_otherdirs = """
+ # Put the Lib dir into the path. The Lib dir contains some extra Python
+ # modules
+ import Thuban
+ thubandir = os.path.join(Thuban.__path__[0], '..')
+ dir = os.path.join(thubandir, "Lib")
+ if os.path.isdir(dir):
+     sys.path.insert(0, dir)
+ """
+ def thubaninit_contents(thubandir):
+     """Return the contents of the the thubaninit file as a list of lines.
+     The parameter thubandir is the parent directory where the Thuban/
+     package or the empty string if the thubaninit file itself will be
+     located in that direcory as well.
+     """
+     contents = thubaninit_contents_start
+     if thubandir:
+         thubandir = repr(thubandir)
+         contents += thubaninit_contents_thubaninitdir % locals()
+     contents += thubaninit_contents_otherdirs
+     return contents.split("\n")
  class ThubanInstall(install):
-Line 384 
 class ThubanInstall(install):
+Line 635 
 class ThubanInstall(install):
                          "(default on posix systems and only relevant there)"),
                           ("extra-files", None,
-                           "List of filenames or (src, dest) pairs describing "
+                           "List of filenames or (src, dest) pairs describing"
                            " extra files to install "
-                           "(can only be set from witin setup.py"),
+                           "(can only be set from within setup.py"),
+                          ("create-init-module=", None,
+                           "If true, create a module in the site-packages"
+                           " directory that tweaks sys.path to let you easily"
+                           " import thuban modules from outside of thuban."),
+                          ("init-module-dir=", None,
+                           "Directory in which to create the init module."
+                           " Defaults to Python's site-packages directory."),
                           ])
      boolean_options = install.boolean_options[:]
      boolean_options.append("do-symlink")
+     boolean_options.append("create-init-module")
      def initialize_options(self):
          self.do_symlink = None
          self.extra_files = []
+         # initialize the create_init_module flag from the global
+         # determined at runtime
+         self.create_init_module = create_init_module
+         self.init_module_dir = None
          install.initialize_options(self)
      def finalize_options(self):
-Line 404 
 class ThubanInstall(install):
+Line 669 
 class ThubanInstall(install):
              else:
                  self.do_symlink = 0
          install.finalize_options(self)
+         self.expand_with_pure_python_dirs(["init_module_dir"])
+     def expand_with_pure_python_dirs(self, attrs):
+         """Expand the attributes with default values of base and platbase"""
+         # it seems that the values for "prefix" and "exec_prefix" in
+         # self.config_vars are the corresponding values used by the
+         # python interpreter, so we just assign these to "base" and
+         # "platbase".
+         config_vars = self.config_vars.copy()
+         config_vars["base"] = self.config_vars["prefix"]
+         config_vars["platbase"] = self.config_vars["exec_prefix"]
+         for attr in attrs:
+             val = getattr(self, attr)
+             if val is not None:
+                 if os.name == 'posix':
+                     val = os.path.expanduser(val)
+                 val = subst_vars(val, config_vars)
+                 setattr(self, attr, val)
+     def select_scheme(self, scheme):
+         """Extend the inherited method to set init_module_dir"""
+         install.select_scheme(self, scheme)
+         # only set init_module_dir if it wasn't set by the user
+         if self.init_module_dir is None:
+             self.init_module_dir = INSTALL_SCHEMES[scheme]['purelib']
+     def convert_paths(self, *args):
+         """Extend the inherited method so that we can remember some filename
+         """
+         # remember the installation directory before its root gets
+         # changed
+         self.install_lib_orig = self.install_lib
+         apply(install.convert_paths, (self,) + args)
      def run(self):
          install.run(self)
-Line 412 
 class ThubanInstall(install):
+Line 710 
 class ThubanInstall(install):
                  src, dest = item
              else:
                  src = dest = item
              self.copy_file(convert_path(src),
                             os.path.join(self.root, convert_path(dest)))
          if os.name == "posix" and self.do_symlink:
-Line 427 
 class ThubanInstall(install):
+Line 725 
 class ThubanInstall(install):
              self.mkpath(bindir)
              self.link_file(scriptfile, binfile)
+         if self.create_init_module:
+             # create the init module
+             initfilename = self.thuban_init_filename()
+             if self.root:
+                 initfilename = change_root(self.root, initfilename)
+             contents = thubaninit_contents(self.install_lib_orig)
+             self.mkpath(os.path.dirname(initfilename))
+             self.execute(write_file, (initfilename, contents),
+                          "Create %s" % initfilename)
      def link_file(self, src, dest):
          """Create a symbolic link dest pointing to src.
-Line 441 
 class ThubanInstall(install):
+Line 749 
 class ThubanInstall(install):
          if not os.path.exists(dest):
              os.symlink(src, dest)
+     def thuban_init_filename(self):
+         """Return the filename for the init-module"""
+         # Since we override the normal install dirs to point to our own
+         # prefix we have to reach into installed
+         return self.init_module_dir + "/thubaninit.py"
      def get_outputs (self):
          outputs = install.get_outputs(self)
-Line 456 
 class ThubanInstall(install):
+Line 769 
 class ThubanInstall(install):
                  bindir = change_root(self.root, bindir)
              binfile = os.path.join(bindir, "thuban")
              outputs.append(binfile)
+         if self.create_init_module:
+             initfilename = self.thuban_init_filename()
+             if self.root:
+                 initfilename = change_root(self.root, initfilename)
+             outputs.append(initfilename)
          return outputs
+ # scripts to override some of the commands put into the spec-file by the
+ # bdist_rpm command.
  bdist_rpm_prep_script = '''
  %setup
  cp extensions/pyshapelib/{README,README.pyshapelib}
-Line 466 
 cp extensions/pyshapelib/{COPYING,COPYIN
+Line 787 
 cp extensions/pyshapelib/{COPYING,COPYIN
  cp extensions/pyprojection/{LICENSE,LICENSE.pyprojection}
  '''
+ bdist_rpm_build_script = '''
+ env PATH="$PATH:%(prefix)s/lib/wxPython/bin:/usr/lib/wxPython/bin" CFLAGS="$RPM_OPT_FLAGS" %(python)s setup.py build
+ '''
+ bdist_rpm_install_script = '''
+ %(python)s setup.py install --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES \
+    --prefix=%(prefix)s
+ '''
  class thuban_bdist_rpm(bdist_rpm):
      """Thuban specific RPM distribution command"""
-     def run(self):
+     user_options = bdist_rpm.user_options[:]
-         # create the prep script for the spec-file
+     user_options.extend([("prefix=", None, "Install prefix for the RPM"),
+                          ])
+     def initialize_options(self):
+         # per default, RPMs are installed in /usr
+         self.prefix = "/usr/"
+         # create the scripts we want to override. We actually fill them
+         # with contents later because some values we put into those
+         # scripts such as the python interpreter to use are only known
+         # then.
+         open("bdist_rpm_prep", "w").close()
+         open("bdist_rpm_build", "w").close()
+         open("bdist_rpm_install", "w").close()
+         bdist_rpm.initialize_options(self)
+     def _make_spec_file(self):
+         # create the scripts for the spec-file. Now we know the python
+         # interpreter to use.
          open("bdist_rpm_prep", "w").write(bdist_rpm_prep_script)
-         bdist_rpm.run(self)
+         build = bdist_rpm_build_script % {"python": self.python,
+                                           "prefix": self.prefix}
+         open("bdist_rpm_build", "w").write(build)
+         install = bdist_rpm_install_script % {"python": self.python,
+                                               "prefix": self.prefix}
+         open("bdist_rpm_install", "w").write(install)
+         #
+         return bdist_rpm._make_spec_file(self)
  class bdist_inno(Command):
-Line 558 
 class bdist_inno(Command):
+Line 914 
 class bdist_inno(Command):
          """Execute the command. install_options if given, should be a
          directory of additional options to set in the install step"""
          # Obviously have to build before we can install
          if not self.skip_build:
              self.run_command('build')
-Line 570 
 class bdist_inno(Command):
+Line 927 
 class bdist_inno(Command):
          if os.name != 'nt':
              # Must force install to use the 'nt' scheme;
              install.select_scheme('nt')
-             # don't make a symlink because we're simulating windows, so
-             # that we can generate the iss-file even on Linux
-             install.do_symlink = 0
          self.announce("installing to %s" % self.bdist_dir)
          install.ensure_finalized()
-Line 583 
 class bdist_inno(Command):
+Line 937 
 class bdist_inno(Command):
          self.execute(write_file, (iss_file, self.generate_iss()),
                       "Create Inno Setup script file %s" % iss_file)
          # and invoke
          if self.run_inno:
              self.spawn(["iscc", iss_file])
-Line 649 
 class bdist_inno(Command):
+Line 1003 
 class bdist_inno(Command):
              line = 'Name: "{group}\\%s"; Filename: "%s";' \
                     % (icon.title, icon.install_name)
              iss.append(line)
          return iss
  class InnoIconItem:
-     """Describe one item for he start menu for the Inno Setup installer"""
+     """Describe one item for the start menu for the Inno Setup installer"""
      def __init__(self, filename, title, install_name = None):
          self.filename = filename
-Line 673 
 class thuban_bdist_inno(bdist_inno):
+Line 1027 
 class thuban_bdist_inno(bdist_inno):
      def run(self):
          install_options = {
              "prefix": ".",
+             "install_lib": "$base",
+             "install_data": "$base",
              "install_scripts": "$base",
              "warn_dir": 0,
              "extra_files": ["COPYING", "Lib/proj.dll"],
              }
+         # don't make a symlink because we're simulating windows, so
+         # that we can generate the iss-file even on Linux
+         install_options["do_symlink"] = 0
          bdist_inno.run(self, install_options)
+ class thuban_build_docs(Command):
+     """Command to generate documentation from source code."""
+     description = "Generate documentation."
+     user_options = []
+     def initialize_options(self): pass
+     def finalize_options(self): pass
+     def run(self, install_options = None):
+         self.spawn(["happydoc", "-d./Doc", "./Thuban"])
+ class thuban_build_ext(build_ext):
+     """Extend the build_ext command to optionally include the
+     GDAL extension.
+     """
+     user_options = build_ext.user_options[:]
+     user_options.extend([("with-gdal", None, "Include GDAL support."),
+                          ("without-gdal", None, "Don't include GDAL support.")])
+     boolean_options = ["with-gdal"]
+     negative_opt = {'without-gdal' : 'with-gdal'}
+     def initialize_options(self):
+         self.with_gdal = True
+         build_ext.initialize_options(self)
+     def finalize_options(self):
+         build_ext.finalize_options(self)
+         if self.with_gdal and include_gdal:
+             self.extensions.append(Extension("Lib.gdalwarp",
+                                 [ext_dir + "/thuban/gdalwarp.cpp",
+                                 ext_dir + "/thuban/cpl_mfile.cpp",
+                                 ext_dir + "/thuban/bmpdataset.cpp"],
+                                 include_dirs = ([gdal_cs_params[CS_INCDIRS],
+                                                 ext_dir + "/thuban/"]),
+                                 define_macros = gdal_cs_params[CS_DEFS],
+                                 library_dirs = gdal_cs_params[CS_LIBDIRS],
+                                 libraries = [proj4_lib] +
+                                             gdal_cs_params[CS_LIBS]))
+     def run(self, install_options = None):
+         build_ext.run(self)
  #
  #   Run the script
  #
  long_description = """\
  Thuban is a viewer for geographic data written in Python
  """
  setup(name = "Thuban",
-       version = "0.0.3",
+       version = "0.2.0",
        description = "Geographic data viewer",
        long_description = long_description,
        licence = "GPL",
        author = "Intevation GmbH",
        author_email = "[email protected]",
-       url = "ftp:intevation.de/",
+       url = "http://thuban.intevation.de/",
        scripts = ["thuban.py"],
        packages = ["Thuban", "Thuban.Lib", "Thuban.Model", "Thuban.UI"],
-Line 710 
 setup(name = "Thuban",
+Line 1117 
 setup(name = "Thuban",
                   {"prefix": prefix,
                    # make sure both libs and scripts are installed in the
                    # same directory.
-                   "install_lib": "$base/thuban",
+                   "install_lib": "$base/lib/thuban",
-                   "install_scripts": "$base/thuban",
+                   "install_scripts": "$base/lib/thuban",
-                   "install_data": "$base/thuban",
+                   "install_data": "$base/lib/thuban",
                    # Don't print warning messages about the lib dir not
                    # being on Python's path. The libraries are Thuban
-Line 731 
 setup(name = "Thuban",
+Line 1138 
 setup(name = "Thuban",
                    "install_local": InstallLocal,
                    "install": ThubanInstall,
                    "bdist_rpm": thuban_bdist_rpm,
-                   "bdist_inno": thuban_bdist_inno
+                   "bdist_inno": thuban_bdist_inno,
+                   "data_dist": data_dist,
+                   "build_docs": thuban_build_docs,
+                   "build_ext": thuban_build_ext
                    })

 Legend:



Removed from v.19
 


changed lines


 
Added in v.1229
 Legend:



Removed from v.19
 


changed lines


 
Added in v.1229
-Removed from v.19
+Added in v.1229

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26