*** msi.py	Thu Mar 13 01:27:09 2008
--- msi_new.py	Mon Mar 17 23:52:45 2008
***************
*** 863,872 ****
  # See "File Table", "Component Table", "Directory Table",
  # "FeatureComponents Table"
  def add_files(db):
!     cab = CAB("python")
      tmpfiles = []
      # Add all executables, icons, text files into the TARGETDIR component
!     root = PyDirectory(db, cab, None, srcdir, "TARGETDIR", "SourceDir")
      default_feature.set_current()
      if not msilib.Win64:
          root.add_file("%s/w9xpopen.exe" % PCBUILD)
--- 863,872 ----
  # See "File Table", "Component Table", "Directory Table",
  # "FeatureComponents Table"
  def add_files(db):
!     cab = CAB("python", db)
      tmpfiles = []
      # Add all executables, icons, text files into the TARGETDIR component
!     root = PyDirectory(db, cab, None, srcdir, "TARGETDIR", "SourceDir", add_num=False)
      default_feature.set_current()
      if not msilib.Win64:
          root.add_file("%s/w9xpopen.exe" % PCBUILD)
***************
*** 879,885 ****
      root.add_file("%s/pythonw.exe" % PCBUILD)
  
      # msidbComponentAttributesSharedDllRefCount = 8, see "Component Table"
!     #dlldir = PyDirectory(db, cab, root, srcdir, "DLLDIR", ".")
      #install python30.dll into root dir for now
      dlldir = root
  
--- 879,885 ----
      root.add_file("%s/pythonw.exe" % PCBUILD)
  
      # msidbComponentAttributesSharedDllRefCount = 8, see "Component Table"
!     #dlldir = PyDirectory(db, cab, root, srcdir, "DLLDIR", ".", add_num=False)
      #install python30.dll into root dir for now
      dlldir = root
  
***************
*** 895,901 ****
      dlldir.add_file("%s/python%s%s.dll" % (PCBUILD, major, minor),
                      version=pyversion,
                      language=installer.FileVersion(pydllsrc, 1))
!     DLLs = PyDirectory(db, cab, root, srcdir + "/" + PCBUILD, "DLLs", "DLLS|DLLs")
      # XXX determine dependencies
      if MSVCR == "90":
          root.start_component("msvcr90")
--- 895,901 ----
      dlldir.add_file("%s/python%s%s.dll" % (PCBUILD, major, minor),
                      version=pyversion,
                      language=installer.FileVersion(pydllsrc, 1))
!     DLLs = PyDirectory(db, cab, root, srcdir + "/" + PCBUILD, "DLLs", "DLLS|DLLs", add_num=False)
      # XXX determine dependencies
      if MSVCR == "90":
          root.start_component("msvcr90")
***************
*** 1044,1054 ****
  
      # Add headers
      default_feature.set_current()
!     lib = PyDirectory(db, cab, root, "include", "include", "INCLUDE|include")
      lib.glob("*.h")
      lib.add_file("pyconfig.h", src="../PC/pyconfig.h")
      # Add import libraries
!     lib = PyDirectory(db, cab, root, PCBUILD, "libs", "LIBS|libs")
      for f in dlls:
          lib.add_file(f.replace('pyd','lib'))
      lib.add_file('python%s%s.lib' % (major, minor))
--- 1044,1054 ----
  
      # Add headers
      default_feature.set_current()
!     lib = PyDirectory(db, cab, root, "include", "include", "INCLUDE|include", add_num=False)
      lib.glob("*.h")
      lib.add_file("pyconfig.h", src="../PC/pyconfig.h")
      # Add import libraries
!     lib = PyDirectory(db, cab, root, PCBUILD, "libs", "LIBS|libs", add_num=False)
      for f in dlls:
          lib.add_file(f.replace('pyd','lib'))
      lib.add_file('python%s%s.lib' % (major, minor))
***************
*** 1071,1077 ****
                      lib.add_file(f)
      # Add tools
      tools.set_current()
!     tooldir = PyDirectory(db, cab, root, "Tools", "Tools", "TOOLS|Tools")
      for f in ['i18n', 'pynche', 'Scripts', 'versioncheck', 'webchecker']:
          lib = PyDirectory(db, cab, tooldir, f, f, "%s|%s" % (tooldir.make_short(f), f))
          lib.glob("*.py")
--- 1071,1077 ----
                      lib.add_file(f)
      # Add tools
      tools.set_current()
!     tooldir = PyDirectory(db, cab, root, "Tools", "Tools", "TOOLS|Tools",add_num=False)
      for f in ['i18n', 'pynche', 'Scripts', 'versioncheck', 'webchecker']:
          lib = PyDirectory(db, cab, tooldir, f, f, "%s|%s" % (tooldir.make_short(f), f))
          lib.glob("*.py")
***************
*** 1093,1099 ****
      lib.start_component("documentation", keyfile="Python%s%s.chm" % (major,minor))
      lib.add_file("Python%s%s.chm" % (major, minor), src="build/htmlhelp/pydoc.chm")
  
!     cab.commit(db)
  
      for f in tmpfiles:
          os.unlink(f)
--- 1093,1099 ----
      lib.start_component("documentation", keyfile="Python%s%s.chm" % (major,minor))
      lib.add_file("Python%s%s.chm" % (major, minor), src="build/htmlhelp/pydoc.chm")
  
!     cab.commit()
  
      for f in tmpfiles:
          os.unlink(f)