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

Use a different approach to get platform info in wxs

Browse Source
This commit is contained in:
Tomas Groth 2019-04-10 20:51:28 +02:00
parent 85ead230a4
commit 40f1c24ecd
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builders/windows-builder.py
View File

@ -174,9 +174,11 @@ class WindowsBuilder(Builder):
self._print_verbose('Reading base WiX file') self._print_verbose('Reading base WiX file')
with open(os.path.join(config_dir, 'OpenLP-base.wxs'), 'rt') as base_file: with open(os.path.join(config_dir, 'OpenLP-base.wxs'), 'rt') as base_file:
xml = base_file.read() xml = base_file.read()
progfilefolder = 'ProgramFiles64Folder' if self.arch == 'x64' else 'ProgramFilesFolder'
xml = xml % dict(dialog=os.path.join(config_dir, 'WizardMain.bmp'), xml = xml % dict(dialog=os.path.join(config_dir, 'WizardMain.bmp'),
banner=os.path.join(config_dir, 'WizardBanner.bmp'), banner=os.path.join(config_dir, 'WizardBanner.bmp'),
platform=self.arch) platform=self.arch,
progfilefolder=progfilefolder)
tree = fromstring(xml.encode('utf8')) tree = fromstring(xml.encode('utf8'))
self._print_verbose('Creating XML fragments from files and directories') self._print_verbose('Creating XML fragments from files and directories')
fragments = self._get_fragments_from_files(self.dist_path) fragments = self._get_fragments_from_files(self.dist_path)

8
windows/OpenLP-base.wxs
View File

@ -24,12 +24,8 @@
<WixVariable Id="WixUIDialogBmp" Value="%(dialog)s" /> <WixVariable Id="WixUIDialogBmp" Value="%(dialog)s" />
<WixVariable Id="WixUIBannerBmp" Value="%(banner)s" /> <WixVariable Id="WixUIBannerBmp" Value="%(banner)s" />
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<?if "%(platform)s"="x64"?> <Directory Id="%(progfilefolder)s">
<Directory Id="ProgramFiles64Folder"> <Directory Id="INSTALLDIR" Name="OpenLP"/>
<?else?>
<Directory Id="ProgramFilesFolder">
<?endif?>
<Directory Id="INSTALLDIR" Name="OpenLP"/>
</Directory> </Directory>
<Directory Id="ProgramMenuFolder" Name="Programs"> <Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name="OpenLP"> <Directory Id="ProgramMenuDir" Name="OpenLP">