From b843b715e3c6b71157ca357147f9ea567861d28d Mon Sep 17 00:00:00 2001
From: Risto <rotorman@users.noreply.github.com>
Date: Fri, 20 May 2022 12:22:02 +0200
Subject: [PATCH] MSYS2 dev. env. setup script update/fix (#1979)

Fix Python bcj-cffi and pyppmd package installation under MSYS2 and match better the GitHub MSYS2 environment setup.
---
 .../setup_buildenv_msys2_py_requirements.txt  |  5 ---
 tools/setup_buildenv_msys2_stage2.sh          | 38 ++++++++++++++-----
 2 files changed, 29 insertions(+), 14 deletions(-)
 delete mode 100644 tools/setup_buildenv_msys2_py_requirements.txt

diff --git a/tools/setup_buildenv_msys2_py_requirements.txt b/tools/setup_buildenv_msys2_py_requirements.txt
deleted file mode 100644
index 70a2a55ab..000000000
--- a/tools/setup_buildenv_msys2_py_requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-pillow==7.2.0
-clang==6.0.0
-py7zr==0.16.1
-pyppmd==0.16.1
-aqtinstall==1.2.5
diff --git a/tools/setup_buildenv_msys2_stage2.sh b/tools/setup_buildenv_msys2_stage2.sh
index 39cc3f7c1..68f837e8e 100644
--- a/tools/setup_buildenv_msys2_stage2.sh
+++ b/tools/setup_buildenv_msys2_stage2.sh
@@ -20,36 +20,56 @@ if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
   read
 fi
 
-echo "=== Step $((STEP++)): Installing Python wheel ==="
-pip install wheel
+echo "=== Step $((STEP++)): Installing Python Pillow and clang ==="
+pip install Pillow clang
 if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
   echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop."
   read
 fi
 
-echo "=== Step $((STEP++)): Fetching Python package requirements ==="
-wget https://raw.githubusercontent.com/EdgeTX/edgetx/main/tools/setup_buildenv_msys2_py_requirements.txt
+echo "=== Step $((STEP++)): Installing Python setuptools and wheel ==="
+python -m pip install setuptools wheel
 if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
   echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop."
   read
 fi
 
-echo "=== Step $((STEP++)): Installing Python packages ==="
-pip install -r setup_buildenv_msys2_py_requirements.txt
+echo "=== Step $((STEP++)): Fetching and installing Python package bcj-cffi ==="
+git clone --recursive https://github.com/miurahr/bcj-cffi.git
+cd bcj-cffi
+python setup.py install
+cd ..
 if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
   echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop."
   read
 fi
 
-echo "=== Step $((STEP++)): Deleting Python package requirements file ==="
-rm setup_buildenv_msys2_py_requirements.txt
+echo "=== Step $((STEP++)): Fetching and installing Python package pyppmd ==="
+git clone --recursive https://github.com/miurahr/pyppmd.git
+cd pyppmd
+python setup.py install
+cd ..
+if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
+  echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop."
+  read
+fi
+
+echo "=== Step $((STEP++)): Installing Python package py7zr in version 0.16.1 ==="
+python -m pip install py7zr==0.16.1
+if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
+  echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop."
+  read
+fi
+
+echo "=== Step $((STEP++)): Installing Python package aqtinstall in version 1.2.5 ==="
+python -m pip install aqtinstall==1.2.5
 if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
   echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop."
   read
 fi
 
 echo "=== Step $((STEP++)): Installing Qt build environment ==="
-aqt install 5.12.9 windows desktop win64_mingw73
+python -m aqt install 5.12.9 windows desktop win64_mingw73
 if [[ $PAUSEAFTEREACHLINE == "true" ]]; then
   echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop."
 fi