From 1f26f6f5f9c689d510fc8421908d36e7b8b2fcaf Mon Sep 17 00:00:00 2001
From: Pier Angelo Vendrame <pierov@torproject.org>
Date: Fri, 10 Feb 2023 12:16:39 +0100
Subject: [PATCH] Bug 40778: Disable more translation dependencies for
testbuilds
We still had several translation enabled in Firefox dependencies also
for testbuilds. This made Firefox build again when translations
changed even though we did not use them.
---
projects/firefox/build | 18 ++++++++++++------
projects/firefox/config | 3 ++-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index 907f09372..53e4d8e3f 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -57,11 +57,13 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %]
-tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %]
-transl_base_browser=$rootdir/translation-base-browser
-[% IF c("var/tor-browser") -%]
- tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %]
- transl_tor_browser=$rootdir/translation-tor-browser
+[% IF !c("var/testbuild") -%]
+ tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %]
+ transl_base_browser=$rootdir/translation-base-browser
+ [% IF c("var/tor-browser") -%]
+ tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %]
+ transl_tor_browser=$rootdir/translation-tor-browser
+ [% END -%]
[% END -%]
cd /var/tmp/build/[% project %]-[% c("version") %]
@@ -116,7 +118,11 @@ add_translation () {
echo " locale/$lang/$filename (locale/$lang/$filename)" >> "browser/components/$component/jar.mn"
}
-supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
+[% IF c("var/testbuild") -%]
+ supported_locales=""
+[% ELSE -%]
+ supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
+[% END -%]
[% IF c("var/tor-browser") -%]
torbutton_locales="toolkit/torbutton/chrome/locale/"
torbutton_jar="toolkit/torbutton/jar.mn"
diff --git a/projects/firefox/config b/projects/firefox/config
index 606daff36..144b09f02 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -183,6 +183,7 @@ input_files:
- project: translation
name: translation-base-browser
pkg_type: base-browser
+ enable: '[% !c("var/testbuild") %]'
- project: translation
name: translation-base-browser-fluent
pkg_type: base-browser-fluent
@@ -190,7 +191,7 @@ input_files:
- project: translation
name: translation-tor-browser
pkg_type: tor-browser
- enable: '[% c("var/tor-browser") %]'
+ enable: '[% c("var/tor-browser") && !c("var/testbuild") %]'
- filename: namecoin-torbutton.patch
enable: '[% c("var/namecoin") %]'
# TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin
--
GitLab