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

Fix some paths

Browse Source
This commit is contained in:
Raoul Snyman 2019-05-15 21:37:10 -07:00
parent a3088e878b
commit 7a30015296
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builders/windows-builder.py
View File

@ -326,6 +326,7 @@ class WindowsBuilder(Builder):
config_defaults.update({ config_defaults.update({
'pyroot': self.python_root, 'pyroot': self.python_root,
'progfiles': self.program_files, 'progfiles': self.program_files,
'progfilesx86': self.program_files_x86,
'sitepackages': self.site_packages, 'sitepackages': self.site_packages,
'projects': os.path.abspath(os.path.join(self.script_path, '..', '..')) 'projects': os.path.abspath(os.path.join(self.script_path, '..', '..'))
}) })
@ -358,8 +359,10 @@ class WindowsBuilder(Builder):
self.python_root = os.path.dirname(self.python) self.python_root = os.path.dirname(self.python)
self.site_packages = os.path.join(self.python_root, 'Lib', 'site-packages') self.site_packages = os.path.join(self.python_root, 'Lib', 'site-packages')
self.program_files = os.getenv('PROGRAMFILES') self.program_files = os.getenv('PROGRAMFILES')
self.program_files_x86 = os.getenv('PROGRAMFILES(x86)')
self._print_verbose(' {:.<20}: {}'.format('site packages: ', self.site_packages)) 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: ', self.program_files))
self._print_verbose(' {:.<20}: {}'.format('program files x86: ', self.program_files_x86))
def setup_paths(self): def setup_paths(self):
""" """

6
windows/config-appveyor.ini
View File

@ -1,13 +1,13 @@
[executables] [executables]
sphinx = %(pyroot)s\Scripts\sphinx-build.exe sphinx = %(pyroot)s\Scripts\sphinx-build.exe
pyinstaller = %(pyroot)s\Scripts\pyinstaller-script.py pyinstaller = %(pyroot)s\Scripts\pyinstaller.exe
htmlhelp = %(progfiles)s\HTML Help Workshop\hhc.exe htmlhelp = %(progfiles)s\HTML Help Workshop\hhc.exe
lrelease = C:\Qt\5.12\msvc2017\bin\lrelease.exe 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
candle = %(progfiles)s\WiX Toolset v3.11\bin\candle.exe candle = %(progfilesx86)s\WiX Toolset v3.11\bin\candle.exe
light = %(progfiles)s\WiX Toolset v3.11\bin\light.exe light = %(progfilesx86)s\WiX Toolset v3.11\bin\light.exe
[paths] [paths]
branch = %(projects)s\openlp-branch branch = %(projects)s\openlp-branch