From 96793179a3d128370156945d8be0ef4e537787ee Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 26 Aug 2022 11:13:42 +0300 Subject: [PATCH] Find nuget in the recommended directory automatically --- cmake | 2 +- docs/building-win-x64.md | 11 +---------- docs/building-win.md | 11 +---------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/cmake b/cmake index 0702ef4cd..ed89d8248 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 0702ef4cdd8ab888fdadaa4f5b2eb0c9d5844b69 +Subproject commit ed89d824871f937b95173a4de38d1efb71a9f5e2 diff --git a/docs/building-win-x64.md b/docs/building-win-x64.md index 987d1172d..4b7378970 100644 --- a/docs/building-win-x64.md +++ b/docs/building-win-x64.md @@ -24,21 +24,12 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. * Download **NASM** installer from [http://www.nasm.us](http://www.nasm.us) and install to ***BuildPath*\\ThirdParty\\NASM** * Download **Yasm** executable from [http://yasm.tortall.net/Download.html](http://yasm.tortall.net/Download.html), rename to *yasm.exe* and put to ***BuildPath*\\ThirdParty\\yasm** * 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** +* 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 **Ninja** executable from [https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip](https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip) and unpack to ***BuildPath*\\ThirdParty\\Ninja** * 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** -Add **Python 3.9** and **NuGet** to your PATH: - -* Open **Control Panel** -> **System** -> **Advanced system settings**. -* Press **Environment Variables...**. -* Select **Path**. -* Press **Edit**. -* Add ***BuildPath*\\ThirdParty\\Python39** value. -* Add ***BuildPath*\\ThirdParty\\NuGet** value. - Open **x64 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run python -m pip install pywin32 diff --git a/docs/building-win.md b/docs/building-win.md index 89e57aa23..4c2d67627 100644 --- a/docs/building-win.md +++ b/docs/building-win.md @@ -24,21 +24,12 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. * Download **NASM** installer from [http://www.nasm.us](http://www.nasm.us) and install to ***BuildPath*\\ThirdParty\\NASM** * Download **Yasm** executable from [http://yasm.tortall.net/Download.html](http://yasm.tortall.net/Download.html), rename to *yasm.exe* and put to ***BuildPath*\\ThirdParty\\yasm** * 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** +* 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 **Ninja** executable from [https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip](https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip) and unpack to ***BuildPath*\\ThirdParty\\Ninja** * 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** -Add **Python 3.9** and **NuGet** to your PATH: - -* Open **Control Panel** -> **System** -> **Advanced system settings**. -* Press **Environment Variables...**. -* Select **Path**. -* Press **Edit**. -* Add ***BuildPath*\\ThirdParty\\Python39** value. -* Add ***BuildPath*\\ThirdParty\\NuGet** value. - Open **x86 Native Tools Command Prompt for VS 2022.bat**, go to ***BuildPath*** and run python -m pip install pywin32