diff --git a/projects/firefox/build b/projects/firefox/build index 907f09372261daf199f75091bfb4a0dd55a28a0d..53e4d8e3f29ad6761d3919776831161b6f2aa596 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 606daff36a45935c2ae9b335c8e09b2350b32c56..144b09f023b6f1e693d3b6a0b8e11552bc2d7ae8 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