Use Python 3.10 and GYP supporting it.

This commit is contained in:
John Preston 2022-09-22 15:31:46 +04:00
parent 6fcafeff5b
commit 4e7a5eeffb
3 changed files with 6 additions and 7 deletions

View File

@ -62,7 +62,6 @@ if not os.path.isdir(os.path.join(thirdPartyDir, keysLoc)):
pathPrefixes = [ pathPrefixes = [
'ThirdParty\\msys64\\mingw64\\bin', 'ThirdParty\\msys64\\mingw64\\bin',
'ThirdParty\\Python39',
'ThirdParty\\jom', 'ThirdParty\\jom',
'ThirdParty\\cmake\\bin', 'ThirdParty\\cmake\\bin',
'ThirdParty\\gyp', 'ThirdParty\\gyp',
@ -397,7 +396,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout 38af8ef4c6 git checkout b14854c6f6
""") """)
stage('msys64', """ stage('msys64', """
@ -443,7 +442,7 @@ if not mac or 'build-stackwalk' in options:
win: win:
git clone https://chromium.googlesource.com/external/gyp git clone https://chromium.googlesource.com/external/gyp
cd gyp cd gyp
git checkout d6c5dd51dc git checkout 9d09418933
depends:patches/gyp.diff depends:patches/gyp.diff
git apply $LIBS_DIR/patches/gyp.diff git apply $LIBS_DIR/patches/gyp.diff
mac: mac:

View File

@ -20,13 +20,13 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
## Install third party software ## Install third party software
* Download **Python 3.9** installer from [https://www.python.org/downloads/](https://www.python.org/downloads/) and install to ***BuildPath*\\ThirdParty\\Python39** with adding to PATH * Download **Python 3.10** installer from [https://www.python.org/downloads/](https://www.python.org/downloads/) and install to ***BuildPath*\\ThirdParty\\Python39** with adding to PATH
* Download **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake** * Download **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake**
* Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it. * Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it.
Open **x64 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run Open **x64 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run
python -m pip install pywin32 python -m pip install pywin32 six
## Clone source code and prepare libraries ## Clone source code and prepare libraries

View File

@ -20,13 +20,13 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
## Install third party software ## Install third party software
* Download **Python 3.9** installer from [https://www.python.org/downloads/](https://www.python.org/downloads/) and install to ***BuildPath*\\ThirdParty\\Python39** with adding to PATH * Download **Python 3.10** installer from [https://www.python.org/downloads/](https://www.python.org/downloads/) and install to ***BuildPath*\\ThirdParty\\Python39** with adding to PATH
* Download **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake** * Download **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake**
* Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it. * Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it.
Open **x86 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run Open **x86 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run
python -m pip install pywin32 python -m pip install pywin32 six
## Clone source code and prepare libraries ## Clone source code and prepare libraries