mirror of
https://gitlab.com/openlp/packaging.git
synced 2024-12-22 04:52:50 +00:00
Make WiX export to the base 'dist' directory
This commit is contained in:
parent
965b779dbb
commit
e354f0304a
@ -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',
|
||||
|
Loading…
Reference in New Issue
Block a user