boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: a09a86d2 by Nicolas Vigier at 2026-02-12T19:46:23+01:00 Bug 41693: Drop base-browser targets - - - - - 13 changed files: - .gitignore - Makefile - README - doc/MAKEFILE.txt - projects/browser/config - projects/browser/windows-installer/defines.nsh.in - projects/firefox/build - projects/firefox/config - projects/go/config - projects/linux-packages/config - projects/release/config - rbm.conf - tools/signing/set-config Changes: ===================================== .gitignore ===================================== @@ -3,7 +3,6 @@ /gclient /out /torbrowser -/basebrowser /mullvadbrowser /testbuild /rbm.local.conf ===================================== Makefile ===================================== @@ -236,154 +236,6 @@ torbrowser-compare-mar-signed-unsigned-alpha: submodule-update $(rbm) build release --step compare_mar_signed_unsigned --target alpha --target signed --target torbrowser -######################## -# Base Browser Targets # -######################## - -basebrowser-release: submodule-update - $(rbm) build release --target release --target browser-all --target basebrowser - -basebrowser-release-android-armv7: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target basebrowser - -basebrowser-release-android-aarch64: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target basebrowser - -basebrowser-release-android-x86_64: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target basebrowser - -basebrowser-release-linux-x86_64: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target basebrowser - -basebrowser-release-linux-x86_64-asan: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser - -basebrowser-release-linux-aarch64: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target basebrowser - -basebrowser-release-windows-i686: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-windows-i686 --target basebrowser - -basebrowser-release-windows-x86_64: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-windows-x86_64 --target basebrowser - -basebrowser-release-macos: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-macos --target basebrowser - -basebrowser-release-src: submodule-update - $(rbm) build release --target release --target browser-single-platform --target browser-src --target basebrowser - -basebrowser-alpha: submodule-update - $(rbm) build release --target alpha --target browser-all --target basebrowser - -basebrowser-alpha-android-armv7: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target basebrowser - -basebrowser-alpha-android-aarch64: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target basebrowser - -basebrowser-alpha-android-x86_64: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target basebrowser - -basebrowser-alpha-linux-x86_64: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target basebrowser - -basebrowser-alpha-linux-x86_64-asan: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser - -basebrowser-alpha-linux-aarch64: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target basebrowser - -basebrowser-alpha-windows-i686: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-windows-i686 --target basebrowser - -basebrowser-alpha-windows-x86_64: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-windows-x86_64 --target basebrowser - -basebrowser-alpha-macos: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-macos --target basebrowser - -basebrowser-alpha-src: submodule-update - $(rbm) build release --target alpha --target browser-single-platform --target browser-src --target basebrowser - -basebrowser-nightly: submodule-update - $(rbm) build release --target nightly --target browser-all --target basebrowser - -basebrowser-nightly-android-armv7: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target basebrowser - -basebrowser-nightly-android-aarch64: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target basebrowser - -basebrowser-nightly-android-x86_64: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target basebrowser - -basebrowser-nightly-linux-x86_64: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target basebrowser - -basebrowser-nightly-linux-x86_64-asan: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser - -basebrowser-nightly-linux-aarch64: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target basebrowser - -basebrowser-nightly-windows-i686: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-windows-i686 --target basebrowser - -basebrowser-nightly-windows-x86_64: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-windows-x86_64 --target basebrowser - -basebrowser-nightly-macos: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-macos --target basebrowser - -basebrowser-nightly-src: submodule-update - $(rbm) build release --target nightly --target browser-single-platform --target browser-src --target basebrowser - -basebrowser-testbuild: submodule-update - $(rbm) build release --target testbuild --target browser-all --target basebrowser - -basebrowser-testbuild-android-armv7: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target basebrowser - -basebrowser-testbuild-android-aarch64: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target basebrowser - -basebrowser-testbuild-android-x86_64: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target basebrowser - -basebrowser-testbuild-linux-x86_64: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target basebrowser - -basebrowser-testbuild-linux-x86_64-asan: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser - -basebrowser-testbuild-linux-aarch64: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target basebrowser - -basebrowser-testbuild-windows-x86_64: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-x86_64 --target basebrowser - -basebrowser-testbuild-windows-i686: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-i686 --target basebrowser - -basebrowser-testbuild-macos: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-macos --target basebrowser - -basebrowser-testbuild-macos-x86_64: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-x86_64 --target basebrowser - -basebrowser-testbuild-macos-aarch64: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-aarch64 --target basebrowser - -basebrowser-testbuild-src: submodule-update - $(rbm) build release --target testbuild --target browser-single-platform --target browser-src-testbuild --target basebrowser - -basebrowser-incrementals-nightly: submodule-update - $(rbm) build release --step update_responses_config --target nightly --target basebrowser - NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly - $(rbm) build release --step hash_incrementals --target nightly --target basebrowser - - ########################### # Mullvad Browser Targets # ########################### ===================================== README ===================================== @@ -144,9 +144,9 @@ mar file will be created. If you want to base your testbuild on the latest nightly code insted, rename rbm.local.conf.example to rbm.local.conf and adapt the torbrowser-testbuild option accordingly. -Similar makefile targets exist for building Base Browser and Mullvad Browser -instead of Tor Browser. To build Base Browser, replace `torbrowser` by -`basebrowser` in the target name. For Mullvad Browser, use `mullvadbrowser`. +Similar makefile targets exist for building Mullvad Browser instead of +Tor Browser. To build Mullvad Browser, replace `torbrowser` by +`mullvadbrowser` in the target name. Updating git sources ===================================== doc/MAKEFILE.txt ===================================== @@ -82,11 +82,6 @@ torbrowser-{release,alpha,nightly,testbuild}-src ------------------------------------------------ Create source tarballs for firefox and torbutton. -basebrowser-* -------------- -The same rules for building Tor Browser also exist for building -Base Browser. - mullvadbrowser-* ---------------- The same rules for building Tor Browser also exist for building ===================================== projects/browser/config ===================================== @@ -58,10 +58,6 @@ targets: prefs_file: 000-tor-browser.js version_json: tbb_version.json - basebrowser: - var: - prefs_file: 001-base-profile.js - mullvadbrowser: var: prefs_file: 001-base-profile.js ===================================== projects/browser/windows-installer/defines.nsh.in ===================================== @@ -17,11 +17,7 @@ !define DEFAULT_PORTABLE_DIR "$DESKTOP\${DISPLAY_NAME}" !define EXE_NAME "[% c('var/exe_name') %].exe" -[% IF !c("var/base-browser") -%] !define ICON_NAME "[% c('var/projectname') %]-[% c('var/channel') %].ico" -[% ELSE -%] - !define ICON_NAME "[% c('var/projectname') %].ico" -[% END -%] !define WELCOME_IMAGE "[% c('var/projectname') %]-[% c('var/channel') %].bmp" [% IF c('var/mullvad-browser') -%] ===================================== projects/firefox/build ===================================== @@ -115,7 +115,7 @@ echo "Starting ./mach configure $(date)" --with-distribution-id=org.torproject \ [% IF !c("var/firefox-browser") %]--with-base-browser-version=[% c("var/torbrowser_version") %][% END %] \ [% IF c("var/updater_enabled") -%]--enable-update-channel=[% c("var/channel") %][% END %] \ - [% IF !c("var/base-browser") && !c("var/firefox-browser") -%]--with-branding="$branding_dir"[% END %] \ + [% IF !c("var/firefox-browser") -%]--with-branding="$branding_dir"[% END %] \ [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %] echo "Starting ./mach build $(date)" @@ -164,9 +164,6 @@ echo "Starting ./mach build $(date)" [% IF c("var/macos") -%] cp -a obj-*/dist/[% c('var/exe_name') %]/* $distdir - [% IF c("var/base-browser") -%] - mv "$distdir/Firefox.app" "$distdir/[% c('var/display_name') %].app" - [% END -%] [% IF c("var/firefox-browser") -%] mv "$distdir/Nightly.app" "$distdir/[% c('var/display_name') %].app" [% END -%] ===================================== projects/firefox/config ===================================== @@ -105,11 +105,6 @@ targets: updater_url: '' has_l10n: 0 - basebrowser: - var: - nightly_updates_publish_dir_prefix: basebrowser- - mar_id_prefix: 'basebrowser-torproject' - nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0 ===================================== projects/go/config ===================================== @@ -86,4 +86,4 @@ input_files: - project: go-bootstrap name: go-bootstrap target_replace: - '^.*browser-(?!testbuild).*': 'basebrowser-linux-x86_64' + '^.*browser-(?!testbuild).*': 'torbrowser-linux-x86_64' ===================================== projects/linux-packages/config ===================================== @@ -108,9 +108,6 @@ targets: browser_type: torbrowser system_pkg: pkg_url: 'https://torproject.org/' - basebrowser: - var: - browser_type: basebrowser mullvadbrowser: var: browser_type: mullvadbrowser ===================================== projects/release/config ===================================== @@ -97,9 +97,6 @@ targets: var: browser_type: torbrowser git_tag_prefix: tbb - basebrowser: - var: - browser_type: basebrowser mullvadbrowser: var: browser_type: mullvadbrowser ===================================== rbm.conf ===================================== @@ -363,15 +363,6 @@ targets: project_initials: tb 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.' - basebrowser: - var: - base-browser: 1 - project-name: base-browser - projectname: basebrowser - Project_Name: 'Base Browser' - ProjectName: BaseBrowser - updater_enabled: '[% c("var/nightly") %]' - # Target to build upstream firefox commit (in projects/firefox and # projects/geckoview) instead of our patched branch firefoxbrowser: @@ -422,10 +413,6 @@ targets: - testbuild - alpha - torbrowser - basebrowser-testbuild: - - testbuild - - alpha - - basebrowser mullvadbrowser-testbuild: - testbuild - alpha @@ -442,10 +429,6 @@ targets: - android-armv7 - android - torbrowser - basebrowser-android-armv7: - - android-armv7 - - android - - basebrowser firefoxbrowser-android-armv7: - android-armv7 - android @@ -462,10 +445,6 @@ targets: - android-x86_64 - android - torbrowser - basebrowser-android-x86_64: - - android-x86_64 - - android - - basebrowser firefoxbrowser-android-x86_64: - android-x86_64 - android @@ -482,10 +461,6 @@ targets: - android-aarch64 - android - torbrowser - basebrowser-android-aarch64: - - android-aarch64 - - android - - basebrowser firefoxbrowser-android-aarch64: - android-aarch64 - android @@ -528,10 +503,6 @@ targets: - linux-x86_64 - linux - torbrowser - basebrowser-linux-x86_64: - - linux-x86_64 - - linux - - basebrowser mullvadbrowser-linux-x86_64: - linux-x86_64 - linux @@ -545,11 +516,6 @@ targets: - linux-x86_64 - linux - torbrowser - basebrowser-linux-x86_64-asan: - - linux-asan - - linux-x86_64 - - linux - - basebrowser mullvadbrowser-linux-x86_64-asan: - linux-asan - linux-x86_64 @@ -560,11 +526,6 @@ targets: - linux-aarch64 - linux - torbrowser - basebrowser-linux-aarch64: - - linux-cross - - linux-aarch64 - - linux - - basebrowser mullvadbrowser-linux-aarch64: - linux-cross - linux-aarch64 @@ -631,10 +592,6 @@ targets: - windows-i686 - windows - torbrowser - basebrowser-windows-i686: - - windows-i686 - - windows - - basebrowser firefoxbrowser-windows-i686: - windows-i686 - windows @@ -643,10 +600,6 @@ targets: - windows-x86_64 - windows - torbrowser - basebrowser-windows-x86_64: - - windows-x86_64 - - windows - - basebrowser mullvadbrowser-windows-x86_64: - windows-x86_64 - windows @@ -704,19 +657,6 @@ targets: - macos-aarch64 - macos - torbrowser - basebrowser-macos: - - macos-universal - - macos-x86_64 - - macos - - basebrowser - basebrowser-macos-x86_64: - - macos-x86_64 - - macos - - basebrowser - basebrowser-macos-aarch64: - - macos-aarch64 - - macos - - basebrowser mullvadbrowser-macos: - macos-universal - macos-x86_64 ===================================== tools/signing/set-config ===================================== @@ -14,7 +14,6 @@ test -n "${SIGNING_PROJECTNAME+x}" \ || exit_error 'SIGNING_PROJECTNAME is not set' test "$SIGNING_PROJECTNAME" = 'torbrowser' \ - || test "$SIGNING_PROJECTNAME" = 'basebrowser' \ || test "$SIGNING_PROJECTNAME" = 'mullvadbrowser' \ || test "$SIGNING_PROJECTNAME" = 'torvpn' \ || exit_error "Unknown SIGNING_PROJECTNAME $SIGNING_PROJECTNAME" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a0... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a0... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
boklm (＠boklm)