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

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

Parent Directory | Revision Log | View Patch Patch

-revision 209 by bh,
Tue Jul  9 16:17:32 2002 UTC
+revision 555 by jonathan,
Tue Mar 25 16:21:23 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 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
 Line 54 
 if os.name == "posix":
      # 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 75 
 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 89 
 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 114 
 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 404 
 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 429 
 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 455 
 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 506 
 class thuban_build_py(build_py):
+Line 547 
 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 518 
 import thubaninit
+Line 559 
 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 529 
 if os.path.isdir(dir):
+Line 574 
 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 549 
 class ThubanInstall(install):
+Line 608 
 class ThubanInstall(install):
                            " extra files to install "
                            "(can only be set from witin setup.py"),
-                          ("create-init-module", None,
+                          ("create-init-module=", None,
-                           "Create a module in the site-packages directory that"
+                           "If true, create a module in the site-packages"
-                           " tweaks sys.path to let you easily import thuban"
+                           " directory that tweaks sys.path to let you easily"
-                           " modules from outside of thuban."),
+                           " import thuban modules from outside of thuban."),
-                          ("init-module-dir", None,
+                          ("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 566 
 class ThubanInstall(install):
+Line 624 
 class ThubanInstall(install):
      def initialize_options(self):
          self.do_symlink = None
          self.extra_files = []
-         self.create_init_module = 1
+         # 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)
-Line 618 
 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 638 
 class ThubanInstall(install):
+Line 699 
 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 697 
 cp extensions/pyshapelib/{COPYING,COPYIN
+Line 756 
 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 720 
 class thuban_bdist_rpm(bdist_rpm):
+Line 783 
 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 727 
 class thuban_bdist_rpm(bdist_rpm):
+Line 791 
 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 814 
 class bdist_inno(Command):
+Line 883 
 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 836 
 class bdist_inno(Command):
+Line 906 
 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 902 
 class bdist_inno(Command):
+Line 972 
 class bdist_inno(Command):
              line = 'Name: "{group}\\%s"; Filename: "%s";' \
                     % (icon.title, icon.install_name)
              iss.append(line)
          return iss
-Line 918 
 class InnoIconItem:
+Line 988 
 class InnoIconItem:
          else:
              self.install_name = filename
  class thuban_bdist_inno(bdist_inno):
      """Thuban specific Inno Setup stuff"""
-Line 926 
 class thuban_bdist_inno(bdist_inno):
+Line 996 
 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 933 
 class thuban_bdist_inno(bdist_inno):
+Line 1005 
 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"])
  #
  #   Run the script
  #
-Line 946 
 Thuban is a viewer for geographic data w
+Line 1033 
 Thuban is a viewer for geographic data w
  """
  setup(name = "Thuban",
-       version = "0.1.2",
+       version = "0.2.0",
        description = "Geographic data viewer",
        long_description = long_description,
        licence = "GPL",
-Line 988 
 setup(name = "Thuban",
+Line 1075 
 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
                    })

 Legend:



Removed from v.209
 


changed lines


 
Added in v.555
 Legend:



Removed from v.209
 


changed lines


 
Added in v.555
-Removed from v.209
+Added in v.555

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26