openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Please see my inline comment.

Diff comments:

> 
> === modified file 'builders/windows-builder.py'
> --- builders/windows-builder.py	2019-03-13 21:00:05 +0000
> +++ builders/windows-builder.py	2019-05-16 04:37:34 +0000
> @@ -270,13 +358,11 @@
>          super().setup_system_paths()
>          self.python_root = os.path.dirname(self.python)
>          self.site_packages = os.path.join(self.python_root, 'Lib', 'site-packages')
> -        # Default program_files to 'Program Files (x86)' - the folder for 32-bit programs on 64-bit systems, if that
> -        # does not exists the host system is 32-bit so fallback to 'Program Files'.
> -        self.program_files = os.getenv('PROGRAMFILES(x86)')
> -        if not self.program_files:
> -            self.program_files = os.getenv('PROGRAMFILES')
> +        self.program_files = os.getenv('PROGRAMFILES')
> +        self.program_files_x86 = os.getenv('PROGRAMFILES(x86)')

According to the literature I've read, this is the correct way to do this. Also, this script is written for us to build OpenLP, and there are very few people who are going to be building OpenLP on 32-bit machines. Lastly, I've changed the appveyor yaml file so that the 32-bit version of VLC is installed when we use the 32-bit version of Python, so that we can pull the correct binaries across. If I use "self.program_files_x86" for VLC, the build will fail due to VLC not being installed there.

>          self._print_verbose('   {:.<20}: {}'.format('site packages: ', self.site_packages))
>          self._print_verbose('   {:.<20}: {}'.format('program files: ', self.program_files))
> +        self._print_verbose('   {:.<20}: {}'.format('program files x86: ', self.program_files_x86))
>  
>      def setup_paths(self):
>          """


-- 
https://code.launchpad.net/~raoul-snyman/openlp/wix-packaging/+merge/367013
Your team OpenLP Core is subscribed to branch lp:openlp/packaging.