[Python-checkins] python/nondist/sandbox/msi msi.py,1.16,1.17

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/msi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15666

Modified Files:
	msi.py 
Log Message:
Put python24.dll into a separate component, so it can be 
removed independently from msvcr71. Also version it in the file table, 
so it overwrites older versions. Fixes #990945.

Index: msi.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msi.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** msi.py	23 Jul 2004 16:54:01 -0000	1.16
--- msi.py	25 Jul 2004 10:19:36 -0000	1.17
***************
*** 616,624 ****
  
      dlldir = Directory(db, cab, root, srcdir, "DLLDIR", ".")
!     dlldir.start_component("DLLDIR", flags = 8, 
!            keyfile="python%s%s.dll" % (major, minor))
!     dlldir.add_file("PCBuild/python%s%s.dll" % (major, minor))
      # XXX determine dependencies
      version, lang = extract_msvcr71()
      dlldir.add_file("msvcr71.dll", src=os.path.abspath("msvcr71.dll"),
                      version=version, language=lang)
--- 616,629 ----
  
      dlldir = Directory(db, cab, root, srcdir, "DLLDIR", ".")
!     pydll = "python%s%s.dll" % (major, minor)
!     pydllsrc = srcdir + "/PCBuild/" + pydll
!     dlldir.start_component("DLLDIR", flags = 8, keyfile = pydll)
!     installer = msilib.MakeInstaller()
!     dlldir.add_file("PCBuild/python%s%s.dll" % (major, minor),
!                     version=installer.FileVersion(pydllsrc, 0),
!                     language=installer.FileVersion(pydllsrc, 1))
      # XXX determine dependencies
      version, lang = extract_msvcr71()
+     dlldir.start_component("msvcr71", flags=8, keyfile="msvcr71.dll")
      dlldir.add_file("msvcr71.dll", src=os.path.abspath("msvcr71.dll"),
                      version=version, language=lang)
***************
*** 647,659 ****
          if files:
              lib.remove_pyc()
! 	if dir=='test' and parent.physical=='Lib':
! 	    lib.add_file("185test.db")
! 	    lib.add_file("audiotest.au")
! 	    lib.add_file("cfgparser.1")
! 	    lib.add_file("test.xml")
! 	    lib.add_file("test.xml.out")
! 	    lib.add_file("testtar.tar")
! 	    lib.glob("*.uue")
! 	    lib.add_file("readme.txt", src="README")
          if dir=='decimaltestdata':
              lib.glob("*.decTest")
--- 652,664 ----
          if files:
              lib.remove_pyc()
!         if dir=='test' and parent.physical=='Lib':
!             lib.add_file("185test.db")
!             lib.add_file("audiotest.au")
!             lib.add_file("cfgparser.1")
!             lib.add_file("test.xml")
!             lib.add_file("test.xml.out")
!             lib.add_file("testtar.tar")
!             lib.glob("*.uue")
!             lib.add_file("readme.txt", src="README")
          if dir=='decimaltestdata':
              lib.glob("*.decTest")