diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml index 64ed2e37a..f8fd718bc 100644 --- a/.github/workflows/win.yml +++ b/.github/workflows/win.yml @@ -84,11 +84,6 @@ jobs: choco install --no-progress -y nasm strawberryperl yasm jom ninja py -m pip install pywin32 - - name: Install msys64. - run: | - mkdir %TBUILD%\ThirdParty - xcopy /E /I C:\msys64 %TBUILD%\ThirdParty\msys64 - - name: Set up environment paths. shell: bash run: | diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 219ae0c34..e2e1a2e3c 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -61,6 +61,7 @@ if not os.path.isdir(os.path.join(thirdPartyDir, keysLoc)): pathlib.Path(os.path.join(thirdPartyDir, keysLoc)).mkdir(parents=True, exist_ok=True) pathPrefixes = [ + 'ThirdParty\\msys64\\usr\\bin', 'ThirdParty\\Strawberry\\perl\\bin', 'ThirdParty\\Python39', 'ThirdParty\\NASM', @@ -402,6 +403,13 @@ stage('patches', """ git checkout 38af8ef4c6 """) +stage('msys64', """ +win: + powershell.exe -Command "Invoke-WebRequest -OutFile ./msys64.exe https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20220603.sfx.exe" + msys64.exe + del msys64.exe +""", '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 0f6861c4b..987d1172d 100644 --- a/docs/building-win-x64.md +++ b/docs/building-win-x64.md @@ -23,7 +23,6 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. * Download **Strawberry Perl** installer from [http://strawberryperl.com/](http://strawberryperl.com/) and install to ***BuildPath*\\ThirdParty\\Strawberry** * 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 **MSYS2** installer from [http://www.msys2.org/](http://www.msys2.org/) and install to ***BuildPath*\\ThirdParty\\msys64** * 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 **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake** diff --git a/docs/building-win.md b/docs/building-win.md index 7c24751a1..89e57aa23 100644 --- a/docs/building-win.md +++ b/docs/building-win.md @@ -23,7 +23,6 @@ You will require **api_id** and **api_hash** to access the Telegram API servers. * Download **Strawberry Perl** installer from [http://strawberryperl.com/](http://strawberryperl.com/) and install to ***BuildPath*\\ThirdParty\\Strawberry** * 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 **MSYS2** installer from [http://www.msys2.org/](http://www.msys2.org/) and install to ***BuildPath*\\ThirdParty\\msys64** * 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 **CMake 3.21 or later** installer from [https://cmake.org/download/](https://cmake.org/download/) and install to ***BuildPath*\\ThirdParty\\cmake**