Philipp Hörist pushed to branch windows-fix at gajim / gajim
Commits:
62f42c61 by Philipp Hörist at 2026-06-27T08:12:27+02:00
ci: Make windows nightly branch dynamic
- - - - -
52e93383 by Philipp Hörist at 2026-06-27T19:15:28+00:00
fix: Windows: Fix broken reaction emojis
This seems to be a new bug in Pango
- - - - -
56565e44 by Philipp Hörist at 2026-06-27T19:15:28+00:00
perf: Windows: Compile python files so startup is faster
- - - - -
7192b5b4 by Philipp Hörist at 2026-06-27T19:15:28+00:00
ci: Windows: Make Windows build easier to execute locally
- - - - -
3 changed files:
- .gitlab-ci.yml
- win/_base.sh
- win/misc/create_launcher.py
Changes:
=====================================
.gitlab-ci.yml
=====================================
@@ -160,7 +160,7 @@ build-windows-nightly:
release-helper build-windows-pkg \
--account=lovetox \
--repository=https://dev.gajim.org/gajim/gajim \
- --branch=master \
+ --branch=$CI_COMMIT_BRANCH \
--version=Nightly \
--commit-sha=$CI_COMMIT_SHA \
--api-key=$APPVEYOR_API_KEY \
=====================================
win/_base.sh
=====================================
@@ -88,8 +88,8 @@ function build_pacman {
pacman --root "${BUILD_ROOT}" "$@"
}
-function build_pip {
- "${BUILD_ROOT}"/"${MSYSTEM_PREFIX:1}"/bin/"${PYTHON_ID}".exe -m pip "$@"
+function build_pip_install {
+ "${BUILD_ROOT}"/"${MSYSTEM_PREFIX:1}"/bin/"${PYTHON_ID}".exe -m pip
install --break-system-packages "$@"
}
function build_python {
@@ -97,7 +97,7 @@ function build_python {
}
function build_compileall {
- build_python -m compileall -b "$@"
+ build_python -m compileall -q -f "$@"
}
function install_pre_deps {
@@ -123,12 +123,14 @@ function create_root {
}
function install_mingw_deps {
+ # Downgrade pango https://dev.gajim.org/gajim/gajim/-/issues/12730
+ build_pacman --noconfirm -U
https://repo.msys2.org/mingw/ucrt64/mingw-w64-ucrt-x86_64-pango-1.56.4-3-any.pkg.tar.zst
build_pacman --noconfirm -S ${MINGW_DEPS}
}
function install_python_deps {
- build_pip install precis-i18n
- build_pip install $(echo "$PYTHON_REQUIREMENTS" | tr ["\\n"] [" "])
+ build_pip_install precis-i18n
+ build_pip_install $(echo "$PYTHON_REQUIREMENTS" | tr ["\\n"] [" "])
}
function post_install_deps {
@@ -151,7 +153,7 @@ function install_gajim {
cd ..
build_python make.py build --dist=win
- build_pip install .
+ build_pip_install .
QL_VERSION=$(MSYSTEM= build_python -c \
"import gajim; import sys;
sys.stdout.write(gajim.__version__.split('+')[0])")
@@ -316,8 +318,9 @@ function cleanup_install {
find "${MINGW_ROOT}" -name "*.sh" -exec rm -f {} \;
find "${MINGW_ROOT}" -name "*.whl" -exec rm -f {} \;
- find "${MINGW_ROOT}" -type d -name "__pycache__" -prune -exec rm -rf {} \;
- find "${MINGW_ROOT}"/bin -name "*.pyc" -exec rm -f {} \;
+ # Byte-compile Python files and clean up afterwards
+ echo "Byte-compile Python files"
+ build_compileall "${MINGW_ROOT}"
echo "Run depcheck.py"
build_python "${MISC}/depcheck.py"
@@ -334,8 +337,8 @@ function makepri {
}
function build_exe_installer {
- MSYSTEM='MINGW64' /usr/bin/bash -lc "cd ${BUILD_ROOT} && makensis -NOCD
-DVERSION=\"$QL_VERSION_DESC\" -DARCH=\"${MSYSTEM_CARCH}\"
-DPREFIX=\"${MSYSTEM_PREFIX:1}\" ${MISC}/gajim.nsi"
- MSYSTEM='MINGW64' /usr/bin/bash -lc "cd ${BUILD_ROOT} && makensis -NOCD
-DVERSION=\"$QL_VERSION_DESC\" -DARCH=\"${MSYSTEM_CARCH}\"
-DPREFIX=\"${MSYSTEM_PREFIX:1}\" ${MISC}/gajim-portable.nsi"
+ cd ${BUILD_ROOT} && makensis -NOCD -DVERSION=${QL_VERSION_DESC}
-DARCH=${MSYSTEM_CARCH} -DPREFIX=${MSYSTEM_PREFIX:1} ${MISC}/gajim.nsi
+ cd ${BUILD_ROOT} && makensis -NOCD -DVERSION=${QL_VERSION_DESC}
-DARCH=${MSYSTEM_CARCH} -DPREFIX=${MSYSTEM_PREFIX:1} ${MISC}/gajim-portable.nsi
}
function build_msix_installer {
=====================================
win/misc/create_launcher.py
=====================================
@@ -112,7 +112,6 @@ def get_launcher_code(*, debug: bool) -> str:
Py_NoUserSiteDirectory = 1;
Py_IgnoreEnvironmentFlag = 1;
- Py_DontWriteBytecodeFlag = 1;
Py_FrozenFlag = 1;
Py_Initialize();
PySys_SetArgvEx(__argc, szArglist, 0);
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/2fdc2f861f907cdb9e088cb2f6ea88001f783d0e...7192b5b4f2a9a7a48f348541844e45fed6e79417
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/2fdc2f861f907cdb9e088cb2f6ea88001f783d0e...7192b5b4f2a9a7a48f348541844e45fed6e79417
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
