openlp/packaging
1
0
Fork 0
mirror of https://gitlab.com/openlp/packaging.git synced 2024-12-22 21:12:50 +00:00
Code Issues Projects Releases Wiki Activity

Check for msi to exist before trying to delete it.

Browse Source
This commit is contained in:
Tomas Groth 2019-04-10 21:17:39 +02:00
parent 52a9793686
commit 65082417e4
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builders/windows-builder.py
View File

@ -195,7 +195,7 @@ class WindowsBuilder(Builder):
""" """
self._print('Running WiX tools...') self._print('Running WiX tools...')
msi_file = os.path.join(self.dist_path, 'OpenLP-{}.msi'.format(self.version)) msi_file = os.path.join(self.dist_path, 'OpenLP-{}.msi'.format(self.version))
if msi_file: if os.path.exists(msi_file):
self._print_verbose('Removing old MSI file') self._print_verbose('Removing old MSI file')
os.unlink(msi_file) os.unlink(msi_file)
config_dir = os.path.dirname(self.config_path) config_dir = os.path.dirname(self.config_path)
@ -372,11 +372,6 @@ class WindowsBuilder(Builder):
copy(os.path.join(self.mutool_exe), os.path.join(self.dist_path, 'mutool.exe')) copy(os.path.join(self.mutool_exe), os.path.join(self.dist_path, 'mutool.exe'))
else: else:
self._print('... WARNING: mutool.exe not found') self._print('... WARNING: mutool.exe not found')
self._print_verbose('... MediaInfo.exe')
if self.mediainfo_exe and os.path.isfile(self.mediainfo_exe):
copy(os.path.join(self.mediainfo_exe), os.path.join(self.dist_path, 'MediaInfo.exe'))
else:
self._print('... WARNING: MediaInfo.exe not found')
def after_run_sphinx(self): def after_run_sphinx(self):
""" """

1
windows/config-appveyor.ini
View File

@ -6,7 +6,6 @@ lrelease = C:\Qt\5.12\msvc2017\bin\lrelease.exe
portablelauncher = %(here)s\..\..\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe portablelauncher = %(here)s\..\..\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
portableinstaller = %(here)s\..\..\PortableApps.comInstaller\PortableApps.comInstaller.exe portableinstaller = %(here)s\..\..\PortableApps.comInstaller\PortableApps.comInstaller.exe
mutool = %(here)s\..\..\mupdf-1.14.0-windows\mutool.exe mutool = %(here)s\..\..\mupdf-1.14.0-windows\mutool.exe
mediainfo = %(here)s\..\..\MediaInfo\MediaInfo.exe
candle = %(progfiles)s\WiX Toolset v3.11\bin\candle.exe candle = %(progfiles)s\WiX Toolset v3.11\bin\candle.exe
light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe

1
windows/config.ini.default
View File

@ -6,7 +6,6 @@ lrelease = %(sitepackages)s\PyQt5\bin\lrelease.exe
portablelauncher = %(progfiles)s\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe portablelauncher = %(progfiles)s\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe
portableinstaller = %(progfiles)s\PortableApps.comInstaller\PortableApps.comInstaller.exe portableinstaller = %(progfiles)s\PortableApps.comInstaller\PortableApps.comInstaller.exe
mutool = %(here)s\..\mupdf-1.9a-windows\mutool.exe mutool = %(here)s\..\mupdf-1.9a-windows\mutool.exe
mediainfo = %(here)s\..\MediaInfo\MediaInfo.exe
candle = %(progfiles)s\WiX Toolset v3.11\bin\candle.exe candle = %(progfiles)s\WiX Toolset v3.11\bin\candle.exe
light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe