boklm pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

13 changed files:

Changes:

  • .gitignore
    ... ... @@ -3,7 +3,6 @@
    3 3 
     /gclient
    4 4 
     /out
    5 5 
     /torbrowser
    6 
    -/basebrowser
    7 6 
     /mullvadbrowser
    8 7 
     /testbuild
    9 8 
     /rbm.local.conf

  • Makefile
    ... ... @@ -236,154 +236,6 @@ torbrowser-compare-mar-signed-unsigned-alpha: submodule-update
    236 236 
     	$(rbm) build release --step compare_mar_signed_unsigned --target alpha --target signed --target torbrowser
    237 237
    238 238
    239 
    -########################
    240 
    -# Base Browser Targets #
    241 
    -########################
    242 
    -
    243 
    -basebrowser-release: submodule-update
    244 
    -	$(rbm) build release --target release --target browser-all --target basebrowser
    245 
    -
    246 
    -basebrowser-release-android-armv7: submodule-update
    247 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target basebrowser
    248 
    -
    249 
    -basebrowser-release-android-aarch64: submodule-update
    250 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    251 
    -
    252 
    -basebrowser-release-android-x86_64: submodule-update
    253 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    254 
    -
    255 
    -basebrowser-release-linux-x86_64: submodule-update
    256 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    257 
    -
    258 
    -basebrowser-release-linux-x86_64-asan: submodule-update
    259 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    260 
    -
    261 
    -basebrowser-release-linux-aarch64: submodule-update
    262 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    263 
    -
    264 
    -basebrowser-release-windows-i686: submodule-update
    265 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-windows-i686 --target basebrowser
    266 
    -
    267 
    -basebrowser-release-windows-x86_64: submodule-update
    268 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
    269 
    -
    270 
    -basebrowser-release-macos: submodule-update
    271 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-macos --target basebrowser
    272 
    -
    273 
    -basebrowser-release-src: submodule-update
    274 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-src --target basebrowser
    275 
    -
    276 
    -basebrowser-alpha: submodule-update
    277 
    -	$(rbm) build release --target alpha --target browser-all --target basebrowser
    278 
    -
    279 
    -basebrowser-alpha-android-armv7: submodule-update
    280 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target basebrowser
    281 
    -
    282 
    -basebrowser-alpha-android-aarch64: submodule-update
    283 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    284 
    -
    285 
    -basebrowser-alpha-android-x86_64: submodule-update
    286 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    287 
    -
    288 
    -basebrowser-alpha-linux-x86_64: submodule-update
    289 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    290 
    -
    291 
    -basebrowser-alpha-linux-x86_64-asan: submodule-update
    292 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    293 
    -
    294 
    -basebrowser-alpha-linux-aarch64: submodule-update
    295 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    296 
    -
    297 
    -basebrowser-alpha-windows-i686: submodule-update
    298 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-i686 --target basebrowser
    299 
    -
    300 
    -basebrowser-alpha-windows-x86_64: submodule-update
    301 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
    302 
    -
    303 
    -basebrowser-alpha-macos: submodule-update
    304 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-macos --target basebrowser
    305 
    -
    306 
    -basebrowser-alpha-src: submodule-update
    307 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-src --target basebrowser
    308 
    -
    309 
    -basebrowser-nightly: submodule-update
    310 
    -	$(rbm) build release --target nightly --target browser-all --target basebrowser
    311 
    -
    312 
    -basebrowser-nightly-android-armv7: submodule-update
    313 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target basebrowser
    314 
    -
    315 
    -basebrowser-nightly-android-aarch64: submodule-update
    316 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    317 
    -
    318 
    -basebrowser-nightly-android-x86_64: submodule-update
    319 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    320 
    -
    321 
    -basebrowser-nightly-linux-x86_64: submodule-update
    322 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    323 
    -
    324 
    -basebrowser-nightly-linux-x86_64-asan: submodule-update
    325 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    326 
    -
    327 
    -basebrowser-nightly-linux-aarch64: submodule-update
    328 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    329 
    -
    330 
    -basebrowser-nightly-windows-i686: submodule-update
    331 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-i686 --target basebrowser
    332 
    -
    333 
    -basebrowser-nightly-windows-x86_64: submodule-update
    334 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
    335 
    -
    336 
    -basebrowser-nightly-macos: submodule-update
    337 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-macos --target basebrowser
    338 
    -
    339 
    -basebrowser-nightly-src: submodule-update
    340 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-src --target basebrowser
    341 
    -
    342 
    -basebrowser-testbuild: submodule-update
    343 
    -	$(rbm) build release --target testbuild --target browser-all --target basebrowser
    344 
    -
    345 
    -basebrowser-testbuild-android-armv7: submodule-update
    346 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target basebrowser
    347 
    -
    348 
    -basebrowser-testbuild-android-aarch64: submodule-update
    349 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    350 
    -
    351 
    -basebrowser-testbuild-android-x86_64: submodule-update
    352 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    353 
    -
    354 
    -basebrowser-testbuild-linux-x86_64: submodule-update
    355 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    356 
    -
    357 
    -basebrowser-testbuild-linux-x86_64-asan: submodule-update
    358 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    359 
    -
    360 
    -basebrowser-testbuild-linux-aarch64: submodule-update
    361 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    362 
    -
    363 
    -basebrowser-testbuild-windows-x86_64: submodule-update
    364 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
    365 
    -
    366 
    -basebrowser-testbuild-windows-i686: submodule-update
    367 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-i686 --target basebrowser
    368 
    -
    369 
    -basebrowser-testbuild-macos: submodule-update
    370 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos --target basebrowser
    371 
    -
    372 
    -basebrowser-testbuild-macos-x86_64: submodule-update
    373 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-x86_64 --target basebrowser
    374 
    -
    375 
    -basebrowser-testbuild-macos-aarch64: submodule-update
    376 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-aarch64 --target basebrowser
    377 
    -
    378 
    -basebrowser-testbuild-src: submodule-update
    379 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-src-testbuild --target basebrowser
    380 
    -
    381 
    -basebrowser-incrementals-nightly: submodule-update
    382 
    -	$(rbm) build release --step update_responses_config --target nightly --target basebrowser
    383 
    -	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly
    384 
    -	$(rbm) build release --step hash_incrementals --target nightly --target basebrowser
    385 
    -
    386 
    -
    387 239 
     ###########################
    388 240 
     # Mullvad Browser Targets #
    389 241 
     ###########################

  • README
    ... ... @@ -144,9 +144,9 @@ mar file will be created. If you want to base your testbuild on the latest
    144 144 
     nightly code insted, rename rbm.local.conf.example to rbm.local.conf
    145 145 
     and adapt the torbrowser-testbuild option accordingly.
    146 146
    147 
    -Similar makefile targets exist for building Base Browser and Mullvad Browser
    148 
    -instead of Tor Browser. To build Base Browser, replace `torbrowser` by
    149 
    -`basebrowser` in the target name. For Mullvad Browser, use `mullvadbrowser`.
    147 
    +Similar makefile targets exist for building Mullvad Browser instead of
    148 
    +Tor Browser. To build Mullvad Browser, replace `torbrowser` by
    149 
    +`mullvadbrowser` in the target name.
    150 150
    151 151
    152 152 
     Updating git sources

  • doc/MAKEFILE.txt
    ... ... @@ -82,11 +82,6 @@ torbrowser-{release,alpha,nightly,testbuild}-src
    82 82 
     ------------------------------------------------
    83 83 
     Create source tarballs for firefox and torbutton.
    84 84
    85 
    -basebrowser-*
    86 
    --------------
    87 
    -The same rules for building Tor Browser also exist for building
    88 
    -Base Browser.
    89 
    -
    90 85 
     mullvadbrowser-*
    91 86 
     ----------------
    92 87 
     The same rules for building Tor Browser also exist for building

  • projects/browser/config
    ... ... @@ -58,10 +58,6 @@ targets:
    58 58 
           prefs_file: 000-tor-browser.js
    59 59 
           version_json: tbb_version.json
    60 60
    61 
    -  basebrowser:
    62 
    -    var:
    63 
    -      prefs_file: 001-base-profile.js
    64 
    -
    65 61 
       mullvadbrowser:
    66 62 
         var:
    67 63 
           prefs_file: 001-base-profile.js

  • projects/browser/windows-installer/defines.nsh.in
    ... ... @@ -17,11 +17,7 @@
    17 17
    18 18 
       !define DEFAULT_PORTABLE_DIR "$DESKTOP\${DISPLAY_NAME}"
    19 19 
       !define EXE_NAME "[% c('var/exe_name') %].exe"
    20 
    -[% IF !c("var/base-browser") -%]
    21 20 
       !define ICON_NAME "[% c('var/projectname') %]-[% c('var/channel') %].ico"
    22 
    -[% ELSE -%]
    23 
    -  !define ICON_NAME "[% c('var/projectname') %].ico"
    24 
    -[% END -%]
    25 21 
       !define WELCOME_IMAGE "[% c('var/projectname') %]-[% c('var/channel') %].bmp"
    26 22
    27 23 
     [% IF c('var/mullvad-browser') -%]

  • projects/firefox/build
    ... ... @@ -115,7 +115,7 @@ echo "Starting ./mach configure $(date)"
    115 115 
       --with-distribution-id=org.torproject \
    116 116 
       [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \
    117 117 
       [% IF c("var/updater_enabled") -%]--enable-update-channel=[% c("var/channel") %][% END %] \
    118 
    -  [% IF !c("var/base-browser") && !c("var/firefox-browser") -%]--with-branding="$branding_dir"[% END %] \
    118 
    +  [% IF !c("var/firefox-browser") -%]--with-branding="$branding_dir"[% END %] \
    119 119 
       [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]
    120 120
    121 121 
     echo "Starting ./mach build $(date)"
    ... ... @@ -164,9 +164,6 @@ echo "Starting ./mach build $(date)"
    164 164
    165 165 
     [% IF c("var/macos") -%]
    166 166 
       cp -a obj-*/dist/[% c('var/exe_name') %]/* $distdir
    167 
    -  [% IF c("var/base-browser") -%]
    168 
    -    mv "$distdir/Firefox.app" "$distdir/[% c('var/display_name') %].app"
    169 
    -  [% END -%]
    170 167 
       [% IF c("var/firefox-browser") -%]
    171 168 
         mv "$distdir/Nightly.app" "$distdir/[% c('var/display_name') %].app"
    172 169 
       [% END -%]

  • projects/firefox/config
    ... ... @@ -105,11 +105,6 @@ targets:
    105 105 
           updater_url: ''
    106 106 
           has_l10n: 0
    107 107
    108 
    -  basebrowser:
    109 
    -    var:
    110 
    -      nightly_updates_publish_dir_prefix: basebrowser-
    111 
    -      mar_id_prefix: 'basebrowser-torproject'
    112 
    -
    113 108 
       nightly:
    114 109 
         git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]'
    115 110 
         tag_gpg_id: 0

  • projects/go/config
    ... ... @@ -86,4 +86,4 @@ input_files:
    86 86 
       - project: go-bootstrap
    87 87 
         name: go-bootstrap
    88 88 
         target_replace:
    89 
    -      '^.*browser-(?!testbuild).*': 'basebrowser-linux-x86_64'
    89 
    +      '^.*browser-(?!testbuild).*': 'torbrowser-linux-x86_64'

  • projects/linux-packages/config
    ... ... @@ -108,9 +108,6 @@ targets:
    108 108 
           browser_type: torbrowser
    109 109 
           system_pkg:
    110 110 
             pkg_url: 'https://torproject.org/'
    111 
    -  basebrowser:
    112 
    -    var:
    113 
    -      browser_type: basebrowser
    114 111 
       mullvadbrowser:
    115 112 
         var:
    116 113 
           browser_type: mullvadbrowser

  • projects/release/config
    ... ... @@ -97,9 +97,6 @@ targets:
    97 97 
         var:
    98 98 
           browser_type: torbrowser
    99 99 
           git_tag_prefix: tbb
    100 
    -  basebrowser:
    101 
    -    var:
    102 
    -      browser_type: basebrowser
    103 100 
       mullvadbrowser:
    104 101 
         var:
    105 102 
           browser_type: mullvadbrowser

  • rbm.conf
    ... ... @@ -363,15 +363,6 @@ targets:
    363 363 
           project_initials: tb
    364 364 
           project_description: 'Tor Browser is a privacy-focused web browser designed to minimize tracking and fingerprinting, using the Tor network to protect your privacy and anonymity.'
    365 365
    366 
    -  basebrowser:
    367 
    -    var:
    368 
    -      base-browser: 1
    369 
    -      project-name: base-browser
    370 
    -      projectname: basebrowser
    371 
    -      Project_Name: 'Base Browser'
    372 
    -      ProjectName: BaseBrowser
    373 
    -      updater_enabled: '[% c("var/nightly") %]'
    374 
    -
    375 366 
       # Target to build upstream firefox commit (in projects/firefox and
    376 367 
       # projects/geckoview) instead of our patched branch
    377 368 
       firefoxbrowser:
    ... ... @@ -422,10 +413,6 @@ targets:
    422 413 
         - testbuild
    423 414 
         - alpha
    424 415 
         - torbrowser
    425 
    -  basebrowser-testbuild:
    426 
    -    - testbuild
    427 
    -    - alpha
    428 
    -    - basebrowser
    429 416 
       mullvadbrowser-testbuild:
    430 417 
         - testbuild
    431 418 
         - alpha
    ... ... @@ -442,10 +429,6 @@ targets:
    442 429 
         - android-armv7
    443 430 
         - android
    444 431 
         - torbrowser
    445 
    -  basebrowser-android-armv7:
    446 
    -    - android-armv7
    447 
    -    - android
    448 
    -    - basebrowser
    449 432 
       firefoxbrowser-android-armv7:
    450 433 
         - android-armv7
    451 434 
         - android
    ... ... @@ -462,10 +445,6 @@ targets:
    462 445 
         - android-x86_64
    463 446 
         - android
    464 447 
         - torbrowser
    465 
    -  basebrowser-android-x86_64:
    466 
    -    - android-x86_64
    467 
    -    - android
    468 
    -    - basebrowser
    469 448 
       firefoxbrowser-android-x86_64:
    470 449 
         - android-x86_64
    471 450 
         - android
    ... ... @@ -482,10 +461,6 @@ targets:
    482 461 
         - android-aarch64
    483 462 
         - android
    484 463 
         - torbrowser
    485 
    -  basebrowser-android-aarch64:
    486 
    -    - android-aarch64
    487 
    -    - android
    488 
    -    - basebrowser
    489 464 
       firefoxbrowser-android-aarch64:
    490 465 
         - android-aarch64
    491 466 
         - android
    ... ... @@ -528,10 +503,6 @@ targets:
    528 503 
         - linux-x86_64
    529 504 
         - linux
    530 505 
         - torbrowser
    531 
    -  basebrowser-linux-x86_64:
    532 
    -    - linux-x86_64
    533 
    -    - linux
    534 
    -    - basebrowser
    535 506 
       mullvadbrowser-linux-x86_64:
    536 507 
         - linux-x86_64
    537 508 
         - linux
    ... ... @@ -545,11 +516,6 @@ targets:
    545 516 
         - linux-x86_64
    546 517 
         - linux
    547 518 
         - torbrowser
    548 
    -  basebrowser-linux-x86_64-asan:
    549 
    -    - linux-asan
    550 
    -    - linux-x86_64
    551 
    -    - linux
    552 
    -    - basebrowser
    553 519 
       mullvadbrowser-linux-x86_64-asan:
    554 520 
         - linux-asan
    555 521 
         - linux-x86_64
    ... ... @@ -560,11 +526,6 @@ targets:
    560 526 
         - linux-aarch64
    561 527 
         - linux
    562 528 
         - torbrowser
    563 
    -  basebrowser-linux-aarch64:
    564 
    -    - linux-cross
    565 
    -    - linux-aarch64
    566 
    -    - linux
    567 
    -    - basebrowser
    568 529 
       mullvadbrowser-linux-aarch64:
    569 530 
         - linux-cross
    570 531 
         - linux-aarch64
    ... ... @@ -631,10 +592,6 @@ targets:
    631 592 
         - windows-i686
    632 593 
         - windows
    633 594 
         - torbrowser
    634 
    -  basebrowser-windows-i686:
    635 
    -    - windows-i686
    636 
    -    - windows
    637 
    -    - basebrowser
    638 595 
       firefoxbrowser-windows-i686:
    639 596 
         - windows-i686
    640 597 
         - windows
    ... ... @@ -643,10 +600,6 @@ targets:
    643 600 
         - windows-x86_64
    644 601 
         - windows
    645 602 
         - torbrowser
    646 
    -  basebrowser-windows-x86_64:
    647 
    -    - windows-x86_64
    648 
    -    - windows
    649 
    -    - basebrowser
    650 603 
       mullvadbrowser-windows-x86_64:
    651 604 
         - windows-x86_64
    652 605 
         - windows
    ... ... @@ -704,19 +657,6 @@ targets:
    704 657 
         - macos-aarch64
    705 658 
         - macos
    706 659 
         - torbrowser
    707 
    -  basebrowser-macos:
    708 
    -    - macos-universal
    709 
    -    - macos-x86_64
    710 
    -    - macos
    711 
    -    - basebrowser
    712 
    -  basebrowser-macos-x86_64:
    713 
    -    - macos-x86_64
    714 
    -    - macos
    715 
    -    - basebrowser
    716 
    -  basebrowser-macos-aarch64:
    717 
    -    - macos-aarch64
    718 
    -    - macos
    719 
    -    - basebrowser
    720 660 
       mullvadbrowser-macos:
    721 661 
         - macos-universal
    722 662 
         - macos-x86_64

  • tools/signing/set-config
    ... ... @@ -14,7 +14,6 @@ test -n "${SIGNING_PROJECTNAME+x}" \
    14 14 
       || exit_error 'SIGNING_PROJECTNAME is not set'
    15 15
    16 16 
     test "$SIGNING_PROJECTNAME" = 'torbrowser' \
    17 
    -  || test "$SIGNING_PROJECTNAME" = 'basebrowser' \
    18 17 
       || test "$SIGNING_PROJECTNAME" = 'mullvadbrowser' \
    19 18 
       || test "$SIGNING_PROJECTNAME" = 'torvpn' \
    20 19 
       || exit_error "Unknown SIGNING_PROJECTNAME $SIGNING_PROJECTNAME"

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a09a86d2c99aa83b1f5a2c936530ad2fc1feb257 at 1771237675