[tbb-commits] [tor-browser-build/maint-10.5] Bug 40352: Add desktop-only (Windows/macOS/Linux) Makefile rules

[sysrqb at torproject.org]

commit 13167b5d52bf30eeb115afec4e283916b5ea292c
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Sep 2 12:01:34 2021 +0200

    Bug 40352: Add desktop-only (Windows/macOS/Linux) Makefile rules
---
 Makefile         | 12 ++++++++++++
 doc/MAKEFILE.txt | 10 ++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a3393fc..0660389 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,9 @@ release-android-x86_64: submodule-update
 release-android-aarch64: submodule-update
 	$(rbm) build release --target release --target torbrowser-android-aarch64
 
+release-desktop: submodule-update
+	$(rbm) build release --target release --target torbrowser-all-desktop
+
 release-linux-x86_64: submodule-update
 	$(rbm) build release --target release --target torbrowser-linux-x86_64
 
@@ -59,6 +62,9 @@ alpha-android-x86_64: submodule-update
 alpha-android-aarch64: submodule-update
 	$(rbm) build release --target alpha --target torbrowser-android-aarch64
 
+alpha-desktop: submodule-update
+	$(rbm) build release --target alpha --target torbrowser-all-desktop
+
 alpha-linux-x86_64: submodule-update
 	$(rbm) build release --target alpha --target torbrowser-linux-x86_64
 
@@ -98,6 +104,9 @@ nightly-android-x86_64: submodule-update
 nightly-android-aarch64: submodule-update
 	$(rbm) build release --target nightly --target torbrowser-android-aarch64
 
+nightly-desktop: submodule-update
+	$(rbm) build release --target nightly --target torbrowser-all-desktop
+
 nightly-linux-x86_64: submodule-update
 	$(rbm) build release --target nightly --target torbrowser-linux-x86_64
 
@@ -137,6 +146,9 @@ testbuild-android-x86_64: submodule-update
 testbuild-android-aarch64: submodule-update
 	$(rbm) build release --target testbuild --target torbrowser-android-aarch64
 
+testbuild-desktop: submodule-update
+	$(rbm) build release --target testbuild --target torbrowser-all-desktop
+
 testbuild-linux-x86_64: submodule-update
 	$(rbm) build release --target testbuild --target torbrowser-linux-x86_64
 
diff --git a/doc/MAKEFILE.txt b/doc/MAKEFILE.txt
index b198985..9603463 100644
--- a/doc/MAKEFILE.txt
+++ b/doc/MAKEFILE.txt
@@ -8,9 +8,11 @@ Build Tor Browser for the release channel, for all supported platforms.
 The resulting build can be found in directory release/$version.
 
 release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7,
-         android-x86,android-x86_64,android-aarch64}
+         android-x86,android-x86_64,android-aarch64,desktop,android}
 -----------------------------------------------------------------------
-Same as release, for the selected platform only.
+Same as release, for the selected platform only. The "desktop" platform
+means Linux, Windows and macOS. The "android" platform means android for
+all architectures we support.
 
 alpha
 -----
@@ -18,7 +20,7 @@ Build Tor Browser for the alpha channel, for all supported platforms.
 The resulting build can be found in directory alpha/$version.
 
 alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7,
-       android-x86,android-x86_64,android-aarch64}
+       android-x86,android-x86_64,android-aarch64,desktop,android}
 ---------------------------------------------------------------------
 Same as alpha, for the selected platform only.
 
@@ -32,7 +34,7 @@ components.
 The resulting build can be found in directory nightly/$date
 
 nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7,
-         android-x86,android-x86_64,android-aarch64}
+         android-x86,android-x86_64,android-aarch64,desktop,android}
 -----------------------------------------------------------------------
 Same as nightly, for the selected platform only.