update build script for Windows XP (#401)

packages/msys/build-llvm.sh

@@ -182,6 +182,7 @@ function package() {
     -DFINALNAME="$_FINAL_NAME"
     -DREQUIRED_WINDOWS_BUILD=18362
     -DREQUIRED_WINDOWS_NAME="Windows 10 v1903"
+    -DUSE_MODERN_FONT
     -DHAVE_LLVM
     -DHAVE_OPENCONSOLE
     -DHAVE_COMPILER_HINT

packages/msys/build-mingw.sh

@@ -278,6 +278,7 @@ nsis_flags=(
   -DMINGW64_COMPILER_NAME="${MINGW64_COMPILER_NAME}"
   -DREQUIRED_WINDOWS_BUILD=7600
   -DREQUIRED_WINDOWS_NAME="Windows 7"
+  -DUSE_MODERN_FONT
 )
 if [[ ${COMPILER_MINGW32} -eq 1 ]]; then
   nsis_flags+=(-DHAVE_MINGW32)

packages/msys/build-xp.sh

@@ -1,93 +1,326 @@
 #!/bin/bash
 
-TARGET_DIR="/r/"
+set -euxo pipefail
-BUILD_DIR="${TEMP}/redpandacpp-build"
-PACKAGE_DIR="${TEMP}/RedPanda-CPP"
-GCC_DIR="/Qt/5.6.3/mingw81_32-redpanda"
-PATH="${GCC_DIR}/bin:${PATH}"
-QMAKE="${GCC_DIR}/bin/qmake"
-QMAKE2="/mingw32/bin/qmake"
-NSIS="/d/Program Files (x86)/NSIS/bin/makensis.exe"
-SOURCE_DIR=`pwd`
-MINGW="/e/Workspaces/contributes/MinGW/MinGW32"
-MINGW_NAME="MinGW32"
 
+function fn_print_help() {
+  cat <<EOF
+Usage:
+  packages/msys/build-xp.sh [-m|--msystem <MSYSTEM>] [-c|--clean] [-nd|--no-deps] [-t|--target-dir <dir>]
+Options:
+  -h, --help               Display this information.
+  -m, --msystem <MSYSTEM>  Switch to other MSYS2 environment.
+                           (MINGW32, MINGW64, UCRT64, CLANG32, CLANG64)
+                           MUST be used before other options.
+  -c, --clean              Clean build and package directories.
+  --mingw                  Alias for --mingw32 (x86 app) or --mingw64 (x64 app).
+  --mingw32                Build mingw32 integrated compiler.
+  --mingw64                Build mingw64 integrated compiler.
+  --ucrt <build>           Include UCRT in the package. Windows SDK required.
+                           e.g. '--ucrt 22621' for Windows 11 SDK 22H2.
+  --qt <dir>               Path to Qt library.
+                           Default: /c/Qt/${QT_VERSION}/${QT_NAME}.
+  -nd, --no-deps           Skip dependency check.
+  -t, --target-dir <dir>   Set target directory for the packages.
+EOF
+}
+
+source version.inc
+[[ -n "${APP_VERSION_SUFFIX}" ]] && APP_VERSION="${APP_VERSION}${APP_VERSION_SUFFIX}"
+
+if [[ ! -v MSYSTEM ]]; then
+  echo "This script must be run in MSYS2 shell"
+  exit 1
+fi
+
+if [[ $# -gt 1 && ($1 == "-m" || $1 == "--msystem") ]]; then
+  msystem=$2
+  shift 2
+  case "${msystem}" in
+    MINGW32|MINGW64|UCRT64|CLANG32|CLANG64)
+      export MSYSTEM="${msystem}"
+      exec /bin/bash --login "$0" "$@"
+      ;;
+    *)
+      echo "Invalid MSYSTEM: ${msystem}"
+      exit 1
+      ;;
+  esac
+fi
+
+QT_VERSION="5.15.13"
+QT_NAME=""
+case "${MSYSTEM}" in
+  MINGW32|CLANG32)  # there is no UCRT32
+    NSIS_ARCH=x86
+    PACKAGE_BASENAME="redpanda-cpp-${APP_VERSION}-winxp_x86"
+    QT_NAME="mingw132_32-redpanda"
+    ;;
+  MINGW64|UCRT64|CLANG64)
+    NSIS_ARCH=x64
+    PACKAGE_BASENAME="redpanda-cpp-${APP_VERSION}-ws2003_x64"
+    QT_NAME="mingw132_64-redpanda"
+    ;;
+  *)
+    echo "This script must be run in one of the following MSYS2 shells:"
+    echo "  - MINGW32 / CLANG32"
+    echo "  - MINGW64 / UCRT64 / CLANG64"
+    exit 1
+    ;;
+esac
+
+CLEAN=0
+CHECK_DEPS=1
+compilers=()
+COMPILER_MINGW32=0
+COMPILER_MINGW64=0
+TARGET_DIR="$(pwd)/dist"
+UCRT=""
+QT_DIR="/c/Qt/${QT_VERSION}/${QT_NAME}"
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -h|--help)
+      fn_print_help
+      exit 0
+      ;;
+    -c|--clean)
+      CLEAN=1
+      shift
+      ;;
+    --mingw)
+      case "${NSIS_ARCH}" in
+        x86)
+          compilers+=("mingw32")
+          COMPILER_MINGW32=1
+          shift
+          ;;
+        x64)
+          compilers+=("mingw64")
+          COMPILER_MINGW64=1
+          shift
+          ;;
+      esac
+      ;;
+    --mingw32)
+      compilers+=("mingw32")
+      COMPILER_MINGW32=1
+      shift
+      ;;
+    --mingw64)
+      compilers+=("mingw64")
+      COMPILER_MINGW64=1
+      shift
+      ;;
+    --ucrt)
+      UCRT="$2"
+      shift 2
+      ;;
+    --qt)
+      QT_DIR="$2"
+      shift 2
+      ;;
+    -nd|--no-deps)
+      CHECK_DEPS=0
+      shift
+      ;;
+    -t|--target-dir)
+      TARGET_DIR="$2"
+      shift 2
+      ;;
+    *)
+      echo "Unknown argument: $1"
+      exit 1
+      ;;
+  esac
+done
+
+ASTYLE_VERSION_TAG="3.4.14"
+BUILD_DIR="${TEMP}/redpanda-xp-${NSIS_ARCH}-build"
+ASTYLE_BUILD_DIR="${BUILD_DIR}/astyle"
+PACKAGE_DIR="${TEMP}/redpanda-xp-${NSIS_ARCH}-pkg"
+QMAKE="${QT_DIR}/bin/qmake.exe"
+NSIS="/mingw32/bin/makensis"
+SOURCE_DIR="$(pwd)"
+ASSETS_DIR="${SOURCE_DIR}/assets"
+UCRT_DIR="/c/Program Files (x86)/Windows Kits/10/Redist/10.0.${UCRT}.0/ucrt/DLLs/${NSIS_ARCH}"
+
+MINGW_LITE_RELEASE="13.2.0-r4"
+HOST_MINGW32_ARCHIVE="mingw32-ucrt-${MINGW_LITE_RELEASE}.7z"
+HOST_MINGW64_ARCHIVE="mingw64-ucrt-${MINGW_LITE_RELEASE}.7z"
+
+REDPANDA_MINGW_RELEASE="11.4.0-r0"
+MINGW32_ARCHIVE="mingw32-${REDPANDA_MINGW_RELEASE}.7z"
+MINGW32_COMPILER_NAME="MinGW-w64 i686 GCC 11.4"
+MINGW32_PACKAGE_SUFFIX="mingw32_11.4"
+
+MINGW64_ARCHIVE="mingw64-${REDPANDA_MINGW_RELEASE}.7z"
+MINGW64_COMPILER_NAME="MinGW-w64 x86_64 GCC 11.4"
+MINGW64_PACKAGE_SUFFIX="mingw64_11.4"
+
+if [[ ${#compilers[@]} -eq 0 ]]; then
+  PACKAGE_BASENAME="${PACKAGE_BASENAME}-none"
+else
+  [[ ${COMPILER_MINGW32} -eq 1 ]] && PACKAGE_BASENAME="${PACKAGE_BASENAME}-${MINGW32_PACKAGE_SUFFIX}"
+  [[ ${COMPILER_MINGW64} -eq 1 ]] && PACKAGE_BASENAME="${PACKAGE_BASENAME}-${MINGW64_PACKAGE_SUFFIX}"
+fi
+
+function fn_print_progress() {
+  echo -e "\e[1;32;44m$1\e[0m"
+}
+
+## check deps
+
+if [[ ${CHECK_DEPS} -eq 1 ]]; then
+  if [[ ! -x "${QMAKE}" ]]; then
+    echo "Qt library not found at ${QT_DIR}."
+    echo "Please download from https://github.com/redpanda-cpp/qtbase-xp and extract to C:/Qt."
+    exit 1
+  fi
+  deps=(
+    ${MINGW_PACKAGE_PREFIX}-7zip
+    mingw-w64-i686-nsis
+    curl git
+  )
+  for dep in ${deps[@]}; do
+    pacman -Q ${dep} &>/dev/null || {
+      echo "Missing dependency: ${dep}"
+      exit 1
+    }
+  done
+fi
+if [[ -n "${UCRT}" && ! -f "${UCRT_DIR}/ucrtbase.dll" ]]; then
+  echo "Missing Windows SDK, UCRT cannot be included."
+  exit 1
+fi
+
+## prepare dirs
+
+if [[ ${CLEAN} -eq 1 ]]; then
   rm -rf "${BUILD_DIR}"
-test -z "${BUILD_DIR}" | mkdir "${BUILD_DIR}"
   rm -rf "${PACKAGE_DIR}"
-mkdir "${PACKAGE_DIR}"
+fi
+mkdir -p "${BUILD_DIR}" "${PACKAGE_DIR}" "${TARGET_DIR}" "${ASTYLE_BUILD_DIR}" "${ASSETS_DIR}"
 
-echo "Building..."
+## prepare assets
-pushd .
+
-cd "${BUILD_DIR}"
+fn_print_progress "Updating astyle repo..."
-make distclean
+if [[ ! -d "${ASSETS_DIR}/astyle" ]]; then
-//hack: create nsh files
+  git clone --bare "https://gitlab.com/saalen/astyle" "${ASSETS_DIR}/astyle"
-"$QMAKE2" PREFIX="${PACKAGE_DIR}" -o Makefile "${SOURCE_DIR}\Red_Panda_Cpp.pro" 
+fi
-make distclean
+pushd "${ASSETS_DIR}/astyle"
-"$QMAKE" PREFIX="${PACKAGE_DIR}" -o Makefile "${SOURCE_DIR}\Red_Panda_Cpp.pro" 
+if [[ -z "$(git tag -l ${ASTYLE_VERSION_TAG})" ]]; then
-make -j16
+  git fetch --all --tags
-make install
+fi
 popd
 
-echo "Making no-compiler installer ..."
+if [[ ${COMPILER_MINGW32} -eq 1 && ! -f "${ASSETS_DIR}/${MINGW32_ARCHIVE}" ]]; then
+  curl -L "https://github.com/redpanda-cpp/toolchain-win32-mingw-xp/releases/download/${REDPANDA_MINGW_RELEASE}/${MINGW32_ARCHIVE}" -o "${ASSETS_DIR}/${MINGW32_ARCHIVE}"
+fi
+if [[ ${COMPILER_MINGW64} -eq 1 && ! -f "${ASSETS_DIR}/${MINGW64_ARCHIVE}" ]]; then
+  curl -L "https://github.com/redpanda-cpp/toolchain-win32-mingw-xp/releases/download/${REDPANDA_MINGW_RELEASE}/${MINGW64_ARCHIVE}" -o "${ASSETS_DIR}/${MINGW64_ARCHIVE}"
+fi
+
+## prepare host compiler
+
+case "${NSIS_ARCH}" in
+  x86)
+    [[ -f "${ASSETS_DIR}/${HOST_MINGW32_ARCHIVE}" ]] || curl -L "https://github.com/redpanda-cpp/mingw-lite/releases/download/${MINGW_LITE_RELEASE}/${HOST_MINGW32_ARCHIVE}" -o "${ASSETS_DIR}/${HOST_MINGW32_ARCHIVE}"
+    [[ -x "${BUILD_DIR}/mingw32/bin/gcc.exe" ]] || 7z x "${ASSETS_DIR}/${HOST_MINGW32_ARCHIVE}" -o"${BUILD_DIR}"
+    export PATH="${BUILD_DIR}/mingw32/bin:${PATH}"
+    ;;
+  x64)
+    [[ -f "${ASSETS_DIR}/${HOST_MINGW64_ARCHIVE}" ]] || curl -L "https://github.com/redpanda-cpp/mingw-lite/releases/download/${MINGW_LITE_RELEASE}/${HOST_MINGW64_ARCHIVE}" -o "${ASSETS_DIR}/${HOST_MINGW64_ARCHIVE}"
+    [[ -x "${BUILD_DIR}/mingw64/bin/gcc.exe" ]] || 7z x "${ASSETS_DIR}/${HOST_MINGW64_ARCHIVE}" -o"${BUILD_DIR}"
+    export PATH="${BUILD_DIR}/mingw64/bin:${PATH}"
+    ;;
+esac
+
+## build
+fn_print_progress "Building astyle..."
+pushd "${ASSETS_DIR}/astyle"
+git --work-tree="${ASTYLE_BUILD_DIR}" checkout -f "${ASTYLE_VERSION_TAG}"
+popd
+
+pushd .
+cd "${ASTYLE_BUILD_DIR}"
+cmake . -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release  -DCMAKE_EXE_LINKER_FLAGS="-static"
+mingw32-make -j$(nproc)
+cp AStyle/AStyle.exe "${PACKAGE_DIR}/astyle.exe"
+popd
+
+fn_print_progress "Building..."
+pushd .
+cd "${BUILD_DIR}"
+qmake_flags=()
+[[ ${NSIS_ARCH} == x64 ]] && qmake_flags+=("X86_64=ON")
+"$QMAKE" PREFIX="${PACKAGE_DIR}" ${qmake_flags[@]} -o Makefile "${SOURCE_DIR}/Red_Panda_Cpp.pro" -r
+mingw32-make -j$(nproc)
+mingw32-make install
+popd
+
+## prepare packaging resources
+
 pushd .
 cd "${PACKAGE_DIR}"
 
 cp "${SOURCE_DIR}/platform/windows/qt.conf" .
 
 cp "${SOURCE_DIR}/platform/windows/installer-scripts/lang.nsh" .
-cp "${SOURCE_DIR}/platform/windows/installer-scripts/redpanda-i686-nocompiler.nsi" .
+cp "${SOURCE_DIR}/platform/windows/installer-scripts/utils.nsh" .
-
+cp "${SOURCE_DIR}/platform/windows/installer-scripts/redpanda.nsi" .
-"${NSIS}" redpanda-i686-nocompiler.nsi
-rm -f lang.nsh
-rm -f config32.nsh
-rm -f config.nsh
-rm -f redpanda-i686-nocompiler.nsi
-
-SETUP_NAME=`ls *.Setup.exe`
-PORTABLE_NAME=`echo $SETUP_NAME | sed 's/Setup.exe/Portable.7z/'`
-mv "$SETUP_NAME" "${TARGET_DIR}"
 popd
 
-pushd .
+## make package
-cd "${TARGET_DIR}"
-echo "Making no-compiler Portable Package..."
-7z a -mmt8 -mx9  "${PORTABLE_NAME}" "${PACKAGE_DIR}"
-popd
-
-# we need reinstall config32.nsh
-pushd .
-cd "${BUILD_DIR}"
-make install
-popd
-
-echo "Making installer..."
 
 pushd .
 cd "${PACKAGE_DIR}"
-ln -s "${MINGW}" $MinGW_NAME
+SETUP_NAME="${PACKAGE_BASENAME}.exe"
+PORTABLE_NAME="${PACKAGE_BASENAME}.7z"
 
-cp "${SOURCE_DIR}/platform/windows/installer-scripts/lang.nsh" .
+fn_print_progress "Making installer..."
-cp "${SOURCE_DIR}/platform/windows/installer-scripts/redpanda-i686.nsi" .
 
-"${NSIS}" redpanda-i686.nsi
+nsis_flags=(
-rm -f lang.nsh
+  -DAPP_VERSION="${APP_VERSION}"
-rm -f config32.nsh
+  -DARCH="${NSIS_ARCH}"
-rm -f config.nsh
+  -DFINALNAME="${SETUP_NAME}"
-rm -f redpanda-i686.nsi
+  -DMINGW32_COMPILER_NAME="${MINGW32_COMPILER_NAME}"
+  -DMINGW64_COMPILER_NAME="${MINGW64_COMPILER_NAME}"
+)
+case $NSIS_ARCH in
+  x86)
+    nsis_flags+=(
+      -DREQUIRED_WINDOWS_BUILD=2600
+      -DREQUIRED_WINDOWS_NAME="Windows XP"
+    )
+    ;;
+  x64)
+    nsis_flags+=(
+      -DREQUIRED_WINDOWS_BUILD=3790
+      -DREQUIRED_WINDOWS_NAME="Windows Server 2003"
+    )
+    ;;
+esac
+if [[ ${COMPILER_MINGW32} -eq 1 ]]; then
+  nsis_flags+=(-DHAVE_MINGW32)
+  [[ -d "mingw32" ]] || 7z x "${SOURCE_DIR}/assets/${MINGW32_ARCHIVE}" -o"${PACKAGE_DIR}"
+fi
+if [[ ${COMPILER_MINGW64} -eq 1 ]]; then
+  nsis_flags+=(-DHAVE_MINGW64)
+  [[ -d "mingw64" ]] || 7z x "${SOURCE_DIR}/assets/${MINGW64_ARCHIVE}" -o"${PACKAGE_DIR}"
+fi
+if [[ -n "${UCRT}" ]]; then
+  nsis_flags+=(-DHAVE_UCRT)
+  if [[ ! -f ucrt/ucrtbase.dll ]]; then
+    mkdir -p ucrt
+    cp "${UCRT_DIR}"/*.dll ucrt
+  fi
+fi
+"${NSIS}" "${nsis_flags[@]}" redpanda.nsi
 
-SETUP_NAME=`ls *.Setup.exe`
+fn_print_progress "Making Portable Package..."
-PORTABLE_NAME=`echo $SETUP_NAME | sed 's/Setup.exe/Portable.7z/'`
+7z x "${SETUP_NAME}" -o"RedPanda-CPP" -xr'!$PLUGINSDIR' -x"!uninstall.exe"
-mv "$SETUP_NAME" "${TARGET_DIR}"
+7z a -mmt -mx9 -ms=on -mqs=on -mf=BCJ2 "${PORTABLE_NAME}" "RedPanda-CPP"
+rm -rf "RedPanda-CPP"
 
+mv "${SETUP_NAME}" "${TARGET_DIR}"
+mv "${PORTABLE_NAME}" "${TARGET_DIR}"
 popd
-
-pushd .
-cd "${TARGET_DIR}"
-echo "Making Portable Package..."
-7z a -mmt8 -mx9  "${PORTABLE_NAME}" "${PACKAGE_DIR}"
-popd
-
-echo "Clean up..."
-rm -rf "${PACKAGE_DIR}"
-

platform/windows/installer-scripts/redpanda.nsi

@@ -1,6 +1,10 @@
 ####################################################################
 # Startup
+!ifdef USE_MODERN_FONT
   SetFont "Segoe UI" 11
+!else
+  SetFont "Tahoma" 11
+!endif
 Unicode True
 
 !define APP_NAME_EN "Red Panda C++"