msicreator: fix hardcoded wix toolset path
On a Windows Server, the following installation procedure has the toolset end up below the x86 program dir: * % powershell Install-WindowsFeature Net-Framework-Core * % choco install -y wixtoolset Change-Id: I5e416cd24f51ae84cb0e6ef99b8a962355fb2b22 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150828 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
This commit is contained in:
@@ -571,7 +571,7 @@ class PackageGenerator:
|
||||
})
|
||||
|
||||
def build_package(self):
|
||||
wixdir = 'c:\\Program Files\\Wix Toolset v3.11\\bin'
|
||||
wixdir = 'c:\\Program Files (x86)\\Wix Toolset v3.11\\bin'
|
||||
if platform.system() != "Windows":
|
||||
wixdir = '/usr/bin'
|
||||
if not os.path.isdir(wixdir):
|
||||
|
||||
Reference in New Issue
Block a user