Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update VM definitions

Browse Source
This commit is contained in:
Kovid Goyal 2023-10-04 08:44:57 +05:30
parent fcc89de564
commit 0b29da7f16
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bypy/macos.conf
View File

@ -1,9 +1,9 @@
# Requires installation of XCode 15 and Python 3 and # Requires installation of XCode 15 and
# python3 -m pip install certifi html5lib # python3 -m pip install certifi html5lib
vm_name 'macos-calibre' vm_name 'macos-calibre'
root '/Users/Shared/calibre-build' root '/Users/Shared/calibre-build'
python '/usr/bin/python3' python '/usr/bin/python3'
rsync '/opt/homebrew/bin/rsync' rsync '/usr/local/bin/rsync'
deploy_target '11.0' deploy_target '11.0'
universal 'true' universal 'true'

14
bypy/windows.conf
View File

@ -1,20 +1,16 @@
# Requires installation of Visual Studio 2019 Community Edition, WiX Toolset, Git, Ruby, NodeJS, Python (2 and 3) and Perl # Requires installation of Visual Studio 2022 Community Edition, .NET SDK, WiX Toolset, Git, Ruby (without devkit), NodeJS, Python and Perl
# Windows SDK >= 10.0.20348.0 which can be installed by downloading the ISO from # git.exe must be in PATH. Must have ~120GB available disk space and 24GB RAM to build Qt WebEngine
# https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ and running
# ./WinSDKSetup.exe /features "OptionId.UWPCpp" "OptionId.DesktopCPPx64" "OptionId.DesktopCPPx86" "OptionID.DesktopCPPARM" "OptionID.DesktopCPPARM64" /q
# git.exe must be in PATH. Must have ~120GB available disk space and 24GB RAM (with 4 threads) to build Qt WebEngine
# Install certifi in python 3 with: # Install certifi in python 3 with:
# py.exe -m pip install certifi # py.exe -m pip install certifi
# Note that python2 is needed to build Qt WebEngine
# Copy opengl32sw.dll from # Copy opengl32sw.dll from
# https://download.qt.io/development_releases/prebuilt/llvmpipe/windows/ # https://download.qt.io/development_releases/prebuilt/llvmpipe/windows/
# to C:/mesa/32 and C:/mesa/64 # to C:/mesa/64
vm_name 'windows-calibre' vm_name 'windows-calibre'
root 'C:/r' root 'C:/r'
python 'py.exe' python 'py.exe'
python2 'C:/Python27/python.exe' python2 'C:/Python27/python.exe'
perl 'C:/Strawberry/perl/bin/perl.exe' perl 'C:/Strawberry/perl/bin/perl.exe'
ruby 'C:/Ruby30-x64/bin/ruby.exe' ruby 'C:/Ruby32-x64/bin/ruby.exe'
nodejs 'C:/nodejs/node.exe' nodejs 'C:/Program Files/nodejs/node.exe'
mesa 'C:/mesa' mesa 'C:/mesa'

1
bypy/windows/wix.py
View File

@ -9,6 +9,7 @@ import shutil
from bypy.constants import is64bit from bypy.constants import is64bit
from bypy.utils import run from bypy.utils import run
# TODO: Migrate to Wix 4 see https://wixtoolset.org/docs/fourthree/
WIXP = r'C:\Program Files (x86)\WiX Toolset v3.14' WIXP = r'C:\Program Files (x86)\WiX Toolset v3.14'
if is64bit: if is64bit:
UPGRADE_CODE = '5DD881FF-756B-4097-9D82-8C0F11D521EA' UPGRADE_CODE = '5DD881FF-756B-4097-9D82-8C0F11D521EA'