fixes

iakov · iakov · commit 14d22c9c9e84 · 2023-02-02T12:47:54.000+03:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,209 +11,6 @@ defaults:
     shell: bash
 
 jobs:
-  ubuntu:
-    strategy:
-      fail-fast: false
-      matrix:
-        container: 
-        - 'ubuntu:20.04'
-        - 'ubuntu:22.04'
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    steps:
-    - name: Install Qt
-      run: |
-        apt-get update
-        DEBIAN_FRONTEND=noninteractive apt-get install -y --force-yes \
-        build-essential \
-        python3 \
-        python3-dev \
-        libpython3-dev \
-        qtbase5-dev \
-        qtbase5-private-dev \
-        qt5-qmake \
-        qtbase5-dev-tools \
-        qttools5-dev \
-        qtdeclarative5-dev \
-        libqt5svg5* \
-        libqt5xmlpatterns5* \
-        libqt5multimedia5* \
-        libqt5multimediawidgets5* \
-        libqt5qml5* \
-        libqt5quickwidgets5* \
-        qtmultimedia5-dev
-        apt-get clean
-      
-    - name: Checkout PythonQt
-      uses: actions/checkout@v3
-
-    - name: Build PythonQt
-      run: |
-        export QT_SELECT=qt5
-        echo ======= SYSTEM INFO ========
-        uname -a; gcc --version | grep "gcc"; python3 --version; qmake --version
-        echo ============================
-        qmake -r PythonQt.pro CONFIG+=release CONFIG+=sanitizer CONFIG+=sanitize_undefined \
-        PYTHON_VERSION=$(python3 --version | cut -d " " -f 2 | cut -d "." -f1,2) \
-        PYTHON_PATH=$(which python3 | xargs dirname)
-        make -j 2 && make check TESTARGS="-platform offscreen"
-      
-    - name: Generate Wrappers
-      run: |
-        # workaround to allow to find the Qt include dirs for installed standard qt packages
-        mkdir /usr/include/qt5; ln -s /usr/include/x86_64-linux-gnu/qt5 /usr/include/qt5/include
-        export QTDIR=/usr/include/qt5
-        cd generator
-        ./pythonqt_generator
-
-    - name: Upload Wrappers
-      uses: actions/upload-artifact@v3
-      if: ${{ matrix.container }} == 'ubuntu:20.04'
-      with:
-        name: wrappers_ubuntu_20_04
-        path: generated_cpp
-
-    - name: Upload Wrappers
-      uses: actions/upload-artifact@v3
-      if: ${{ matrix.container }} == 'ubuntu:22.04'
-      with:
-        name: wrappers_ubuntu_22_04
-        path: generated_cpp
-
-  centos:
-    strategy:
-      fail-fast: false
-      matrix:
-        container:
-        - 'centos:7'
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    steps:
-    - name: Install Qt
-      run: |
-        yum update -y
-        yum groupinstall "Development Tools" -y
-        yum install -y \
-        which \
-        python-debug \
-        qt5-qtbase-* \
-        qt5-qttools* \
-        qt5-qtsvg \
-        qt5-qtxmlpatterns \
-        qt5-qtmultimedia \
-        qt5-qt3d \
-        qt5-*-devel
-
-    - name: Checkout PythonQt
-      uses: actions/checkout@v3
-
-    - name: Build PythonQt
-      run: |
-        export QT_SELECT=qt5
-        echo ======= SYSTEM INFO ========
-        uname -a; gcc --version | grep "gcc"; python --version; qmake-qt5 --version
-        echo ============================
-        qmake-qt5 -r PythonQt.pro CONFIG+=release \
-        PYTHON_VERSION=$(python --version | cut -d " " -f 2 | cut -d "." -f1,2) \
-        PYTHON_PATH=$(which python | xargs dirname)
-        make -j 2 && make check TESTARGS="-platform offscreen"
-      
-    - name: Generate Wrappers
-      run: |
-        # workaround to allow to find the Qt include dirs for installed standard qt packages
-        mkdir /usr/include/qt5ln; ln -s /usr/include/qt5 /usr/include/qt5ln/include
-        export QTDIR=/usr/include/qt5ln
-        cd generator
-        ./pythonqt_generator
-        
-    - name: Upload Wrappers
-      uses: actions/upload-artifact@v3
-      with:
-        name: wrappers_centos7
-        path: generated_cpp
-
-  macOS:
-    strategy:
-      fail-fast: false
-      matrix:
-       macos-version:  ['10.15']
-       python-version: ['2.7']
-       qt-version: ['5.9.*']
-       include:
-         - macos-version: '11'
-           python-version: '3.6'
-           qt-version: '5.11.*'
-         - macos-version: '12'
-           python-version: '3.11'
-           qt-version: '5.12.*'
-    runs-on: macos-${{ matrix.macos-version }}
-    steps:
-    - name: Install Qt
-      uses: jurplel/install-qt-action@v3
-      with:
-        aqtversion: '==2.1.*'
-        version: ${{ matrix.qt-version }}
-        host: 'mac'
-        target: 'desktop'
-        arch: 'clang_64'
-        modules: 'qtscript'
-        archives: 'qtmultimedia qtmacextras qtbase qttools'
-
-    - name: Setup Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: '${{ matrix.python-version }}'
-
-    - name: Checkout PythonQt
-      uses: actions/checkout@v3
-
-    - name: Detect exact versions
-      id : versions
-      run : |
-        set -eu
-        PYTHON_VERSION_FULL=$(python --version 2>&1 | cut -f 2 -d ' ')
-        PYTHON_VERSION_SHORT=$(cut -f 1,2 -d . <<< $PYTHON_VERSION_FULL)
-        QT_VERSION_FULL=$($Qt5_Dir/bin/qmake -query QT_VERSION)
-        QT_VERSION_SHORT=$(cut -f 1,2 -d . <<< $QT_VERSION_FULL)
-        MACOS_VERSION_FULL=$(sw_vers -productVersion)
-        MACOS_VERSION_SHORT=$(cut -f 1,2 -d . <<< $MACOS_VERSION_FULL)
-
-        echo "PYTHON_VERSION_FULL=$PYTHON_VERSION_FULL" | tee -a $GITHUB_OUTPUT
-        echo "PYTHON_VERSION_SHORT=$PYTHON_VERSION_SHORT" | tee -a $GITHUB_OUTPUT
-        echo "QT_VERSION_FULL=$QT_VERSION_FULL" | tee -a $GITHUB_OUTPUT
-        echo "QT_VERSION_SHORT=$QT_VERSION_SHORT" | tee -a $GITHUB_OUTPUT
-        echo "MACOS_VERSION_FULL=$MACOS_VERSION_FULL" | tee -a $GITHUB_OUTPUT
-        echo "MACOS_VERSION_SHORT=$MACOS_VERSION_SHORT" | tee -a $GITHUB_OUTPUT
-
-    - name: Build PythonQt
-      run: |
-        set -ue
-        echo ======= SYSTEM INFO ========
-        uname -a; gcc --version | head -n 1; python --version; qmake --version
-        echo ============================
-        PYTHON_VERSION_MAJOR=$(cut -d . -f1 <<< ${{ steps.versions.outputs.PYTHON_VERSION_SHORT }})
-        for i in "python${{ steps.versions.outputs.PYTHON_VERSION_SHORT }}-embed" "python${{ steps.versions.outputs.PYTHON_VERSION_SHORT }}" \
-                 "python${PYTHON_VERSION_MAJOR}-embed" "python${PYTHON_VERSION_MAJOR}"
-        do if pkg-config --exists "$i"; then PYTHON_PKGCONFIG_NAME="$i"; break; fi; done
-        qmake CONFIG+=release CONFIG+=sanitizer CONFIG+=sanitize_undefined \
-        PYTHON_VERSION=${{ steps.versions.outputs.PYTHON_VERSION_SHORT }} \
-        PYTHON_PATH="$pythonLocation/bin" \
-        PKGCONFIG+=$PYTHON_PKGCONFIG_NAME \
-        -r PythonQt.pro
-        make -j 2 && make check TESTARGS="-platform offscreen"
-
-    - name: Generate Wrappers
-      run: |
-        cd generator
-        # workaround to allow to find the Qt include dirs for installed standard qt packages
-        QTDIR=-UNDEFINED- ./pythonqt_generator --include-paths=$Qt5_Dir/lib
-
-    - name: Upload Wrappers
-      uses: actions/upload-artifact@v3
-      with:
-        name: wrappers_macos${{ steps.versions.outputs.MACOS_VERSION_SHORT }}_qt${{ steps.versions.outputs.QT_VERSION_SHORT }}
-        path: generated_cpp
-
   windows:
     strategy:
       fail-fast: false
@@ -266,8 +63,8 @@ jobs:
         target: 'desktop'
         arch: ${{ matrix.qt-arch }}
         modules: 'qtscript'
-        archives: 'qtmultimedia qtbase qttools'
-        tools: ${{ contains(matrix.qt-arch, 'mingw') && format('qt.tools.{0}0', matrix.qt-arch) || '' }}
+        archives: 'qtwinextras qtmultimedia qtbase qttools'
+        tools: ${{ contains(matrix.qt-arch, 'mingw') && format('tools_mingw,qt.tools.{0}0', matrix.qt-arch) || '' }}
 
     - name: Setup Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
@@ -285,13 +82,14 @@ jobs:
         QT_VERSION_SHORT=$(cut -f 1,2 -d . <<< $QT_VERSION_FULL)
         echo "QT_VERSION_FULL=$QT_VERSION_FULL" | tee -a $GITHUB_OUTPUT
         echo "QT_VERSION_SHORT=$QT_VERSION_SHORT" | tee -a $GITHUB_OUTPUT
+        echo "CL=/MP" | tee -a $GITHUB_ENV #multicore parallel build for cl.exe
 
     - name: Build PythonQt
       shell: cmd
       run: |
-        set PATH
-        qmake -Wall -d CONFIG+=release "PYTHON_PATH=%pythonLocation%" -after "QMAKE_SH=" PythonQt.pro
-        make -j 2 && make check "TESTARGS=-platform offscreen" || nmake && nmake check "TESTARGS=-platform offscreen"
+        ${{ contains(matrix.qt-arch, 'mingw') && format('FOR /F "tokens=1,2 delims=_" %%I IN ("{0}") DO SET "PATH=%PATH%;%IQTA_TOOLS%\%%J0_{1}\bin', matrix.qt-arch, contains(matrix.qt-arch, 'win32') && '32' || '64') || '' }}
+        qmake -Wall -d CONFIG+=release "PYTHON_PATH=%pythonLocation%" -after "QMAKE_SH=" "QMAKE_LINK_OBJECT_MAX=100" PythonQt.pro
+        mingw32-make -j 2 && mingw32-make check "TESTARGS=-platform offscreen" || nmake && nmake check "TESTARGS=-platform offscreen"
 
     - name: Generate Wrappers
       shell: cmd
diff --git a/build/python.prf b/build/python.prf
@@ -6,6 +6,9 @@ isEmpty( PYTHON_VERSION ) {
   PYTHON_VERSION=$$(PYTHON_VERSION)
 }
 
+isEmpty(PYTHON_DIR):PYTHON_DIR=$$(PYTHON_DIR)
+!isEmpty(PYTHON_DIR):error(Use PYTHON_PATH to choose exact Python installation instead of PYTHON_DIR)
+
 isEmpty( PYTHON_PATH ) {
   PYTHON_PATH=$$(PYTHON_PATH)
 }
@@ -19,19 +22,26 @@ isEmpty(PYTHON_CMD):PYTHON_CMD=python
 !isEmpty(PYTHON_PATH):PYTHON_CMD=$${PYTHON_PATH}$${QMAKE_DIR_SEP}$${PYTHON_CMD}
 contains(QMAKE_HOST.os, Windows):PYTHON_CMD=$${PYTHON_CMD}.exe
 PYTHON_CMD=$$system_path($$PYTHON_CMD)
+!isEmpty(PYTHON_PATH):!exists($$PYTHON_CMD):error("Incorrect PYTHON_PATH was set, missing $$PYTHON_CMD")
+
+isEmpty(PYTHON_PATH): PYTHON_PATH=$$system($$system_quote($${PYTHON_CMD}) -c \
+$$system_quote(import os;import sys;print(os.path.dirname(sys.executable))))$${QMAKE_DIR_SEP}
+
+#Not just "python --version" because Python 2 outputs `--version` to the stderr
+#And there is no simple way known for me to generally redirect stderr to stdout
+PYTHON_VERSION_DETECTED=$$system($$system_quote($${PYTHON_CMD}) -c $$system_quote(import sysconfig;print(sysconfig.get_python_version())))
 
 
 isEmpty( PYTHON_VERSION ) {
    warning(PYTHON_VERSION should be set explicitly from qmake command-line or via environment.\
    $$escape_expand(\\n\\t) F.e.: $$shell_quote(qmake PYTHON_VERSION=3.6 CONFIG+=release) \
 		       or $$shell_quote(set PYTHON_VERSION=2.7))
    message(Trying $${PYTHON_CMD} executable to guess the version)
-   isEmpty(PYTHON_PATH): PYTHON_PATH=$$system($$system_quote($${PYTHON_CMD}) -c \
-   $$system_quote(import os;import sys;print(os.path.dirname(sys.executable))))$${QMAKE_DIR_SEP}
+   PYTHON_VERSION=$$PYTHON_VERSION_DETECTED
+}
 
-   #Not just "python --version" because Python 2 outputs `--version` to the stderr
-   #And there is no simple way known for me to generally redirect stderr to stdout
-   PYTHON_VERSION=$$system($$system_quote($${PYTHON_CMD}) -c $$system_quote(import sysconfig;print(sysconfig.get_python_version())))
+!equals(PYTHON_VERSION, $$PYTHON_VERSION_DETECTED){
+   error("Found Python version $$PYTHON_VERSION_DETECTED, but $$PYTHON_VERSION was requested")
 }
 
 PYTHON_VERSION_MAJOR=$$section(PYTHON_VERSION, ., 0, 0)
