From 40f1c24ecd95c636a61d8089c4cd33f0b21e362f Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 10 Apr 2019 20:51:28 +0200 Subject: [PATCH] Use a different approach to get platform info in wxs --- builders/windows-builder.py | 4 +++- windows/OpenLP-base.wxs | 8 ++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 0d1d78f..6b16960 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -174,9 +174,11 @@ class WindowsBuilder(Builder): self._print_verbose('Reading base WiX file') with open(os.path.join(config_dir, 'OpenLP-base.wxs'), 'rt') as base_file: xml = base_file.read() + progfilefolder = 'ProgramFiles64Folder' if self.arch == 'x64' else 'ProgramFilesFolder' xml = xml % dict(dialog=os.path.join(config_dir, 'WizardMain.bmp'), banner=os.path.join(config_dir, 'WizardBanner.bmp'), - platform=self.arch) + platform=self.arch, + progfilefolder=progfilefolder) tree = fromstring(xml.encode('utf8')) self._print_verbose('Creating XML fragments from files and directories') fragments = self._get_fragments_from_files(self.dist_path) diff --git a/windows/OpenLP-base.wxs b/windows/OpenLP-base.wxs index b612e82..15365a8 100644 --- a/windows/OpenLP-base.wxs +++ b/windows/OpenLP-base.wxs @@ -24,12 +24,8 @@ - - - - - - + +