Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
8dee2fe0
by Pier Angelo Vendrame at 2022-12-20T13:37:39+00:00
-
42660210
by Pier Angelo Vendrame at 2022-12-20T13:37:39+00:00
12 changed files:
- .gitlab/issue_templates/Release Prep - Alpha.md
- projects/fenix/build
- projects/fenix/config
- projects/firefox/build
- projects/firefox/config
- − projects/tba-translation/config
- − projects/translation-base-browser-fluent/build
- − projects/translation-base-browser-fluent/config
- − projects/translation-base-browser/build
- − projects/translation-base-browser/config
- projects/tba-translation/build → projects/translation/build
- + projects/translation/config
Changes:
... | ... | @@ -125,16 +125,11 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in |
125 | 125 | - [ ] Update `projects/firefox/config`
|
126 | 126 | - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag
|
127 | 127 | - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased
|
128 | - - [ ] Update `projects/translation-base-browser/config`
|
|
129 | - - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch
|
|
130 | - - [ ] Update `projects/translation-base-browser-fluent/config`
|
|
131 | - - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch
|
|
132 | -- [ ] ***(Optional)*** Update Android-specific build configs
|
|
133 | - - [ ] ***(Optional)*** Update `projects/geckoview/config`
|
|
134 | - - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag
|
|
135 | - - [ ] ***(Optional)*** `var/geckoview_version` : update to latest `$(ESR_VERSION)` if rebased
|
|
136 | - - [ ] Update `projects/tba-translations/config`:
|
|
137 | - - [ ] `git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch
|
|
128 | + - [ ] Update `projects/translation/config`:
|
|
129 | + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch
|
|
130 | + - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch
|
|
131 | + - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch
|
|
132 | + - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch
|
|
138 | 133 | - [ ] ***(Optional)*** Update `projects/tor-android-service/config`
|
139 | 134 | - [ ] `git_hash` : update with `HEAD` commit of project's `main` branch
|
140 | 135 | - [ ] ***(Optional)*** Update `projects/application-services/config`:
|
... | ... | @@ -32,7 +32,7 @@ EOF |
32 | 32 | nimbusdir=$builddir-[% c("version") %]/app/build/bin/nimbus
|
33 | 33 | mkdir -p $nimbusdir
|
34 | 34 | cp $distdir/application-services/nimbus-fml $nimbusdir/
|
35 | - tar -C $distdir -xf $rootdir/[% c('input_files_by_name/tba-translation') %]
|
|
35 | + tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %]
|
|
36 | 36 | [% END %]
|
37 | 37 | tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
|
38 | 38 | |
... | ... | @@ -60,7 +60,7 @@ v=[% c("variant") %] |
60 | 60 | [% FOREACH lang = c('var/locales_mobile');
|
61 | 61 | SET lang = tmpl(lang); %]
|
62 | 62 | # Copy our torbrowser_strings.xml at the right place
|
63 | - cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/
|
|
63 | + cp /var/tmp/dist/translation-fenix/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/
|
|
64 | 64 | [% END %]
|
65 | 65 | |
66 | 66 | # Prepare Glean dependencies for offline build
|
... | ... | @@ -46,8 +46,9 @@ input_files: |
46 | 46 | project: geckoview
|
47 | 47 | pkg_type: merge_aars
|
48 | 48 | enable: '[% !c("var/android_single_arch") %]'
|
49 | - - name: tba-translation
|
|
50 | - project: tba-translation
|
|
49 | + - name: translation-fenix
|
|
50 | + project: translation
|
|
51 | + pkg_type: fenix
|
|
51 | 52 | - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
|
52 | 53 | name: gradle-dependencies
|
53 | 54 | exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
|
... | ... | @@ -62,6 +62,10 @@ mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %] |
62 | 62 | |
63 | 63 | tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %]
|
64 | 64 | transl_base_browser=$rootdir/translation-base-browser
|
65 | +[% IF c("var/tor-browser") -%]
|
|
66 | + tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %]
|
|
67 | + transl_tor_browser=$rootdir/translation-tor-browser
|
|
68 | +[% END -%]
|
|
65 | 69 | |
66 | 70 | cd /var/tmp/build/[% project %]-[% c("version") %]
|
67 | 71 | cat > .mozconfig << 'MOZCONFIG_EOF'
|
... | ... | @@ -108,11 +112,6 @@ add_translation () { |
108 | 112 | component=$2
|
109 | 113 | lang=$3
|
110 | 114 | filename=$4
|
111 | - [% IF c("var/macos") -%]
|
|
112 | - if [ "$lang" == "ja-JP-mac" ]; then
|
|
113 | - lang="ja"
|
|
114 | - fi
|
|
115 | - [% END-%]
|
|
116 | 115 | |
117 | 116 | mkdir "browser/components/$component/locale/$lang"
|
118 | 117 | cp "$transl_dir/$lang/$filename" "browser/components/$component/locale/$lang/"
|
... | ... | @@ -121,9 +120,25 @@ add_translation () { |
121 | 120 | }
|
122 | 121 | |
123 | 122 | supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
|
123 | +[% IF c("var/tor-browser") -%]
|
|
124 | + torbutton_locales="toolkit/torbutton/chrome/locale/"
|
|
125 | + torbutton_jar="toolkit/torbutton/jar.mn"
|
|
126 | +[% END -%]
|
|
124 | 127 | for lang in $supported_locales; do
|
128 | + [% IF c("var/macos") -%]
|
|
129 | + if [ "$lang" == "ja-JP-mac" ]; then
|
|
130 | + lang="ja"
|
|
131 | + fi
|
|
132 | + [% END-%]
|
|
133 | + |
|
125 | 134 | add_translation $transl_base_browser newidentity $lang newIdentity.properties
|
126 | 135 | add_translation $transl_base_browser securitylevel $lang securityLevel.properties
|
136 | + |
|
137 | + [% IF c("var/tor-browser") -%]
|
|
138 | + mv "$transl_tor_browser/$lang" "$torbutton_locales/"
|
|
139 | + echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar"
|
|
140 | + echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar"
|
|
141 | + [% END -%]
|
|
127 | 142 | done
|
128 | 143 | |
129 | 144 | rm -f configure
|
... | ... | @@ -181,11 +181,17 @@ input_files: |
181 | 181 | enable: '[% c("var/linux") %]'
|
182 | 182 | - filename: start-firefox
|
183 | 183 | enable: '[% c("var/linux") %]'
|
184 | - - project: translation-base-browser
|
|
184 | + - project: translation
|
|
185 | 185 | name: translation-base-browser
|
186 | - - project: translation-base-browser-fluent
|
|
186 | + pkg_type: base-browser
|
|
187 | + - project: translation
|
|
187 | 188 | name: translation-base-browser-fluent
|
189 | + pkg_type: base-browser-fluent
|
|
188 | 190 | enable: '[% !c("var/testbuild") %]'
|
191 | + - project: translation
|
|
192 | + name: translation-tor-browser
|
|
193 | + pkg_type: tor-browser
|
|
194 | + enable: '[% c("var/tor-browser") %]'
|
|
189 | 195 | - filename: namecoin-torbutton.patch
|
190 | 196 | enable: '[% c("var/namecoin") %]'
|
191 | 197 | # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin
|
1 | -# vim: filetype=yaml sw=2
|
|
2 | -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
|
|
3 | -git_url: https://gitlab.torproject.org/tpo/translation.git
|
|
4 | -# We need to bump the commit before releasing but just pointing to a branch
|
|
5 | -# might cause too much rebuidling of the Firefox part.
|
|
6 | -git_hash: 462686c5f3fc57ba17ea8804c76e425682ed522f
|
|
7 | -version: '[% c("abbrev") %]' |
1 | -#!/bin/bash
|
|
2 | -[% c("var/set_default_env") -%]
|
|
3 | -tar xf [% project %]-[% c("version") %].tar.gz
|
|
4 | -mv [% project %]-[% c("version") %] [% project %]
|
|
5 | -# We do not need new identity for now, only languageNotification.ftl
|
|
6 | -find [% project %] -name new-identity.ftl -delete
|
|
7 | -[% c('tar', {
|
|
8 | - tar_src => [ project ],
|
|
9 | - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
|
|
10 | - }) %] |
1 | -# vim: filetype=yaml sw=2
|
|
2 | -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
|
|
3 | -git_url: https://gitlab.torproject.org/tpo/translation.git
|
|
4 | -git_hash: 55b370953218b77f3bee6fc7b819bc8c9a7bb699
|
|
5 | -version: '[% c("abbrev") %]'
|
|
6 | - |
|
7 | -targets:
|
|
8 | - nightly:
|
|
9 | - git_hash: 'basebrowser-newidentityftl' |
1 | -#!/bin/bash
|
|
2 | -[% c("var/set_default_env") -%]
|
|
3 | -tar xf [% project %]-[% c("version") %].tar.gz
|
|
4 | -mv [% project %]-[% c("version") %] [% project %]
|
|
5 | -[% c('tar', {
|
|
6 | - tar_src => [ project ],
|
|
7 | - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
|
|
8 | - }) %] |
1 | -# vim: filetype=yaml sw=2
|
|
2 | -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
|
|
3 | -git_url: https://gitlab.torproject.org/tpo/translation.git
|
|
4 | -git_hash: 7bcd63fc23945231facd75d1316c534c12f08a31
|
|
5 | -version: '[% c("abbrev") %]' |
1 | 1 | #!/bin/bash
|
2 | 2 | [% c("var/set_default_env") -%]
|
3 | 3 | tar xf [% project %]-[% c("version") %].tar.gz
|
4 | -mv [% project %]-[% c("version") %] [% project %]
|
|
4 | +mv [% project %]-[% c("version") %] [% project %]-[% c("step") %]
|
|
5 | +[% SET tar_source = project _ '-' _ c('step') -%]
|
|
5 | 6 | [% c('tar', {
|
6 | - tar_src => [ project ],
|
|
7 | + tar_src => [ tar_source ],
|
|
7 | 8 | tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
|
8 | 9 | }) %] |
1 | +# vim: filetype=yaml sw=2
|
|
2 | +filename: '[% project %]-[% c("step") %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
|
|
3 | +git_url: https://gitlab.torproject.org/tpo/translation.git
|
|
4 | +version: '[% c("abbrev") %]'
|
|
5 | + |
|
6 | +steps:
|
|
7 | + base-browser:
|
|
8 | + base-browser: '[% INCLUDE build %]'
|
|
9 | + git_hash: f3c816f0fde87471f98e46515482a493c4eb57dc
|
|
10 | + targets:
|
|
11 | + nightly:
|
|
12 | + git_hash: 'base-browser'
|
|
13 | + base-browser-fluent:
|
|
14 | + base-browser-fluent: '[% INCLUDE build %]'
|
|
15 | + git_hash: d771fd689978f52053e8a14bb622c936aa938769
|
|
16 | + targets:
|
|
17 | + nightly:
|
|
18 | + git_hash: 'basebrowser-newidentityftl'
|
|
19 | + tor-browser:
|
|
20 | + tor-browser: '[% INCLUDE build %]'
|
|
21 | + git_hash: 4cd0600f352a6883462dbdc1b59119a0a946be10
|
|
22 | + targets:
|
|
23 | + nightly:
|
|
24 | + git_hash: 'tor-browser'
|
|
25 | + fenix:
|
|
26 | + fenix: '[% INCLUDE build %]'
|
|
27 | + # We need to bump the commit before releasing but just pointing to a branch
|
|
28 | + # might cause too much rebuidling of the Firefox part.
|
|
29 | + git_hash: 34fb5d37834db13ec656e43d2fe7cee41d90ec35
|
|
30 | + targets:
|
|
31 | + nightly:
|
|
32 | + git_hash: 'fenix-torbrowserstringsxml' |