Retire qmake. (GPSBabel#935)

* remove qmake. * fix fedora cmake builds in CI. * update build instructions in doc. * more qmake cleanup * remove rc stringification nonsense * tweak build instructions.
jidanni · Oct 21, 2022 · c33052b · c33052b
1 parent ab0fa19
commit c33052b
Show file tree

Hide file tree

Showing 30 changed files with 245 additions and 1,521 deletions.
diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
@@ -26,4 +26,6 @@ jobs:
 
     - name: build_and_test
       run: |
-        ./tools/build_and_test.sh
+        # when using containers manually whitelist the checkout directory to allow git commands to work
+        git config --global --add safe.directory "${GITHUB_WORKSPACE}"
+        ./tools/build_and_test_cmake.sh
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -22,10 +22,6 @@ jobs:
             XCODE_VERSION: '12.4'
             GENERATOR: 'Ninja'
             RELEASE: false
-          - QT_VERSION: '6.2.4'
-            XCODE_VERSION: '12.5.1'
-            GENERATOR: 'qmake'
-            RELEASE: false
           - QT_VERSION: '6.2.4'
             XCODE_VERSION: '12.5.1'
             GENERATOR: 'Xcode'
@@ -69,11 +65,7 @@ jobs:
       run: |
         source ${HOME}/Cache/qt-${{ matrix.QT_VERSION }}.env
         sudo xcode-select --switch /Applications/Xcode_${{ matrix.XCODE_VERSION }}.app
-        if [ "${{ matrix.GENERATOR }}" == qmake ]; then
-          ./tools/travis_script_osx
-        else
-          ./tools/ci_script_osx.sh . ${{ matrix.QT_VERSION }} ${{ matrix.GENERATOR }}
-        fi
+        ./tools/ci_script_osx.sh . ${{ matrix.QT_VERSION }} ${{ matrix.GENERATOR }}
 
     - name: Deploy
       # This only handles continous releases now, for other events artifacts may be saved in

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -18,8 +18,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - IMAGE: 'focal'
-            SCRIPT: './tools/build_and_test.sh'
           - IMAGE: 'focal'
             SCRIPT: './tools/build_and_test_cmake.sh'
           - IMAGE: 'jammy'

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -14,54 +14,60 @@ jobs:
 
   windows:
     name: windows Build
-    runs-on: windows-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
           - QT_VERSION: '5.12.12'
             ARCH: 'amd64'
-            HOST_ARCH: 'x86'
-            COMPILER: 'msvc2017_64'
-            METHOD: 'aqt'
-            FLOW: 'nmake'
-            RELEASE: false
-          - QT_VERSION: '5.12.12'
-            ARCH: 'amd64'
-            HOST_ARCH: 'x86'
+            HOST_ARCH: 'amd64'
             COMPILER: 'msvc2017_64'
             METHOD: 'aqt'
-            FLOW: 'msbuild'
+            GENERATOR: 'Visual Studio 16 2019'
             RELEASE: false
+            os: windows-2019
           - QT_VERSION: '5.12.12'
             ARCH: 'amd64'
-            HOST_ARCH: 'x86'
+            HOST_ARCH: 'amd64'
             COMPILER: 'msvc2017_64'
-            VCVERSION: '14.16'
+            TOOLSET: 'v141,version=14.16.27023'
             METHOD: 'aqt'
-            FLOW: 'nmake'
+            GENERATOR: 'Visual Studio 16 2019'
             RELEASE: false
+            os: windows-2019
           - QT_VERSION: '5.12.12'
             ARCH: 'x86'
-            HOST_ARCH: 'x86'
+            HOST_ARCH: 'amd64'
             COMPILER: 'msvc2017'
             METHOD: 'aqt'
+            GENERATOR: 'Visual Studio 16 2019'
             RELEASE: false
-            FLOW: 'nmake'
+            os: windows-2019
           - QT_VERSION: '6.2.4'
             ARCH: 'amd64'
             HOST_ARCH: 'amd64'
             COMPILER: 'msvc2019_64'
             METHOD: 'aqt'
-            RELEASE: true
-            FLOW: 'nmake'
+            GENERATOR: 'Visual Studio 16 2019'
+            RELEASE: false
+            os: windows-2019
           - QT_VERSION: '6.2.4'
             ARCH: 'amd64'
             HOST_ARCH: 'amd64'
             COMPILER: 'msvc2019_64'
             METHOD: 'aqt'
+            GENERATOR: 'Visual Studio 17 2022'
             RELEASE: false
+            os: windows-latest
+          - QT_VERSION: '6.2.4'
+            ARCH: 'amd64'
+            HOST_ARCH: 'amd64'
+            COMPILER: 'msvc2019_64'
+            METHOD: 'aqt'
+            RELEASE: true
             GENERATOR: 'Ninja'
+            os: windows-latest
 
     steps:
     - name: Checkout repository
@@ -92,11 +98,7 @@ jobs:
       shell: powershell
       run: |
         .\tools\ci_setup_windows.ps1 -qtdir "$Home\Cache\Qt\${{ matrix.QT_VERSION }}\${{ matrix.COMPILER }}" -arch "${{ matrix.ARCH }}" -host_arch "${{ matrix.HOST_ARCH }}" -vcversion "${{ matrix.VCVERSION }}"
-        if ( "${{ matrix.generator }}" ) {
-          .\tools\ci_script_windows.ps1 -generator "${{ matrix.GENERATOR }}" -arch "${{ matrix.ARCH }}" -toolset "${{ matrix.TOOLSET }}"
-        } else {
-          .\tools\make_windows_release.ps1 -iscc "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" -buildinstaller true -flow "${{ matrix.FLOW }}" -arch "${{ matrix.ARCH }}"
-        }
+        .\tools\ci_script_windows.ps1 -generator "${{ matrix.GENERATOR }}" -arch "${{ matrix.ARCH }}" -toolset "${{ matrix.TOOLSET }}"
 
     - name: Rename
       shell: bash

diff --git a/.github/workflows/windows_ondemand.yml b/.github/workflows/windows_ondemand.yml