Skip to content

Commit 23d9d8b

Browse files
authored
Fixed binaries names for lrelease and lupdate on recent MSYS64 (cyberbotics#6929)
* Fixed binaries names for lrelease and lupdate on recent MSYS64 * Updated comment * Update copyright year to 2026 in Makefile
1 parent 035c5b7 commit 23d9d8b

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

resources/translations/Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 1996-2024 Cyberbotics Ltd.
1+
# Copyright 1996-2026 Cyberbotics Ltd.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -37,9 +37,14 @@ include $(WEBOTS_HOME_PATH)/resources/Makefile.os.include
3737
WEBOTS_SRC_PATH = $(WEBOTS_HOME_PATH)/src/webots
3838

3939
ifeq ($(OSTYPE),windows)
40+
ifdef CI
4041
LUPDATE = lupdate-qt6
4142
LRELEASE = lrelease-qt6
4243
else
44+
LUPDATE = lupdate
45+
LRELEASE = lrelease
46+
endif
47+
else
4348
QT_BINARIES_PATH = $(WEBOTS_HOME_PATH)/bin/qt
4449

4550
ifeq ($(OSTYPE),linux)

scripts/install/msys64_installer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ declare -a BASE_PACKAGES=(
1515
"zip" # robotbenchmark square path
1616
"mingw-w64-x86_64-qt6-base" # Webots
1717
"mingw-w64-x86_64-qt6-declarative" # Webots
18-
"mingw-w64-x86_64-qt6-tools" # Webots (translation: lrelease-qt6 and lupdate-qt6)
18+
"mingw-w64-x86_64-qt6-tools" # Webots (translation: lrelease and lupdate)
1919
"mingw-w64-x86_64-qt6-translations" # Webots
2020
"mingw-w64-x86_64-qt6-websockets" # Webots
2121
"mingw-w64-x86_64-libzip" # Webots

0 commit comments

Comments
 (0)