GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix WiX complains that @Action is deprecated

Browse Source
This commit is contained in:
Bryan W. Weber
2014-08-28 22:06:09 +00:00
parent 73fa1a17a0
commit 671d6eb576
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
site_scons/wxsgen.py
View File

@@ -144,9 +144,10 @@ class WxsGenerator(object):
matlab_dir = self.addDirectoryContents('matlab', instdir, matlab)
# Registry entries
reg_key = self.addRegistryKey(core, product, Id='CanteraRegRoot', Root='HKLM',
Key='Software\\Cantera\\Cantera 2.2',
Action='createAndRemoveOnUninstall')
reg_options = dict(ForceCreateOnInstall="yes", ForceDeleteOnUninstall="yes",
Id='CanteraRegRoot', Root='HKLM',
Key='Software\\Cantera\\Cantera 2.2')
reg_key = self.addRegistryKey(core, product, options=reg_options)
et.SubElement(reg_key, 'RegistryValue', dict(Type='string',
Name='InstallDir',
Value='[INSTALLDIR]'))
@@ -166,14 +167,13 @@ class WxsGenerator(object):
tree = et.ElementTree(wix)
tree.write(outFile)
def addRegistryKey(self, feature, parent, Id, Root, Key, Action):
def addRegistryKey(self, feature, parent, options):
Id = options['Id']
guid = str(uuid.uuid5(self.CANTERA_UUID, Id))
fields = {'Win64': 'yes'} if self.x64 else {}
dr = et.SubElement(parent, "DirectoryRef", dict(Id="TARGETDIR"))
c = et.SubElement(dr, "Component",
dict(Id=Id, Guid=guid, **fields))
r = et.SubElement(c, "RegistryKey", dict(Id=Id, Root=Root, Key=Key, Action=Action))
c = et.SubElement(dr, "Component", dict(Id=Id, Guid=guid, **fields))
r = et.SubElement(c, "RegistryKey", options)
et.SubElement(feature, 'ComponentRef', dict(Id=Id))
return r