ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#72476 allow qtz/keyID language also with --enable-release-build

Browse Source 
…by manually specifying it as part of the --with-lang switches
surprisingly enough this wasn't just a matter of adding the qtz language
code to the corresponging language list variables used by make, but also
was directly coupled to the ENABLE_RELEASE_BUILD environment variable
for some parts.

Change-Id: Icc985d9e7428ab932de09bd31e86e5ea7551f6fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192874
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
This commit is contained in:
Christian Lohmaier
2025-10-23 13:44:58 +02:00
parent 9a406c26e8
commit 8f0759cadd
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1
View File
@@ -15177,6 +15177,7 @@ AC_SUBST(MSGUNIQ)
# check that the list is valid
for lang in $WITH_LANG; do
test "$lang" = "ALL" && continue
test "$lang" = "qtz" && ALL_LANGS="$ALL_LANGS qtz" && continue
# need to check for the exact string, so add space before and after the list of all languages
for vl in $ALL_LANGS; do
if test "$vl" = "$lang"; then
l10ntools/source/merge.cxx
+3 -3
View File
@@ -120,8 +120,8 @@ MergeDataFile::MergeDataFile(
const OString &rFileName, std::string_view rFile,
bool bCaseSensitive, bool bWithQtz )
{
auto const env = getenv("ENABLE_RELEASE_BUILD");
OString sEnableReleaseBuild(env == nullptr ? "" : env);
auto const env = getenv("GENERATE_QTZ");
OString sGenerateQtz(env == nullptr ? "" : env);
std::ifstream aInputStream( rFileName.getStr() );
if ( !aInputStream.is_open() )
@@ -217,7 +217,7 @@ MergeDataFile::MergeDataFile(
bFirstLang, bCaseSensitive );
if( bFirstLang && bWithQtz &&
sEnableReleaseBuild != "TRUE" )
sGenerateQtz == "TRUE" )
{
aLanguageSet.insert("qtz"_ostr);
InsertEntry(
solenv/inc/langlist.mk
+12 -12
View File
@@ -147,25 +147,25 @@ ifneq ($(ENABLE_RELEASE_BUILD),TRUE)
completelangiso += $(lowcompletion_langs)
else
# allow to manually specify even in release config
# (this bit is used from within configure.ac as well, without parsing config_host_lang.mk)
completelangiso += $(foreach lang,$(WITH_LANG),$(filter $(lang),$(lowcompletion_langs)))
endif
ifneq ($(WITH_LANG),ALL)
gb_WITH_LANG=$(WITH_LANG)
else
# expand ALL based on language list)
gb_WITH_LANG=$(completelangiso)
endif
gb_HELP_LANGS := en-US
ifneq ($(ENABLE_RELEASE_BUILD),TRUE)
ifneq ($(WITH_LANG),)
# the stuff below is used by the actual build
gb_HELP_LANGS = en-US
# initialize with result from configure/config_host_lang.mk
gb_WITH_LANG = $(WITH_LANG)
# configure added qtz because it either it is a non-release build or it was explicitly requested
ifneq ($(filter qtz,$(WITH_LANG_LIST)),)
gb_WITH_LANG += qtz
gb_HELP_LANGS += qtz
# l10ntools/source/merge.cxx needs to know about qtz too
export GENERATE_QTZ:=TRUE
endif
endif
# expand ALL based on language list & use sort to remove any duplicates
gb_WITH_LANG := $(sort $(subst ALL,$(completelangiso),$(gb_WITH_LANG)))
gb_TRANS_LANGS = $(filter-out en-US,$(filter-out qtz,$(gb_WITH_LANG)))
gb_TRANS_LANGS := $(filter-out en-US qtz,$(gb_WITH_LANG))
gb_HELP_LANGS += \
$(foreach lang,$(filter-out $(WITH_POOR_HELP_LOCALIZATIONS),$(gb_TRANS_LANGS)),\