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

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

Parent Directory | Revision Log | View Patch Patch

-revision 212 by bh,
Wed Jul 10 14:06:09 2002 UTC
+revision 1316 by jonathan,
Mon Jun 30 09:47:04 2003 UTC
 Line 1
- # Copyright (c) 2001, 2002 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, 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
-Line 31 
 import distutils
+Line 33 
 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 51 
 if os.name == "posix":
+Line 60 
 if os.name == "posix":
      # with the install command's --prefix option.
      #
      # Note that there's a separate prefix option for the bdist_rpm
-     # command completely independend of this one.
+     # command completely independent of this one.
      prefix = "/usr/local/"
      # Whether to create the thubaninit module. You can override this
-Line 63 
 if os.name == "posix":
+Line 72 
 if os.name == "posix":
      # 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 74 
 elif os.name == "nt":
+Line 83 
 elif os.name == "nt":
      #
      # Directories where Proj4 is installed
-     proj4_prefix = r"D:\cygwin\home\user\proj-4.4.3\src"
+     proj4_prefix = r"D:\cygwin\home\user\proj-4.4.7\src"
      proj4_incdir =  proj4_prefix
      proj4_libdir =  proj4_prefix
      proj4_lib = "proj_i"
      # Define include and lib directories for wxWindows and
-     wx_prefix = r"D:\wx230"
+     wx_prefix = r"C:\wx-versions\wxPython-2.4.0.6"
-     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 109 
 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 127 
 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 160 
 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 219 
 extensions.append(Extension("Lib.wxproj"
+Line 253 
 extensions.append(Extension("Lib.wxproj"
                              [ext_dir + "/thuban/wxproj.cpp"],
                              include_dirs = ([shp_dir, proj4_incdir,
                                               ext_dir + "/pyshapelib/"]
-                                             + wx_incdirs),
+                                             + wx_cs_params[CS_INCDIRS]),
-                             define_macros = wx_defs,
+                             define_macros = wx_cs_params[CS_DEFS],
-                             library_dirs = [proj4_libdir] + wx_libdirs,
+                             library_dirs = [proj4_libdir] +
-                             libraries = [proj4_lib] + wx_libs))
+                                            wx_cs_params[CS_LIBDIRS],
+                             libraries = [proj4_lib] + wx_cs_params[CS_LIBS]))
  #
  # shapelib wrappers are also distributed with thuban
-Line 260 
 py_modules.append(ext_dir + "/pyprojecti
+Line 296 
 py_modules.append(ext_dir + "/pyprojecti
  data_files = []
- # bitmaps
+ # Resources
- dir = "Resources/Bitmaps"
+ # ("Resources/Locale", "Resources/Locale/*/LC_MESSAGES/*.mo")
- bitmaps = []
+ for d, pattern in [("Resources/Bitmaps", "Resources/Bitmaps/*.xpm"),
- for file in os.listdir(os.path.join("Resources", "Bitmaps")):
+                    ("Resources/Projections", "Resources/Projections/*.proj"),
-     if string.lower(file[-4:]) == ".xpm":
+                    ("Resources/XML", "Resources/XML/*.dtd")]:
-         bitmaps.append(dir + '/' +  file)
+     data_files.append((d, glob.glob(pattern)))
- data_files.append((dir, bitmaps))
  #
  #       Command definitions
-Line 417 
 class InstallLocal(Command):
+Line 452 
 class InstallLocal(Command):
      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 442 
 class InstallLocal(Command):
+Line 489 
 class InstallLocal(Command):
          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 468 
 class thuban_build_py(build_py):
+Line 523 
 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 519 
 class thuban_build_py(build_py):
+Line 579 
 class thuban_build_py(build_py):
          return modules
- thubaninit_contents = """
+ 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
-Line 531 
 import thubaninit
+Line 591 
 import thubaninit
  import Thuban
  '''
  import sys, os
- sys.path.insert(0, %(thubandir)s)
+ """
+ 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
-Line 542 
 if os.path.isdir(dir):
+Line 606 
 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 560 
 class ThubanInstall(install):
+Line 638 
 class ThubanInstall(install):
                           ("extra-files", None,
                            "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"
-Line 569 
 class ThubanInstall(install):
+Line 647 
 class ThubanInstall(install):
                           ("init-module-dir=", None,
                            "Directory in which to create the init module."
                            " Defaults to Python's site-packages directory."),
                           ])
      boolean_options = install.boolean_options[:]
-Line 634 
 class ThubanInstall(install):
+Line 711 
 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 654 
 class ThubanInstall(install):
+Line 731 
 class ThubanInstall(install):
              initfilename = self.thuban_init_filename()
              if self.root:
                  initfilename = change_root(self.root, initfilename)
-             contents = thubaninit_contents % {
+             contents = thubaninit_contents(self.install_lib_orig)
-                 "thubandir": repr(self.install_lib_orig)
-                 }
              self.mkpath(os.path.dirname(initfilename))
-             self.execute(write_file, (initfilename, split(contents, "\n")),
+             self.execute(write_file, (initfilename, contents),
                           "Create %s" % initfilename)
      def link_file(self, src, dest):
-Line 713 
 cp extensions/pyshapelib/{COPYING,COPYIN
+Line 788 
 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"""
-Line 736 
 class thuban_bdist_rpm(bdist_rpm):
+Line 815 
 class thuban_bdist_rpm(bdist_rpm):
          # 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)
-Line 743 
 class thuban_bdist_rpm(bdist_rpm):
+Line 823 
 class thuban_bdist_rpm(bdist_rpm):
          # 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)
+         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)
-Line 830 
 class bdist_inno(Command):
+Line 915 
 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 852 
 class bdist_inno(Command):
+Line 938 
 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 918 
 class bdist_inno(Command):
+Line 1004 
 class bdist_inno(Command):
              line = 'Name: "{group}\\%s"; Filename: "%s";' \
                     % (icon.title, icon.install_name)
              iss.append(line)
          return iss
-Line 934 
 class InnoIconItem:
+Line 1020 
 class InnoIconItem:
          else:
              self.install_name = filename
  class thuban_bdist_inno(bdist_inno):
      """Thuban specific Inno Setup stuff"""
-Line 942 
 class thuban_bdist_inno(bdist_inno):
+Line 1028 
 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"],
-Line 949 
 class thuban_bdist_inno(bdist_inno):
+Line 1037 
 class thuban_bdist_inno(bdist_inno):
          # 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 = 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.1.3cvs",
+       version = "0.8.1",
        description = "Geographic data viewer",
        long_description = long_description,
        licence = "GPL",
-Line 1004 
 setup(name = "Thuban",
+Line 1139 
 setup(name = "Thuban",
                    "install": ThubanInstall,
                    "bdist_rpm": thuban_bdist_rpm,
                    "bdist_inno": thuban_bdist_inno,
-                   "data_dist": data_dist
+                   "data_dist": data_dist,
+                   "build_docs": thuban_build_docs,
+                   "build_ext": thuban_build_ext
                    })

 Legend:



Removed from v.212
 


changed lines


 
Added in v.1316
 Legend:



Removed from v.212
 


changed lines


 
Added in v.1316
-Removed from v.212
+Added in v.1316

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26