piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

MSYS2 dev. env. setup script update/fix (#1979)

Browse Source 
Fix Python bcj-cffi and pyppmd package installation under MSYS2 and match better the GitHub MSYS2 environment setup.
This commit is contained in:
Risto
2022-05-20 12:22:02 +02:00
committed by GitHub
parent ce09b94e66
commit b843b715e3
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/setup_buildenv_msys2_py_requirements.txt
-5
View File
@@ -1,5 +0,0 @@
pillow==7.2.0
clang==6.0.0
py7zr==0.16.1
pyppmd==0.16.1
aqtinstall==1.2.5
tools/setup_buildenv_msys2_stage2.sh
+29 -9
View File
@@ -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