diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index fbb0d73a66..9f0c50ec09 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -79,10 +79,8 @@ jobs: submodules: recursive path: ${{ env.TBUILD }}\${{ env.REPO_NAME }} - - name: Choco installs. - run: | - choco install --no-progress -y jom - py -m pip install pywin32 + - name: Python installs. + run: py -m pip install pywin32 - name: Set up environment paths. shell: bash diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index e4e4f2a281..de52a40905 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -418,6 +418,19 @@ win: SET PATH=%PATH_BACKUP_% """, 'ThirdParty') +stage('NuGet', """ +win: + mkdir NuGet + powershell -Command "Invoke-WebRequest -OutFile ./NuGet/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" +""", 'ThirdParty') + +stage('jom', """ +win: + powershell -Command "Invoke-WebRequest -OutFile ./jom.zip http://download.qt.io/official_releases/jom/jom.zip" + powershell -Command "Expand-Archive ./jom.zip" + del jom.zip +""", 'ThirdParty') + stage('depot_tools', """ mac: git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git diff --git a/docs/building-win-x64.md b/docs/building-win-x64.md index efd4203e3b..41fc10eb7c 100644 --- a/docs/building-win-x64.md +++ b/docs/building-win-x64.md @@ -20,11 +20,9 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. ## Install third party software -* 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** * 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 **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 **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** Open **x64 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run diff --git a/docs/building-win.md b/docs/building-win.md index 0699764996..5b2bef2df2 100644 --- a/docs/building-win.md +++ b/docs/building-win.md @@ -20,11 +20,9 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. ## Install third party software -* 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** * 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 **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 **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** Open **x86 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run