[SCons] Update version information for Windows installer

This commit is contained in:
Ray Speth 2013-09-01 00:33:43 +00:00
parent fc878f09fd
commit 9f90edc313

View file

@ -12,11 +12,11 @@ class WxsGenerator(object):
if self.x64:
self.CANTERA_UUID = uuid.UUID('F707EB9E-3723-11E1-A99F-525400631BAF')
self.pfilesName = 'ProgramFiles64Folder'
self.productName = 'Cantera 2.0 (64-bit)'
self.productName = 'Cantera 2.1 (64-bit)'
else:
self.CANTERA_UUID = uuid.UUID('1B36CAF0-279D-11E1-8979-001FBC085391')
self.pfilesName = 'ProgramFilesFolder'
self.productName = 'Cantera 2.0 (32-bit)'
self.productName = 'Cantera 2.1 (32-bit)'
def Directory(self, parent, Id, Name):
return et.SubElement(parent, 'Directory',
@ -76,14 +76,14 @@ class WxsGenerator(object):
UpgradeCode='2340BEE1-279D-11E1-A4AA-001FBC085391',
Language='1033',
Codepage='1252',
Version='2.0.1',
Version='2.1.0',
Manufacturer='Cantera Developers'))
fields = {'Platform': 'x64'} if self.x64 else {}
package = et.SubElement(product, "Package",
dict(Id='*',
Keywords='Installer',
Description="Cantera 2.0 Installer",
Description="Cantera 2.1 Installer",
InstallerVersion='310',
Languages='1033',
Compressed='yes',
@ -145,7 +145,7 @@ class WxsGenerator(object):
# Registry entries
reg_key = self.addRegistryKey(core, product, Id='CanteraRegRoot', Root='HKLM',
Key='Software\\Cantera\\Cantera 2.0',
Key='Software\\Cantera\\Cantera 2.1',
Action='createAndRemoveOnUninstall')
et.SubElement(reg_key, 'RegistryValue', dict(Type='string',
Name='InstallDir',