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

Commits: c60ebc0d by Nicolas Vigier at 2025-03-26T11:15:29+01:00 Bug 41406: Remove the browser-all-target target (unused)

- - - - - 7b70ee42 by Nicolas Vigier at 2025-03-26T12:04:33+01:00 Bug 41406: Restore -desktop and -android Makefile targets

- - - - - a74ebd9f by Nicolas Vigier at 2025-03-26T12:04:34+01:00 Bug 41406: Update README and doc/MAKEFILE.txt for makefile changes

- - - - -

4 changed files:

- Makefile - README - doc/MAKEFILE.txt - projects/release/config

Changes:

===================================== Makefile ===================================== @@ -17,6 +17,12 @@ torbrowser: submodule-update torbrowser-release: submodule-update $(rbm) build release --target release --target browser-all --target torbrowser

+torbrowser-release-desktop: submodule-update + $(rbm) build release --target release --target browser-all-desktop --target torbrowser + +torbrowser-release-android: submodule-update + $(rbm) build release --target release --target browser-all-android --target torbrowser + torbrowser-release-android-armv7: submodule-update $(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target torbrowser

@@ -56,6 +62,12 @@ torbrowser-release-src: submodule-update torbrowser-alpha: submodule-update $(rbm) build release --target alpha --target browser-all --target torbrowser

+torbrowser-alpha-desktop: submodule-update + $(rbm) build release --target alpha --target browser-all-desktop --target torbrowser + +torbrowser-alpha-android: submodule-update + $(rbm) build release --target alpha --target browser-all-android --target torbrowser + torbrowser-alpha-android-armv7: submodule-update $(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target torbrowser

@@ -95,6 +107,12 @@ torbrowser-alpha-src: submodule-update torbrowser-nightly: submodule-update $(rbm) build release --target nightly --target browser-all --target torbrowser

+torbrowser-nightly-desktop: submodule-update + $(rbm) build release --target nightly --target browser-all-desktop --target torbrowser + +torbrowser-nightly-android: submodule-update + $(rbm) build release --target nightly --target browser-all-android --target torbrowser + torbrowser-nightly-android-armv7: submodule-update $(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target torbrowser

@@ -134,6 +152,12 @@ torbrowser-nightly-src: submodule-update torbrowser-testbuild: submodule-update $(rbm) build release --target testbuild --target browser-all --target torbrowser

+torbrowser-testbuild-desktop: submodule-update + $(rbm) build release --target testbuild --target browser-all-desktop --target torbrowser + +torbrowser-testbuild-android: submodule-update + $(rbm) build release --target testbuild --target browser-all-android --target torbrowser + torbrowser-testbuild-android-armv7: submodule-update $(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target torbrowser

===================================== README ===================================== @@ -101,8 +101,14 @@ the subuid(5) and subgid(5) man pages. Starting a build ----------------

-To start a build, run one of the following commands, depending on the -channel you want to build: +To start a build, run the following command, to build the default +channel (which should be `alpha` on the main branch, and `release` on +the maint-* branches, as defined in var/browser_default_channel): + + $ make torbrowser + +If you want to build an other channel, you can also use one of the +following commands:

$ make torbrowser-release $ make torbrowser-alpha @@ -134,9 +140,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 Privacy Browser +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 Privacy Browser, use `privacybrowser`. +`basebrowser` in the target name. For Mullvad Browser, use `mullvadbrowser`.

Updating git sources

===================================== doc/MAKEFILE.txt ===================================== @@ -1,11 +1,18 @@ Description of makefile rules =============================

+torbrowser +---------- +Build Tor Browser for the default channel, defined in +var/browser_default_channel, and platforms, defined in +var/browser_platforms. After the build, this target also generates the +incrementals.

torbrowser-release ------------------ -Build Tor Browser for the release channel, for all supported platforms. -The resulting build can be found in directory torbrowser/release/$version. +Build Tor Browser for the release channel, for all supported platforms +(defined in var/browser_platforms). The resulting build can be found in +directory torbrowser/release/$version.

torbrowser-release-{linux-x86_64,linux-i686,windows-i686,macos, android-armv7, android-x86,android-x86_64, @@ -78,7 +85,7 @@ Base Browser. mullvadbrowser-* ---------------- The same rules for building Tor Browser also exist for building -Privacy Browser. +Mullvad Browser.

fetch -----

===================================== projects/release/config ===================================== @@ -14,7 +14,18 @@ var: targets: browser-all: - browser-src - - browser-all-target + browser-all-desktop: + var: + browser-src: '[% ! c("var/testbuild") %]' + browser_platforms: + is_android_release: 0 + is_desktop_release: 1 + browser-all-android: + var: + browser-src: '[% ! c("var/testbuild") %]' + browser_platforms: + is_android_release: 1 + is_desktop_release: 0 browser-single-platform: var: browser_platforms: @@ -79,9 +90,6 @@ targets: browser-src-testbuild: var: browser-src: 1 - browser-all-target: - var: - browser-all-target: 1

notarget: - torbrowser

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/6...