Skip to content

Commit 4d4d75a

Browse files
ilya-fedinjohn-preston
authored andcommitted
Install nuget and jom with prepare.py
1 parent 42fe80b commit 4d4d75a

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

.github/workflows/win.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,8 @@ jobs:
7979
submodules: recursive
8080
path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
8181

82-
- name: Choco installs.
83-
run: |
84-
choco install --no-progress -y jom
85-
py -m pip install pywin32
82+
- name: Python installs.
83+
run: py -m pip install pywin32
8684

8785
- name: Set up environment paths.
8886
shell: bash

Telegram/build/prepare/prepare.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,19 @@ def runStages():
418418
SET PATH=%PATH_BACKUP_%
419419
""", 'ThirdParty')
420420

421+
stage('NuGet', """
422+
win:
423+
mkdir NuGet
424+
powershell -Command "Invoke-WebRequest -OutFile ./NuGet/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
425+
""", 'ThirdParty')
426+
427+
stage('jom', """
428+
win:
429+
powershell -Command "Invoke-WebRequest -OutFile ./jom.zip http://download.qt.io/official_releases/jom/jom.zip"
430+
powershell -Command "Expand-Archive ./jom.zip"
431+
del jom.zip
432+
""", 'ThirdParty')
433+
421434
stage('depot_tools', """
422435
mac:
423436
git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git

docs/building-win-x64.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
2020

2121
## Install third party software
2222

23-
* Download **jom** archive from [http://download.qt.io/official_releases/jom/jom.zip](http://download.qt.io/official_releases/jom/jom.zip) and unpack to ***BuildPath*\\ThirdParty\\jom**
2423
* 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
2524
* Download **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake**
2625
* Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it.
27-
* Download **NuGet** executable from [https://dist.nuget.org/win-x86-commandline/latest/nuget.exe](https://dist.nuget.org/win-x86-commandline/latest/nuget.exe) and put to ***BuildPath*\\ThirdParty\\NuGet**
2826

2927
Open **x64 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run
3028

docs/building-win.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ You will require **api_id** and **api_hash** to access the Telegram API servers.
2020

2121
## Install third party software
2222

23-
* Download **jom** archive from [http://download.qt.io/official_releases/jom/jom.zip](http://download.qt.io/official_releases/jom/jom.zip) and unpack to ***BuildPath*\\ThirdParty\\jom**
2423
* 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
2524
* Download **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake**
2625
* Download **Git** installer from [https://git-scm.com/download/win](https://git-scm.com/download/win) and install it.
27-
* Download **NuGet** executable from [https://dist.nuget.org/win-x86-commandline/latest/nuget.exe](https://dist.nuget.org/win-x86-commandline/latest/nuget.exe) and put to ***BuildPath*\\ThirdParty\\NuGet**
2826

2927
Open **x86 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run
3028

0 commit comments

Comments
 (0)