Pier Angelo Vendrame pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build

Commits:

12 changed files:

Changes:

  • projects/fenix/build
    ... ... @@ -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

  • projects/fenix/config
    ... ... @@ -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" %]'

  • projects/firefox/build
    ... ... @@ -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

  • projects/firefox/config
    ... ... @@ -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

  • projects/tba-translation/config deleted
    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: 34fb5d37834db13ec656e43d2fe7cee41d90ec35
    7 
    -version: '[% c("abbrev") %]'

  • projects/translation-base-browser-fluent/build deleted
    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 
    -    }) %]

  • projects/translation-base-browser-fluent/config deleted
    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: e1bb5278668e71317ccbf1fdd21cf25c4d56b95c
    5 
    -version: '[% c("abbrev") %]'
    6 
    -
    7 
    -targets:
    8 
    -  nightly:
    9 
    -    git_hash: 'basebrowser-newidentityftl'

  • projects/translation-base-browser/build deleted
    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 
    -    }) %]

  • projects/translation-base-browser/config deleted
    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: f3c816f0fde87471f98e46515482a493c4eb57dc
    5 
    -version: '[% c("abbrev") %]'

  • projects/tba-translation/build → projects/translation/build
    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 
         }) %]

  • projects/translation/config
    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: d1aa584f3da4c2fc6bfe5d289e2783705ee7e015
    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: a73ed9756f5d9a753fb7c3c7676174e4d9b68dee
    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: 5e1d058123f3a5d34a59799bd6f80db5d71e563e
    30 
    +    targets:
    31 
    +      nightly:
    32 
    +        git_hash: 'fenix-torbrowserstringsxml'

  • tools/get-translation-hashes
    1 
    +#!/bin/bash
    2 
    +
    3 
    +cd "$(dirname "$0")/../git_clones/translation"
    4 
    +git fetch > /dev/null 2>&1
    5 
    +
    6 
    +echo -n "base-browser: "
    7 
    +git rev-parse origin/base-browser
    8 
    +echo -n "base-browser-fluent: "
    9 
    +git rev-parse origin/basebrowser-newidentityftl
    10 
    +echo -n "tor-browser: "
    11 
    +git rev-parse origin/tor-browser
    12 
    +echo -n "fenix: "
    13 
    +git rev-parse origin/fenix-torbrowserstringsxml

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help