From 4b81713954e9a80ae817b5be18482343a2ad4e93 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 9 Apr 2019 21:14:26 +0200 Subject: [PATCH] Small adjustments for wix packaging --- builders/windows-builder.py | 23 ----------------------- windows/config-appveyor.ini | 3 ++- windows/config.ini.default | 8 +++++--- 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 6b9cdf6..057c2e3 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -36,9 +36,6 @@ PyEnchant This script expects the precompiled, installable version of PyEnchant to be installed. You can find this on the PyEnchant site. -Inno Setup 5 - Inno Setup should be installed into "C:\\%PROGRAMFILES%\\Inno Setup 5" - Sphinx This is used to build the documentation. The documentation trunk must be at the same directory level as OpenLP trunk and named "documentation". @@ -61,15 +58,6 @@ windows-builder.py This script, of course. It should be in the "windows-installer" directory at the same level as OpenLP trunk. -psvince.dll - This dll is used during the actual install of OpenLP to check if OpenLP is - running on the users machine prior to the setup. If OpenLP is running, - the install will fail. The dll can be obtained from here: - - http://www.vincenzo.net/isxkb/index.php?title=PSVince - - The dll is presently included with this script. - Mako Mako Templates for Python. This package is required for building the remote plugin. It can be installed by going to your @@ -83,11 +71,6 @@ MuPDF mupdf.com, extract it, and set the mutoolbin option in the config file to point to mutool.exe. -MediaInfo - Required for the media plugin. Download the 32-bit CLI windows build from - https://mediaarea.net/nn/MediaInfo/Download/Windows and set the - mediainfobin option in the config file to point to MediaInfo.exe. - Portable App Builds The following are required if you are planning to make a portable build of OpenLP. The portable build conforms to the standards published by @@ -119,10 +102,6 @@ from lxml.builder import E from builder import Builder -BLACKLIST = [ - 'pptviewlib.dll.intermediate.manifest' -] - class WindowsBuilder(Builder): """ @@ -168,8 +147,6 @@ class WindowsBuilder(Builder): parent_dir[base] = new_dir parent_dir['__dir__'].append(element) for fname in files: - if fname in BLACKLIST: - continue source = os.path.join(path, fname) if path else fname file_id = 'file_{source}'.format(source=source.replace('-', '_').replace(os.sep, '_')) file_ = E.File(Id=file_id, KeyPath="yes", Source=source) diff --git a/windows/config-appveyor.ini b/windows/config-appveyor.ini index 9dd0298..3062bd2 100644 --- a/windows/config-appveyor.ini +++ b/windows/config-appveyor.ini @@ -1,5 +1,4 @@ [executables] -innosetup = %(progfiles)s\Inno Setup 5\ISCC.exe sphinx = %(pyroot)s\Scripts\sphinx-build.exe pyinstaller = %(pyroot)s\Scripts\pyinstaller-script.py htmlhelp = %(progfiles)s\HTML Help Workshop\hhc.exe @@ -9,6 +8,8 @@ portablelauncher = %(here)s\..\..\PortableApps.comLauncher\PortableApps.comLaunc portableinstaller = %(here)s\..\..\PortableApps.comInstaller\PortableApps.comInstaller.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 +light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe [paths] branch = %(projects)s\openlp-branch diff --git a/windows/config.ini.default b/windows/config.ini.default index 443cab4..7b67dc3 100644 --- a/windows/config.ini.default +++ b/windows/config.ini.default @@ -9,14 +9,16 @@ portablelauncher = %(progfiles)s\PortableApps.comLauncher\PortableApps.comLaunch portableinstaller = %(progfiles)s\PortableApps.comInstaller\PortableApps.comInstaller.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 +light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe [paths] branch = %(projects)s\trunk documentation = %(projects)s\documentation -icon = %(here)s\OpenLP.ico -hooks = %(here)s\..\pyinstaller-hooks +icon = %(here)s\windows\OpenLP.ico +hooks = %(here)s\pyinstaller-hooks license = %(here)s\LICENSE.txt -portable_source = %(here)s\OpenLPPortable +portable_source = %(here)s\windows\OpenLPPortable portable_dest = %(projects)s\OpenLPPortable [transifex]