From e354f0304a2bc043e6c2974614df58a3a27cff58 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Wed, 10 Apr 2019 21:41:53 -0700 Subject: [PATCH] Make WiX export to the base 'dist' directory --- builders/windows-builder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index cb5b9fa..e254570 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -200,12 +200,12 @@ class WindowsBuilder(Builder): Run the WiX toolset to create an installer """ self._print('Running WiX tools...') - msi_file = os.path.join(self.dist_path, 'OpenLP-{}.msi'.format(self.version)) + msi_file = os.path.abspath(os.path.join(self.dist_path, '..', 'OpenLP-{}.msi'.format(self.version))) if os.path.exists(msi_file): self._print_verbose('Removing old MSI file') os.unlink(msi_file) config_dir = os.path.dirname(self.config_path) - os.chdir(self.dist_path) + os.chdir(os.path.abspath(os.path.join(self.dist_path, '..'))) self._run_command([self.candle_exe, '-ext', 'WiXUtilExtension', os.path.join(config_dir, 'OpenLP.wxs')], 'Error running WiX tool: candle') self._run_command([self.light_exe, '-ext', 'WiXUtilExtension', '-ext', 'WixUIExtension', 'OpenLP.wixobj',