msicreator/createmsi.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ca45f6efc2e9250daee8e94f8408fe4abba4a7ba
Author: Thorsten Behrens <thorsten.behr...@allotropia.de>
AuthorDate: Sun Apr 23 16:34:32 2023 +0200
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Apr 28 11:22:44 2023 +0200
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.behr...@allotropia.de>
diff --git a/msicreator/createmsi.py b/msicreator/createmsi.py
index 3a25c56c266e..23ae885906ff 100644
--- a/msicreator/createmsi.py
+++ b/msicreator/createmsi.py
@@ -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):
