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

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

Parent Directory | Revision Log | View Patch Patch

-revision 6 by bh,
Tue Aug 28 15:41:52 2001 UTC
+revision 15 by bh,
Fri Aug 31 15:35:18 2001 UTC
 Line 16 
 __version__ = "$Revision$"
  #
  import os
+ from types import TupleType
  from distutils.core import setup, Extension, Command
  from distutils.command.install import install
  from distutils.command.build_py import build_py
+ from distutils.file_util import write_file
+ from distutils.util import convert_path
  import distutils
- print distutils.__file__
  from string import split
  import string
-Line 66 
 elif os.name == "nt":
+Line 68 
 elif os.name == "nt":
      proj4_libdir =  proj4_prefix
      proj4_lib = "proj_i"
+     # Define include and lib directories for wxWindows and
+     wx_prefix = r"D:\wx230"
+     wx_inc =  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
      # shouldn't have to modify anything below here
-Line 83 
 elif os.name == "nt":
+Line 90 
 elif os.name == "nt":
      # there's no config script.
      wx_config_script = ""
-     # so we just define the flags manually
-     wx_prefix = r"D:\wx230"
-     wx_inc =  os.path.join(wx_prefix, "include")
-     wx_lib =  os.path.join(wx_prefix, "lib")
      # the values of wx_defs and wx_libs. copied from the wxPython
      # setup.py
      wx_defs = [ ('WIN32', None),        # Some of these are no longer
-Line 232 
 py_modules.append(ext_dir + "/pyprojecti
+Line 235 
 py_modules.append(ext_dir + "/pyprojecti
  data_files = []
  # bitmaps
- dir = "Resources/Bitmaps/"
+ dir = "Resources/Bitmaps"
  bitmaps = []
  for file in os.listdir(os.path.join("Resources", "Bitmaps")):
      if string.lower(file[-4:]) == ".xpm":
-         bitmaps.append(dir + file)
+         bitmaps.append(dir + '/' +  file)
  data_files.append((dir, bitmaps))
  #
-Line 259 
 class InstallLocal(Command):
+Line 262 
 class InstallLocal(Command):
          "Create some symlink so you can run thubanfrom the source directory"
      user_options = [
-         ('debug', 'g', "compile/link with debugging information"),
          ('skip-build', None, "skip the build steps"),
          ]
-Line 267 
 class InstallLocal(Command):
+Line 269 
 class InstallLocal(Command):
          self.extensions = None
          self.build_dir = None
          self.skip_build = None
-         self.debug = None
      def finalize_options (self):
          self.set_undefined_options("install",
-Line 290 
 class InstallLocal(Command):
+Line 291 
 class InstallLocal(Command):
      def link_dir(self, src, dest):
          """Create a symbolic link dest pointing to src"""
          if self.verbose:
-             print "symlinking %s -> %s" % (src, dest)
+             self.announce("symlinking %s -> %s" % (src, dest))
          if self.dry_run:
              return
-Line 309 
 class InstallLocal(Command):
+Line 310 
 class InstallLocal(Command):
  class thuban_build_py(build_py):
      """
-     A new build_py that can deal with both packages and modules in
+     A new build_py that can deal with both packages and modules in one
-     one distribution.
+     distribution.
      """
      def run(self):
-         """The same the as teh original in build_py revision 1.33 except
+         """The same the as the original in build_py revision 1.33 except
          that this allows both packages and modules to be in one
          distribution
          """
-Line 348 
 class thuban_build_py(build_py):
+Line 349 
 class thuban_build_py(build_py):
              modules.append(("Lib", module_base, module_file))
          return modules
- #
+     def find_all_modules (self):
- # Extend the standard install command to symlink the installed script to
+         # same as find_all_modules of the original build_py command
- # $prefix/bin/
+         # (rev. 1.33) but handle installations with both modules and
- #
+         # packages. Needed here so tha the get_outputs works correctly
+         modules = []
+         if self.py_modules:
+             modules.extend(self.find_modules())
+         if self.packages:
+             for package in self.packages:
+                 package_dir = self.get_package_dir(package)
+                 m = self.find_package_modules(package, package_dir)
+                 modules.extend(m)
+         return modules
  class ThubanInstall(install):
+     """
+     Thuban specific install command.
+     Extend the standard install command to symlink the installed script
+     to $prefix/bin/
+     """
+     user_options = install.user_options[:]
+     user_options.extend([("do-symlink", None,
+                           "Create a symlink to the script in <prefix>/bin."
+                         "(default on posix systems and only relevant there)"),
+                          ("extra-files", None,
+                           "List of filenames or (src, dest) pairs describing "
+                           " extra files to install "
+                           "(can only be set from witin setup.py"),
+                          ])
+     boolean_options = install.boolean_options[:]
+     boolean_options.append("do-symlink")
+     def initialize_options(self):
+         self.do_symlink = None
+         self.extra_files = []
+         install.initialize_options(self)
+     def finalize_options(self):
+         if self.do_symlink is None:
+             if os.name == "posix":
+                 self.do_symlink = 1
+             else:
+                 self.do_symlink = 0
+         install.finalize_options(self)
      def run(self):
          install.run(self)
-         if os.name == "posix":
+         for item in self.extra_files:
+             if type(item) == TupleType:
+                 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:
              scriptfile = os.path.join(self.install_scripts, "thuban.py")
              bindir = os.path.join(self.prefix, "bin")
              binfile = os.path.join(bindir, "thuban")
              self.mkpath(bindir)
              self.copy_file(scriptfile, binfile, link="sym")
+     def get_outputs (self):
+         outputs = install.get_outputs(self)
+         for item in self.extra_files:
+             if type(item) == TupleType:
+                 src, dest = item
+             else:
+                 src = dest = item
+             outputs.append(os.path.join(self.root, convert_path(dest)))
+         return outputs
+ class bdist_inno(Command):
+     """Command to create a windows installer with Inno Setup"""
+     description = "Create a windows installer with Inno Setup"
+     user_options = [
+         ('skip-build', None, "skip the build steps"),
+         ('bdist-dir=', None,
+          "temporary directory for creating the distribution"),
+         ('run-inno', None,
+          "Run inno-setup to create the installer. On by default on nt"),
+         ('iss-name', None,
+          "The name of the iss file to generate. "
+          "Shouldn't contain directories"),
+         # Parameters for the Inno Setup script
+         ('copyright', None, "Copyright notice for the Inno Setup file"),
+         ('default-dir-name', None,
+          "Default installation directory. Defaults to '{pf}\\<name>'"),
+         ('default-group-name', None,
+          "Default program group name. Defaults to <name>'"),
+         ("license-file", None, "File containing the license."),
+         ("output-basename", None,
+          "Base filename for the Inno Setup output "
+          "(defaults to <name>-<version>-<issrevision>)."),
+         ("iss-revision", None,
+          "revision of the generated installer of the package version"),
+         ("icons-entries", None,
+          "List if InnoIconItems "
+          "(this can only be set from inside the setup.py script)"),
+         ]
+     boolean_options = ["do-symlink"]
+     def initialize_options(self):
+         self.skip_build = 0
+         self.bdist_dir = None
+         self.run_inno = None
+         self.iss_name = None
+         self.copyright = ""
+         self.default_dir_name = None
+         self.default_group_name = None
+         self.license_file = None
+         self.output_basename = None
+         self.iss_revision = None
+         self.icons_entries = []
+     def finalize_options(self):
+         self.set_undefined_options("install",
+                                    ('skip_build', 'skip_build'))
+         if self.bdist_dir is None:
+             bdist_base = self.get_finalized_command('bdist').bdist_base
+             self.bdist_dir = os.path.join(bdist_base, 'inno')
+         if self.run_inno is None:
+             self.run_inno = os.name == "nt"
+         name = self.distribution.get_name()
+         if self.iss_name is None:
+             self.iss_name = name + '.iss'
+         if self.default_dir_name is None:
+             self.default_dir_name = "{pf}\\" + name
+         if self.default_group_name is None:
+             self.default_group_name = name
+         if self.iss_revision is None:
+             self.iss_revision = 0
+         if self.output_basename is None:
+             self.output_basename = "%s-%s-%d" \
+                                    % (name, self.distribution.get_version(),
+                                       self.iss_revision)
+     def run(self, install_options = None):
+         """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')
+         # Install in a temporary directory
+         install = self.reinitialize_command('install')
+         install.root = self.bdist_dir
+         if install_options is not None:
+             for key, value in install_options.items():
+                 setattr(install, key, value)
+         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()
+         install.run()
+         # Create the iss file
+         iss_file = os.path.join(self.bdist_dir, self.iss_name)
+         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])
+     def generate_iss(self):
+         """Return the contents of the iss file as list of strings, one
+         string per line"""
+         # first, turn the icons entries into a more usable form
+         icons = {}
+         for item in self.icons_entries:
+             icons[item.filename] = item
+         iss = []
+         name = self.distribution.get_name()
+         iss.extend(["[Setup]",
+                     "AppName=" + name,
+                     "AppVerName=" + name + " "+self.distribution.get_version(),
+                     "DefaultDirName=" + self.default_dir_name,
+                     "DefaultGroupName=" + self.default_group_name,
+                     ])
+         if self.copyright:
+             iss.append("AppCopyright=" + self.copyright)
+         if self.license_file:
+             iss.append("LicenseFile=" + self.license_file)
+         iss.append("OutputBasefilename=" + self.output_basename)
+         iss.append("")
+         iss.append("[Files]")
+         install = self.get_finalized_command("install")
+         install_scripts = self.get_finalized_command("install_scripts")
+         script_files = install_scripts.get_outputs()
+         prefixlen = len(self.bdist_dir) + len(os.sep)
+         for filename in install.get_outputs():
+             filename = filename[prefixlen:]
+             icon = icons.get(filename)
+             dirname = os.path.dirname(filename)
+             if os.name != "nt":
+                 # change the separators to \ on non-windos systems
+                 filename = string.join(string.split(filename, os.sep), "\\")
+                 dirname =  string.join(string.split(dirname, os.sep), "\\")
+             line = 'Source: "%s"' % filename
+             if icon is not None:
+                 # install it as defined in the icon object
+                 backslash = string.rfind(icon.install_name, "\\")
+                 if backslash >= 0:
+                     dirname = icon.install_name[:backslash]
+                     basename = icon.install_name[backslash + 1:]
+                 else:
+                     dirname = ""
+                     basename = icon.install_name
+                 line = '%s; DestDir: "%s"; DestName: "%s"' % (line, dirname,
+                                                               basename)
+             else:
+                 line = line + '; DestDir: "{app}\\%s"' % (dirname)
+             iss.append(line)
+         iss.append("")
+         iss.append("[Icons]")
+         for icon in self.icons_entries:
+             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"""
+     def __init__(self, filename, title, install_name = None):
+         self.filename = filename
+         self.title = title
+         if install_name is not None:
+             self.install_name = install_name
+         else:
+             self.install_name = filename
+ class thuban_bdist_inno(bdist_inno):
+     """Thuban specific Inno Setup stuff"""
+     def run(self):
+         install_options = {
+             "prefix": ".",
+             "install_scripts": "$base",
+             "warn_dir": 0,
+             "extra_files": ["COPYING", "Lib/proj.dll"],
+             }
+         bdist_inno.run(self, install_options)
+ #
+ #   Run the script
+ #
  long_description = """\
  Thuban is a viewer for geographic data written in Python
  """
- setup(name = "thuban",
+ setup(name = "Thuban",
        version = "0.0.3",
        description = "Geographic data viewer",
        long_description = long_description,
-Line 392 
 setup(name = "thuban",
+Line 662 
 setup(name = "thuban",
                    # same directory.
                    "install_lib": "$base/thuban",
                    "install_scripts": "$base/thuban",
-                   "install_data": "$base/thuban/",
+                   "install_data": "$base/thuban",
                    # Don't print warning messages about the lib dir not
                    # being on Python's path. The libraries are Thuban
                    # specific and are installed just for Thuban. They'll
                    # be automatically on Python's path when Thuban is run
                    "warn_dir": 0,
-                   }},
+                   },
+                  "bdist_inno":
+                  {"icons_entries": [InnoIconItem(".\\thuban.py",
+                                                  "Start Thuban",
+                                                  "{app}\\thuban.pyw")],
+                   "license_file": "COPYING",
+                   }
+                  },
        cmdclass = {"build_py": thuban_build_py,
                    "install_local": InstallLocal,
-                   "install": ThubanInstall})
+                   "install": ThubanInstall,
+                   "bdist_inno": thuban_bdist_inno
+                   })

 Legend:



Removed from v.6
 


changed lines


 
Added in v.15
 Legend:



Removed from v.6
 


changed lines


 
Added in v.15
-Removed from v.6
+Added in v.15

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26