lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-22 05:35:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch installer custom action from jscript to vbscript

Browse Source 
* MS has deleted vbscript because breaking things is fun, so we use jscript
  instead to do the weird replace of '#' so that numbers read from the registry
  can be compared to numbers
This commit is contained in:
baldurk
2025-01-14 17:54:54 +00:00
parent 6feafaf74e
commit 4f91478f43
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/installer/Installer32.wxs
+3 -3
View File
@@ -341,10 +341,10 @@
</Property>
<!-- the versions are stored in DWORDs which windows installer returns as #14 etc. We need to strip the # to actually compare :( -->
<CustomAction Id="RemoveHash" Script="vbscript">
<CustomAction Id="RemoveHash" Script="jscript">
<![CDATA[
Session.Property("VCRT32MAJOR") = Replace(Session.Property("VCRT32MAJOR"),"#","")
Session.Property("VCRT32MINOR") = Replace(Session.Property("VCRT32MINOR"),"#","")
Session.Property("VCRT32MAJOR") = Session.Property("VCRT32MAJOR").replace("#","")
Session.Property("VCRT32MINOR") = Session.Property("VCRT32MINOR").replace("#","")
]]>
</CustomAction>
util/installer/Installer64.wxs
+5 -5
View File
@@ -397,12 +397,12 @@
</Property>
<!-- the versions are stored in DWORDs which windows installer returns as #14 etc. We need to strip the # to actually compare :( -->
<CustomAction Id="RemoveHash" Script="vbscript">
<CustomAction Id="RemoveHash" Script="jscript">
<![CDATA[
Session.Property("VCRT64MAJOR") = Replace(Session.Property("VCRT64MAJOR"),"#","")
Session.Property("VCRT64MINOR") = Replace(Session.Property("VCRT64MINOR"),"#","")
Session.Property("VCRT32MAJOR") = Replace(Session.Property("VCRT32MAJOR"),"#","")
Session.Property("VCRT32MINOR") = Replace(Session.Property("VCRT32MINOR"),"#","")
Session.Property("VCRT64MAJOR") = Session.Property("VCRT64MAJOR").replace("#","")
Session.Property("VCRT64MINOR") = Session.Property("VCRT64MINOR").replace("#","")
Session.Property("VCRT32MAJOR") = Session.Property("VCRT32MAJOR").replace("#","")
Session.Property("VCRT32MINOR") = Session.Property("VCRT32MINOR").replace("#","")
]]>
</CustomAction>