Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
1f26f6f5
by Pier Angelo Vendrame at 2023-02-10T12:18:16+01:00
2 changed files:
Changes:
... | ... | @@ -57,11 +57,13 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz |
57 | 57 | |
58 | 58 | mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %]
|
59 | 59 | |
60 | -tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %]
|
|
61 | -transl_base_browser=$rootdir/translation-base-browser
|
|
62 | -[% IF c("var/tor-browser") -%]
|
|
63 | - tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %]
|
|
64 | - transl_tor_browser=$rootdir/translation-tor-browser
|
|
60 | +[% IF !c("var/testbuild") -%]
|
|
61 | + tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %]
|
|
62 | + transl_base_browser=$rootdir/translation-base-browser
|
|
63 | + [% IF c("var/tor-browser") -%]
|
|
64 | + tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %]
|
|
65 | + transl_tor_browser=$rootdir/translation-tor-browser
|
|
66 | + [% END -%]
|
|
65 | 67 | [% END -%]
|
66 | 68 | |
67 | 69 | cd /var/tmp/build/[% project %]-[% c("version") %]
|
... | ... | @@ -116,7 +118,11 @@ add_translation () { |
116 | 118 | echo " locale/$lang/$filename (locale/$lang/$filename)" >> "browser/components/$component/jar.mn"
|
117 | 119 | }
|
118 | 120 | |
119 | -supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
|
|
121 | +[% IF c("var/testbuild") -%]
|
|
122 | + supported_locales=""
|
|
123 | +[% ELSE -%]
|
|
124 | + supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
|
|
125 | +[% END -%]
|
|
120 | 126 | [% IF c("var/tor-browser") -%]
|
121 | 127 | torbutton_locales="toolkit/torbutton/chrome/locale/"
|
122 | 128 | torbutton_jar="toolkit/torbutton/jar.mn"
|
... | ... | @@ -183,6 +183,7 @@ input_files: |
183 | 183 | - project: translation
|
184 | 184 | name: translation-base-browser
|
185 | 185 | pkg_type: base-browser
|
186 | + enable: '[% !c("var/testbuild") %]'
|
|
186 | 187 | - project: translation
|
187 | 188 | name: translation-base-browser-fluent
|
188 | 189 | pkg_type: base-browser-fluent
|
... | ... | @@ -190,7 +191,7 @@ input_files: |
190 | 191 | - project: translation
|
191 | 192 | name: translation-tor-browser
|
192 | 193 | pkg_type: tor-browser
|
193 | - enable: '[% c("var/tor-browser") %]'
|
|
194 | + enable: '[% c("var/tor-browser") && !c("var/testbuild") %]'
|
|
194 | 195 | - filename: namecoin-torbutton.patch
|
195 | 196 | enable: '[% c("var/namecoin") %]'
|
196 | 197 | # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin
|