Install gyp python dependencies in prepare.py
This commit is contained in:
parent
6f88e46938
commit
5cbdc2f739
|
@ -82,9 +82,6 @@ jobs:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
|
path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
|
||||||
|
|
||||||
- name: Python installs.
|
|
||||||
run: pip3 install --upgrade pywin32 six
|
|
||||||
|
|
||||||
- name: Set up environment paths.
|
- name: Set up environment paths.
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -418,6 +418,15 @@ win:
|
||||||
SET PATH=%PATH_BACKUP_%
|
SET PATH=%PATH_BACKUP_%
|
||||||
""", 'ThirdParty')
|
""", 'ThirdParty')
|
||||||
|
|
||||||
|
stage('python', """
|
||||||
|
version: """ + (subprocess.run(['python', '-V'], capture_output=True, env=modifiedEnv).stdout.decode().strip().split()[-1] if win else '0') + """
|
||||||
|
win:
|
||||||
|
python -m venv python
|
||||||
|
python\\Scripts\\activate.bat
|
||||||
|
pip install pywin32 six
|
||||||
|
deactivate
|
||||||
|
""", 'ThirdParty')
|
||||||
|
|
||||||
stage('NuGet', """
|
stage('NuGet', """
|
||||||
win:
|
win:
|
||||||
mkdir NuGet
|
mkdir NuGet
|
||||||
|
@ -953,6 +962,8 @@ win:
|
||||||
) else (
|
) else (
|
||||||
SET "FolderPostfix="
|
SET "FolderPostfix="
|
||||||
)
|
)
|
||||||
|
depends:python/Scripts/activate.bat
|
||||||
|
%THIRDPARTY_DIR%\\python\\Scripts\\activate.bat
|
||||||
cd src\\client\\windows
|
cd src\\client\\windows
|
||||||
gyp --no-circular-check breakpad_client.gyp --format=ninja
|
gyp --no-circular-check breakpad_client.gyp --format=ninja
|
||||||
cd ..\\..
|
cd ..\\..
|
||||||
|
@ -963,6 +974,8 @@ release:
|
||||||
gyp dump_syms.gyp --format=ninja
|
gyp dump_syms.gyp --format=ninja
|
||||||
cd ..\\..\\..
|
cd ..\\..\\..
|
||||||
ninja -C out/Release%FolderPostfix% dump_syms
|
ninja -C out/Release%FolderPostfix% dump_syms
|
||||||
|
win:
|
||||||
|
deactivate
|
||||||
mac:
|
mac:
|
||||||
git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss
|
git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss
|
||||||
cd src/third_party/lss
|
cd src/third_party/lss
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
setlocal enabledelayedexpansion
|
setlocal enabledelayedexpansion
|
||||||
set "FullScriptPath=%~dp0"
|
set "FullScriptPath=%~dp0"
|
||||||
|
|
||||||
|
call %FullScriptPath%..\..\ThirdParty\python\Scripts\activate.bat
|
||||||
python %FullScriptPath%configure.py %*
|
python %FullScriptPath%configure.py %*
|
||||||
if %errorlevel% neq 0 goto error
|
if %errorlevel% neq 0 goto error
|
||||||
|
|
||||||
|
|
|
@ -24,10 +24,6 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
|
||||||
* 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
|
|
||||||
|
|
||||||
python -m pip install pywin32 six
|
|
||||||
|
|
||||||
## Clone source code and prepare libraries
|
## Clone source code and prepare libraries
|
||||||
|
|
||||||
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
|
||||||
|
|
|
@ -24,10 +24,6 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
|
||||||
* 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
|
|
||||||
|
|
||||||
python -m pip install pywin32 six
|
|
||||||
|
|
||||||
## Clone source code and prepare libraries
|
## Clone source code and prepare libraries
|
||||||
|
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue