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

Merge branch 'address-build-issues' of https://github.com/ConstrictM/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2024-06-13 17:09:39 +05:30
commit 38be67c234
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bypy/sources.json
View File

@ -67,8 +67,8 @@
{ {
"name": "zlib", "name": "zlib",
"unix": { "unix": {
"filename": "zlib-1.3.tar.xz", "filename": "zlib-1.3.1.tar.xz",
"hash": "sha256:8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7", "hash": "sha256:38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32",
"urls": ["https://zlib.net/{filename}"] "urls": ["https://zlib.net/{filename}"]
} }
}, },

23
bypy/windows.conf
View File

@ -1,7 +1,26 @@
# Requires installation of Visual Studio 2022 Community Edition, .NET SDK, WiX Toolset, Git, Ruby (without devkit), NodeJS, Python and Perl # Requires installation of Visual Studio 2022 Community Edition, .NET SDK, WiX Toolset, Git, Ruby (without devkit), NodeJS, Python and Perl
#
# Visual Studio 2022 Components:
# .NET SDK
# C++ ATL for latest vXXX build tools (x86 & x64)
# C++ Clang Compiler for Windows
# C++ CMake tools for Windows
# C++/CLI support for vXXX build tools
# Git for Windows (can also be installed from web)
# MSBuild
# MSBuild support for LLVM (clang-cl) toolset
# MSVC vXXX - VS 2022 C++ x64/x86 build tools
# Python 3 (can also be installed from web)
# Windows 11 SDK
#
# Add the following directories to ENV Path:
# C:\Program Files (x86)\Microsoft Visual Studio\Installer
# C:\Program Files\Microsoft Visual Studio\VC\Tools\MSVC\14.40.33807\bin\Hostx64\x64
# C:\Program Files\Microsoft Visual Studio\VC\Tools\Llvm\bin
#
# git.exe must be in PATH. Must have ~120GB available disk space and 24GB RAM to build Qt WebEngine # git.exe must be in PATH. Must have ~120GB available disk space and 24GB RAM to build Qt WebEngine
# Install certifi in python 3 with: # Install certifi and html5lib in python 3 with:
# py.exe -m pip install certifi # py.exe -m pip install certifi html5lib
# 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/64 # to C:/mesa/64

6
bypy/windows/wix.py
View File

@ -37,6 +37,12 @@ def create_installer(env, compression_level='9'):
with open(j(d(__file__), 'wix-template.xml'), 'rb') as f: with open(j(d(__file__), 'wix-template.xml'), 'rb') as f:
template = f.read().decode('utf-8') template = f.read().decode('utf-8')
cmd = [WIX, '--version']
WIXVERSION = run(*cmd, get_output=True).decode('utf-8').split('.')[0]
if int(WIXVERSION) >= 5:
# Virtual Symbol "WixUISupportPerUser" needs to be overridden in WIX V5 https://wixtoolset.org/docs/fivefour/
template = template.replace('WixUISupportPerUser', 'override WixUISupportPerUser')
components, smap = get_components_from_files(env) components, smap = get_components_from_files(env)
wxs = template.format( wxs = template.format(
app=calibre_constants['appname'], app=calibre_constants['appname'],