fix Windows?

Author: agateau

.github/workflows/main.yml

@@ -34,6 +34,9 @@ jobs:
       - name: Install dependencies
         run: ci/install-dependencies deps
         shell: bash
+      - name: Env vars
+        run: cat deps/env.sh
+        shell: bash
       - name: Build
         run: . deps/env.sh && ci/build-app
         shell: bash

ci/build-app

@@ -21,7 +21,7 @@ cd $BUILD_DIR
 cmake \
     -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
     -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR \
-    -G Ninja \
+    -G "$CMAKE_GENERATOR" \
     $SRC_DIR
 
 echo_title Updating translations

ci/install-dependencies

@@ -8,27 +8,38 @@ popd > /dev/null
 
 SRC_DIR=$CI_DIR/..
 
-QT_ARCH_WINDOWS=win64_msvc2019_64
+. $CI_DIR/lib/common.sh
+
+QT_ARCH_WINDOWS=win64_mingw81
+QT_MINGW=tools_mingw81
+QT_MINGW_PATH=mingw810_64/bin
 QT_ARCH_MACOS=clang_64
 QT_VERSION=5.15.2
 
 ECM_VERSION=5.69.0
 
 CMAKE_VERSION=3.31.\*
+CMAKE_GENERATOR=Ninja
 
 QPROPGEN_VERSION=0.1.\*
 
 add_env_var() {
-    echo "export $1=$2" >> $ENV_FILE
-    export $1=$2
+    echo "export $1=\"$2\"" >> $ENV_FILE
+    export $1="$2"
 }
 
 prepend_path() {
+    if [ ! -d "$1" ] ; then
+        die "prepend_path: \"$1\" does not exist"
+    fi
     echo "export PATH=$1:\$PATH" >> $ENV_FILE
     export PATH=$1:$PATH
 }
 
-. $CI_DIR/lib/common.sh
+if is_windows ; then
+    CMAKE_GENERATOR="MinGW Makefiles"
+fi
+
 . $CI_DIR/lib/common-dependencies.sh
 . $CI_DIR/lib/$OS-dependencies.sh
 
@@ -52,5 +63,6 @@ touch $ENV_FILE
 
 add_env_var CMAKE_INSTALL_PREFIX $INST_DIR
 add_env_var CMAKE_PREFIX_PATH $INST_DIR
+add_env_var CMAKE_GENERATOR "$CMAKE_GENERATOR"
 
 main

ci/lib/common-dependencies.sh

@@ -1,4 +1,4 @@
-AQTINSTALL_VERSION=3.1.0
+AQTINSTALL_VERSION=3.3.0
 AQTINSTALL_ARCHIVES="qtbase qtimageformats qtsvg qttranslations qttools"
 
 check_pipx() {

ci/lib/common.sh

@@ -40,7 +40,7 @@ has_command() {
 }
 
 die() {
-    echo "$*" >&2
+    echo "ERROR: $*" >&2
     exit 1
 }
 

ci/lib/windows-dependencies.sh

@@ -3,6 +3,7 @@ ICOUTILS_URL="https://downloads.sourceforge.net/project/unix-utils/icoutils/icou
 ICOUTILS_SHA256=1773b553fed5565004606d8732d9980ecec82cdccf35103700d71a17b4059723
 
 install_icoutils() {
+    echo_title "Installing icoutils"
     install_prebuilt_archive $ICOUTILS_URL $ICOUTILS_SHA256 $INST_DIR/icoutils.zip $INST_DIR
     local icotool_exe=$INST_DIR/icoutils-$ICOUTILS_VERSION-x86_64/bin/icotool.exe
     if [ ! -x "$icotool_exe" ] ; then
@@ -11,9 +12,20 @@ install_icoutils() {
     prepend_path $(dirname $icotool_exe)
 }
 
+install_qtmingw() {
+    echo_title "Installing Qt mingw"
+    local qt_install_dir=$INST_DIR/qt
+    aqt install-tool \
+        windows desktop $QT_MINGW \
+        --outputdir $qt_install_dir
+
+    prepend_path $qt_install_dir/Tools/$QT_MINGW_PATH
+}
+
 main() {
     install_icoutils
     install_qt
+    install_qtmingw
     install_cmake
     install_ecm
 }