Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
- 
89147beb
by Pier Angelo Vendrame at 2023-02-21T09:42:44+01:00
3 changed files:
Changes:
| ... | ... | @@ -106,7 +106,7 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system | 
| 106 | 106 |  # Create .mozbuild to avoid interactive prompt in configure
 | 
| 107 | 107 |  mkdir "$HOME/.mozbuild"
 | 
| 108 | 108 | |
| 109 | -[% IF !c("var/testbuild") -%]
 | |
| 109 | +[% IF c("var/has_l10n") -%]
 | |
| 110 | 110 |    supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
 | 
| 111 | 111 | |
| 112 | 112 |    l10ncentral="$HOME/.mozbuild/l10n-central"
 | 
| ... | ... | @@ -176,7 +176,7 @@ export LANG=C.UTF-8 | 
| 176 | 176 |    [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]
 | 
| 177 | 177 | |
| 178 | 178 |  ./mach build --verbose
 | 
| 179 | -[% IF !c("var/testbuild") %]
 | |
| 179 | +[% IF c("var/has_l10n") %]
 | |
| 180 | 180 |    export MOZ_CHROME_MULTILOCALE="$supported_locales"
 | 
| 181 | 181 |    # No quotes on purpose, see https://firefox-source-docs.mozilla.org/build/buildsystem/locales.html#instructions-for-multi-locale-builds
 | 
| 182 | 182 |    ./mach package-multi-locale --locales en-US $MOZ_CHROME_MULTILOCALE
 | 
| ... | ... | @@ -27,6 +27,7 @@ var: | 
| 27 | 27 |      - autoconf2.13
 | 
| 28 | 28 |      - yasm
 | 
| 29 | 29 |      - pkg-config
 | 
| 30 | +  has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]'
 | |
| 30 | 31 | |
| 31 | 32 |    rezip: |
 | 
| 32 | 33 |      rezip_tmpdir=$(mktemp -d)
 | 
| ... | ... | @@ -159,7 +160,7 @@ input_files: | 
| 159 | 160 |      name: cbindgen
 | 
| 160 | 161 |    - project: firefox-l10n
 | 
| 161 | 162 |      name: firefox-l10n
 | 
| 162 | -    enable: '[% !c("var/testbuild") %]'
 | |
| 163 | +    enable: '[% c("var/has_l10n") %]'
 | |
| 163 | 164 |    - project: wasi-sysroot
 | 
| 164 | 165 |      name: wasi-sysroot
 | 
| 165 | 166 |      enable: '[% c("var/rlbox") %]'
 | 
| ... | ... | @@ -183,15 +184,15 @@ input_files: | 
| 183 | 184 |    - project: translation
 | 
| 184 | 185 |      name: translation-base-browser
 | 
| 185 | 186 |      pkg_type: base-browser
 | 
| 186 | -    enable: '[% !c("var/testbuild") %]'
 | |
| 187 | +    enable: '[% c("var/has_l10n") %]'
 | |
| 187 | 188 |    - project: translation
 | 
| 188 | 189 |      name: translation-base-browser-fluent
 | 
| 189 | 190 |      pkg_type: base-browser-fluent
 | 
| 190 | -    enable: '[% !c("var/testbuild") %]'
 | |
| 191 | +    enable: '[% c("var/has_l10n") %]'
 | |
| 191 | 192 |    - project: translation
 | 
| 192 | 193 |      name: translation-tor-browser
 | 
| 193 | 194 |      pkg_type: tor-browser
 | 
| 194 | -    enable: '[% c("var/tor-browser") && !c("var/testbuild") %]'
 | |
| 195 | +    enable: '[% c("var/tor-browser") && c("var/has_l10n") %]'
 | |
| 195 | 196 |    - filename: namecoin-torbutton.patch
 | 
| 196 | 197 |      enable: '[% c("var/namecoin") %]'
 | 
| 197 | 198 |      # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin
 | 
| ... | ... | @@ -247,6 +247,7 @@ targets: | 
| 247 | 247 |        ProjectName: PrivacyBrowser
 | 
| 248 | 248 |        exe_name: privacybrowser
 | 
| 249 | 249 |        updater_enabled: 0
 | 
| 250 | +      locales: []
 | |
| 250 | 251 | |
| 251 | 252 |    torbrowser-testbuild:
 | 
| 252 | 253 |      - testbuild
 |