[Python-checkins] python/nondist/sandbox/msi msi.py, 1.17, 1.18 msilib.py, 1.8, 1.9

[loewis at users.sourceforge.net]

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

Modified Files:
	msi.py msilib.py 
Log Message:
Succeed even if Tcl is missing.
Fix Itanium build.

Index: msi.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msi.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** msi.py	25 Jul 2004 10:19:36 -0000	1.17
--- msi.py	27 Jul 2004 16:36:21 -0000	1.18
***************
*** 729,732 ****
--- 729,734 ----
          parent, phys, dir = tcldirs.pop()
          lib = Directory(db, cab, parent, phys, dir, "%s|%s" % (parent.make_short(dir), dir))
+         if not os.path.exists(lib.absolute):
+             continue
          for f in os.listdir(lib.absolute):
              if os.path.isdir(os.path.join(lib.absolute, f)):

Index: msilib.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msilib.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** msilib.py	20 Jul 2004 08:52:48 -0000	1.8
--- msilib.py	27 Jul 2004 16:36:21 -0000	1.9
***************
*** 294,298 ****
      si.SetProperty(PID_SUBJECT, ProductName)
      si.SetProperty(PID_AUTHOR, Manufacturer)
!     si.SetProperty(PID_TEMPLATE, "Intel;1033")
      si.SetProperty(PID_REVNUMBER, ProductCode) # XXX should be package code
      si.SetProperty(PID_WORDCOUNT, 2) # long file names, compressed, original media
--- 294,301 ----
      si.SetProperty(PID_SUBJECT, ProductName)
      si.SetProperty(PID_AUTHOR, Manufacturer)
!     if Win64:
!         si.SetProperty(PID_TEMPLATE, "Intel64;1033")
!     else:
!         si.SetProperty(PID_TEMPLATE, "Intel;1033")
      si.SetProperty(PID_REVNUMBER, ProductCode) # XXX should be package code
      si.SetProperty(PID_WORDCOUNT, 2) # long file names, compressed, original media