[Python-checkins] python/nondist/sandbox/msi msi.py,1.19,1.20

Sun Aug 1 12:03:18 CEST 2004

Update of /cvsroot/python/python/nondist/sandbox/msi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24807
Modified Files:
	msi.py 
Log Message:
Rename alpha to snapshot.
Index: msi.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msi.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** msi.py	1 Aug 2004 10:02:14 -0000	1.19
--- msi.py	1 Aug 2004 10:03:15 -0000	1.20
***************
*** 14,18 ****
 # 0 for beta or final releases;
 # 1 means to use a new product code for each package
! alpha = 1
 # 1 means that file extension is px, not py,
 # and binaries start with x
--- 14,18 ----
 # 0 for beta or final releases;
 # 1 means to use a new product code for each package
! snapshot = 1
 # 1 means that file extension is px, not py,
 # and binaries start with x
***************
*** 22,26 ****
 # Text to be displayed as the version in dialogs etc.
 # goes into file name and ProductCode. Defaults to
! # current_version.day for Alpha, current_version otherwise
 full_current_version = None
 
--- 22,26 ----
 # Text to be displayed as the version in dialogs etc.
 # goes into file name and ProductCode. Defaults to
! # current_version.day for Snapshot, current_version otherwise
 full_current_version = None
 
***************
*** 36,40 ****
 # used in the Upgrade table of future packages to make the future
 # package replace this one. See "UpgradeCode Property".
! upgrade_code_alpha='{92A24481-3ECB-40FC-8836-04B7966EC0D5}'
 upgrade_code='{65E6DE48-A358-434D-AA4F-4AF72DB4718F}'
 
--- 36,40 ----
 # used in the Upgrade table of future packages to make the future
 # package replace this one. See "UpgradeCode Property".
! upgrade_code_snapshot='{92A24481-3ECB-40FC-8836-04B7966EC0D5}'
 upgrade_code='{65E6DE48-A358-434D-AA4F-4AF72DB4718F}'
 
***************
*** 44,48 ****
 # components. See "Changing the Product Code". As we change the
 # component codes with every build, we need a new product code
! # each time. For intermediate (alpha) releases, they are automatically
 # generated. For official releases, we record the product codes,
 # so people can refer to them.
--- 44,48 ----
 # components. See "Changing the Product Code". As we change the
 # component codes with every build, we need a new product code
! # each time. For intermediate (snapshot) releases, they are automatically
 # generated. For official releases, we record the product codes,
 # so people can refer to them.
***************
*** 54,58 ****
 product_code = product_codes[current_version]
 
! if alpha:
 release = int(time.time()/3600/24)
 product_code = msilib.gen_uuid()
--- 54,58 ----
 product_code = product_codes[current_version]
 
! if snapshot:
 release = int(time.time()/3600/24)
 product_code = msilib.gen_uuid()
***************
*** 84,88 ****
 
 if full_current_version is None:
! if alpha:
 full_current_version = "%s.%d" % (current_version, release)
 else:
--- 84,88 ----
 
 if full_current_version is None:
! if snapshot:
 full_current_version = "%s.%d" % (current_version, release)
 else:
***************
*** 106,112 ****
 """Generate an empty database, with just the schema and the
 Summary information stream."""
! if alpha:
 cv = "%s.%s.%s" % (major, minor, release)
! uc = upgrade_code_alpha
 else:
 cv = current_version
--- 106,112 ----
 """Generate an empty database, with just the schema and the
 Summary information stream."""
! if snapshot:
 cv = "%s.%s.%s" % (major, minor, release)
! uc = upgrade_code_snapshot
 else:
 cv = current_version
***************
*** 141,162 ****
 migrate_features = 1
 # See "Upgrade Table". We remove releases with the same major and
! # minor version. For an alpha, we remove all earlier alphas. For
! # a release, we remove all alphas, and all earlier releases.
! if alpha:
 add_data(db, "Upgrade",
! [(upgrade_code_alpha, start, 
 "%s.%s.%s" % (major, minor, release),
 None, # Ignore language
 migrate_features, 
 None, # Migrate ALL features
! "REMOVEOLDALPHA")])
! props = "REMOVEOLDALPHA"
 else:
 add_data(db, "Upgrade",
 [(upgrade_code, start, current_version,
 None, migrate_features, None, "REMOVEOLDVERSION"),
! (upgrade_code_alpha, start, "%s.%s.0" % (major, minor+1),
! None, migrate_features, None, "REMOVEOLDALPHA")])
! props = "REMOVEOLDALPHA;REMOVEOLDVERSION"
 # Installer collects the product codes of the earlier releases in
 # these properties. In order to allow modification of the properties,
--- 141,162 ----
 migrate_features = 1
 # See "Upgrade Table". We remove releases with the same major and
! # minor version. For an snapshot, we remove all earlier snapshots. For
! # a release, we remove all snapshots, and all earlier releases.
! if snapshot:
 add_data(db, "Upgrade",
! [(upgrade_code_snapshot, start, 
 "%s.%s.%s" % (major, minor, release),
 None, # Ignore language
 migrate_features, 
 None, # Migrate ALL features
! "REMOVEOLDSNAPSHOT")])
! props = "REMOVEOLDSNAPSHOT"
 else:
 add_data(db, "Upgrade",
 [(upgrade_code, start, current_version,
 None, migrate_features, None, "REMOVEOLDVERSION"),
! (upgrade_code_snapshot, start, "%s.%s.0" % (major, minor+1),
! None, migrate_features, None, "REMOVEOLDSNAPSHOT")])
! props = "REMOVEOLDSNAPSHOT;REMOVEOLDVERSION"
 # Installer collects the product codes of the earlier releases in
 # these properties. In order to allow modification of the properties,