openlp
/
packaging
mirror of https://gitlab.com/openlp/packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make WiX export to the base 'dist' directory

This commit is contained in:
Raoul Snyman 2019-04-10 21:41:53 -07:00
parent 965b779dbb
commit e354f0304a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builders/windows-builder.py
View File

@ -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',