MB 154: Update makefile to tag Tor Browser and Mullvad Browser separately

We also update doc/MAKEFILE.txt for previous changes with some makefile
targets.

.gitlab/issue_templates/Release Prep - Alpha.md

@@ -108,7 +108,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
 - [ ] Open MR with above changes
 - [ ] Begin build on `$(BUILD_SERVER)` (fix any issues which come up and update MR)
 - [ ] Merge
-- [ ] Sign/Tag commit: `make signtag-alpha`
+- [ ] Sign/Tag commit: `make torbrowser-signtag-alpha`
 - [ ] Push tag to `origin`
 
 </details>

.gitlab/issue_templates/Release Prep - Stable.md

@@ -110,7 +110,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE
 - [ ] Open MR with above changes
 - [ ] Begin build on `$(BUILD_SERVER)` (and fix any issues which come up and update MR)
 - [ ] Merge
-- [ ] Sign/Tag commit: `make signtag-release`
+- [ ] Sign/Tag commit: `make torbrowser-signtag-release`
 - [ ] Push tag to `origin`
 
 </details>

Makefile

@@ -600,12 +600,18 @@ cargo_vendor-uniffi-rs: submodule-update
 submodule-update:
 	git submodule update --init
 
-signtag-release: submodule-update
+torbrowser-signtag-release: submodule-update
 	$(rbm) build release --step signtag --target release --target torbrowser
 
-signtag-alpha: submodule-update
+torbrowser-signtag-alpha: submodule-update
 	$(rbm) build release --step signtag --target alpha --target torbrowser
 
+mullvadbrowser-signtag-release: submodule-update
+	$(rbm) build release --step signtag --target release --target mullvadbrowser
+
+mullvadbrowser-signtag-alpha: submodule-update
+	$(rbm) build release --step signtag --target alpha --target mullvadbrowser
+
 fetch: submodule-update
 	$(rbm) fetch
 

doc/MAKEFILE.txt

@@ -75,7 +75,7 @@ basebrowser-*
 The same rules for building Tor Browser also exist for building
 Base Browser.
 
-privacybrowser-*
+mullvadbrowser-*
 ----------------
 The same rules for building Tor Browser also exist for building
 Privacy Browser.
@@ -102,19 +102,19 @@ clean-dry-run
 -------------
 Print the files that would be removed when running 'make clean'.
 
-signtag-{release,alpha}
------------------------
+torbrowser-signtag-{release,alpha}
+----------------------------------
 Create a git signed tag for the selected channel, using the version and
 build number defined as var/torbrowser_version and var/torbrowser_build.
 
-incrementals-{release,alpha}
-----------------------------
+torbrowser-incrementals-{release,alpha}
+---------------------------------------
 Create incremental mar files for an unsigned build in the release or
 alpha channel. The list of versions we create incrementals from is
 defined as var/torbrowser_incremental_from in rbm.conf.
 
-incrementals-nightly
---------------------
+torbrowser-incrementals-nightly
+-------------------------------
 Create incremental mar files for the current nightly build. The number
 of previous versions we should generate incremental mars from is defined
 as var/max_torbrowser_incremental_from in rbm.conf.
@@ -124,15 +124,15 @@ current one, you can define the environment variable
 TORBROWSER_NIGHTLY_VERSION to the version you want to generate
 incremental mars for.
 
-dmg2mar-{release,alpha)
------------------------
+torbrowser-dmg2mar-{release,alpha)
+----------------------------------
 Generate updated mar files for the OSX bundles, from the dmg files, then
 regenerate the OSX incremental mar files. You should run this after
 signing the OSX dmg files.
 
-update_responses-{release,alpha}
---------------------------------
+torbrowser-update_responses-{release,alpha}
+-------------------------------------------
 Create update responses xml files for a signed build in the release or
 alpha channel. The files can be found in a tar in the directory
-{release,alpha}/update-responses.
+torbrowser/{release,alpha}/update-responses.
 

projects/release/config

@@ -90,12 +90,14 @@ targets:
   torbrowser:
     var:
       browser_type: torbrowser
+      git_tag_prefix: tbb
   basebrowser:
     var:
       browser_type: basebrowser
   mullvadbrowser:
     var:
       browser_type: mullvadbrowser
+      git_tag_prefix: mb
 
   release:
     var:

projects/release/signtag

@@ -4,5 +4,5 @@
 [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %]
 cd [% c("basedir") %]
 git tag [% c("buildconf/git_signtag_opt") %] -m \
-        'Tagging [% c("var/torbrowser_build") %] for [% c("var/torbrowser_version") %]' \
-        tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]
+        'Tagging [% c("var/Project_Name") %] [% c("var/torbrowser_build") %] for [% c("var/torbrowser_version") %]' \
+        [% c("var/git_tag_prefix") %]-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]