From ee66b9deb1b3396d1522cf6e1ca7beb822be2016 Mon Sep 17 00:00:00 2001 From: Athanasius Date: Tue, 7 Dec 2021 17:16:21 +0000 Subject: [PATCH] WiX: Move EDMarketConnector.wixobj to root directory * Don't specify its generation inside dist.win32/ * Specify `-b dist.win32\` to light.exe invocation Tested with installing resultant .msi over 5.2.3. --- setup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index ba88ce7c..8bb8fb30 100755 --- a/setup.py +++ b/setup.py @@ -383,13 +383,13 @@ elif sys.platform == 'win32': xml_declaration=True ) - os.system(rf'"{WIXPATH}\candle.exe" -out {dist_dir}\ {appname}.wxs') + os.system(rf'"{WIXPATH}\candle.exe" {appname}.wxs') - if not exists(f'{dist_dir}/{appname}.wixobj'): - raise AssertionError(f'No {dist_dir}/{appname}.wixobj: candle.exe failed?') + if not exists(f'{appname}.wixobj'): + raise AssertionError(f'No {appname}.wixobj: candle.exe failed?') package_filename = f'{appname}_win_{appversion_nobuild()}.msi' - os.system(rf'"{WIXPATH}\light.exe" -sacl -spdb -sw1076 {dist_dir}\{appname}.wixobj -out {package_filename}') + os.system(rf'"{WIXPATH}\light.exe" -b {dist_dir}\ -sacl -spdb -sw1076 {appname}.wixobj -out {package_filename}') if not exists(package_filename): raise AssertionError(f'light.exe failed, no {package_filename}')