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

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

Parent Directory | Revision Log | View Patch Patch

-revision 90 by bh,
Thu Apr  4 14:55:02 2002 UTC
+revision 532 by jonathan,
Fri Mar 14 11:31:24 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 18 
 __version__ = "$Revision$"
  import os
  from types import TupleType
  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.file_util import write_file
 Line 43 
 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 independend 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"
-Line 72 
 elif os.name == "nt":
+Line 80 
 elif os.name == "nt":
      proj4_lib = "proj_i"
      # Define include and lib directories for wxWindows and
-     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")]
      #
-     # 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 86 
 elif os.name == "nt":
+Line 96 
 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 111 
 elif os.name == "nt":
+Line 129 
 elif os.name == "nt":
                  ('WXP_USE_THREAD', '1'),
                  ]
-     wx_incdirs = [wx_inc]
+     wx_incdirs = wx_inc
-     wx_libdirs = [wx_lib]
+     wx_libdirs = wx_lib
-     wx_libs = ["wx23_1h"]
+     wx_libs = ["wxmsw24h"]
      wx_libs = wx_libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
                           'winspool', 'winmm', 'shell32', 'oldnames',
                           'comctl32', 'ctl3d32', 'odbc32', 'ole32', 'oleaut32',
-Line 200 
 py_modules = []
+Line 219 
 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/"]
+                                             + wx_incdirs),
                              define_macros = wx_defs,
                              library_dirs = [proj4_libdir] + wx_libdirs,
                              libraries = [proj4_lib] + wx_libs))
-Line 213 
 extensions.append(Extension("Lib.wxproj"
+Line 233 
 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 396 
 class InstallLocal(Command):
+Line 420 
 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 421 
 class InstallLocal(Command):
+Line 457 
 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 447 
 class thuban_build_py(build_py):
+Line 491 
 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 498 
 class thuban_build_py(build_py):
+Line 547 
 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 514 
 class ThubanInstall(install):
+Line 604 
 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"),
+                          ("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 534 
 class ThubanInstall(install):
+Line 638 
 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 542 
 class ThubanInstall(install):
+Line 679 
 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 557 
 class ThubanInstall(install):
+Line 694 
 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 571 
 class ThubanInstall(install):
+Line 718 
 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 586 
 class ThubanInstall(install):
+Line 738 
 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 596 
 cp extensions/pyshapelib/{COPYING,COPYIN
+Line 756 
 cp extensions/pyshapelib/{COPYING,COPYIN
  cp extensions/pyprojection/{LICENSE,LICENSE.pyprojection}
  '''
+ 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"""
+     user_options = bdist_rpm.user_options[:]
+     user_options.extend([("prefix=", None, "Install prefix for the RPM"),
+                          ])
      def initialize_options(self):
-         # create the prep script for the spec-file
+         # per default, RPMs are installed in /usr
-         open("bdist_rpm_prep", "w").write(bdist_rpm_prep_script)
+         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_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)
+         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 710 
 class bdist_inno(Command):
+Line 895 
 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 776 
 class bdist_inno(Command):
+Line 961 
 class bdist_inno(Command):
              line = 'Name: "{group}\\%s"; Filename: "%s";' \
                     % (icon.title, icon.install_name)
              iss.append(line)
          return iss
-Line 792 
 class InnoIconItem:
+Line 977 
 class InnoIconItem:
          else:
              self.install_name = filename
  class thuban_bdist_inno(bdist_inno):
      """Thuban specific Inno Setup stuff"""
-Line 808 
 class thuban_bdist_inno(bdist_inno):
+Line 993 
 class thuban_bdist_inno(bdist_inno):
          # that we can generate the iss-file even on Linux
          install_options["do_symlink"] = 0
          bdist_inno.run(self, install_options)
  #
  #   Run the script
  #
-Line 820 
 Thuban is a viewer for geographic data w
+Line 1005 
 Thuban is a viewer for geographic data w
  """
  setup(name = "Thuban",
-       version = "0.1.1",
+       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 840 
 setup(name = "Thuban",
+Line 1025 
 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

 Legend:



Removed from v.90
 


changed lines


 
Added in v.532
 Legend:



Removed from v.90
 


changed lines


 
Added in v.532
-Removed from v.90
+Added in v.532

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26