Bug 40742: Add Privacy Browser targets

Add the needed targets needed to build privacy browser.

.gitignore

@@ -4,7 +4,13 @@
 /out
 /torbrowser
 /basebrowser
+/privacybrowser
 /testbuild
 /rbm.local.conf
 /logs
 /tmp
+
+# Old build directories, let's keep them anyway
+/release
+/alpha
+/nightly

Makefile

@@ -180,103 +180,43 @@ torbrowser-testbuild-macos-aarch64: submodule-update
 torbrowser-testbuild-src: submodule-update
 	$(rbm) build release --target testbuild --target browser-src-testbuild --target torbrowser
 
-signtag-release: submodule-update
-	$(rbm) build release --step signtag --target release --target torbrowser
-
-signtag-alpha: submodule-update
-	$(rbm) build release --step signtag --target alpha --target torbrowser
-
-incrementals-release: submodule-update
+torbrowser-incrementals-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser
 	tools/update-responses/download_missing_versions release
 	tools/update-responses/gen_incrementals release
 	$(rbm) build release --step hash_incrementals --target release --target torbrowser
 
-incrementals-alpha: submodule-update
+torbrowser-incrementals-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser
 	tools/update-responses/download_missing_versions alpha
 	tools/update-responses/gen_incrementals alpha
 	$(rbm) build release --step hash_incrementals --target alpha --target torbrowser
 
-incrementals-nightly: submodule-update
+torbrowser-incrementals-nightly: submodule-update
 	$(rbm) build release --step update_responses_config --target nightly --target torbrowser
 	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly
 	$(rbm) build release --step hash_incrementals --target nightly --target torbrowser
 
-update_responses-release: submodule-update
+torbrowser-update_responses-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
 	$(rbm) build release --step create_update_responses_tar --target release --target signed --target torbrowser
 
-update_responses-alpha: submodule-update
+torbrowser-update_responses-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
 	$(rbm) build release --step create_update_responses_tar --target alpha --target signed --target torbrowser
 
-dmg2mar-release: submodule-update
+torbrowser-dmg2mar-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
 	$(rbm) build release --step dmg2mar --target release --target signed --target torbrowser
 	tools/update-responses/download_missing_versions release
 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
 
-dmg2mar-alpha: submodule-update
+torbrowser-dmg2mar-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
 	$(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser
 	tools/update-responses/download_missing_versions alpha
 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
 
-list_translation_updates-release:
-	$(rbm) showconf --target release --step list_updates translation list_updates
-
-list_translation_updates-alpha:
-	$(rbm) showconf --target alpha --step list_updates translation list_updates
-
-list_toolchain_updates-fenix: submodule-update
-	$(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7
-
-list_toolchain_updates-firefox-linux: submodule-update
-	$(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-linux-x86_64
-
-list_toolchain_updates-firefox-windows: submodule-update
-	$(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-windows-x86_64
-
-list_toolchain_updates-firefox-macos: submodule-update
-	$(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-macos
-
-list_toolchain_updates-android-components: submodule-update
-	$(rbm) build android-components --step list_toolchain_updates --target nightly --target torbrowser-android-armv7
-
-list_toolchain_updates-application-services: submodule-update
-	$(rbm) build application-services --step list_toolchain_updates --target nightly --target torbrowser-android-armv7
-
-list_toolchain_updates-geckoview: submodule-update
-	$(rbm) build geckoview --step list_toolchain_updates --target nightly --target torbrowser-android-armv7
-
-create_glean_deps_tarball: submodule-update
-	 $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7
-
-create_glean_deps_tarball-with_torsocks: submodule-update
-	$(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 --target with_torsocks
-
-get_gradle_dependencies_list-fenix: submodule-update
-	$(rbm) build fenix --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7
-
-get_gradle_dependencies_list-application-services: submodule-update
-	$(rbm) build application-services --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7
-
-get_gradle_dependencies_list-android-components: submodule-update
-	$(rbm) build android-components --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7
-
-cargo_vendor-application-services: submodule-update
-	$(rbm) build application-services --step cargo_vendor --target nightly --target torbrowser-android-armv7
-
-cargo_vendor-cbindgen-android: submodule-update
-	$(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-android-armv7
-
-cargo_vendor-cbindgen: submodule-update
-	$(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-linux-x86_64
-
-cargo_vendor-uniffi-rs: submodule-update
-	$(rbm) build uniffi-rs --step cargo_vendor --target nightly --target torbrowser-linux-x86_64
-
 
 ########################
 # Base Browser Targets #
@@ -457,6 +397,197 @@ basebrowser-testbuild-src: submodule-update
 	$(rbm) build release --target testbuild --target browser-src-testbuild --target basebrowser
 
 
+###########################
+# Privacy Browser Targets #
+###########################
+
+privacybrowser-release: submodule-update
+	$(rbm) build release --target release --target browser-all-desktop --target privacybrowser
+
+privacybrowser-release-desktop: submodule-update
+	$(rbm) build release --target release --target browser-all-desktop --target privacybrowser
+
+privacybrowser-release-linux-x86_64: submodule-update
+	$(rbm) build release --target release --target browser-linux-x86_64 --target privacybrowser
+
+privacybrowser-release-linux-x86_64-asan: submodule-update
+	$(rbm) build release --target release --target browser-linux-x86_64-asan --target privacybrowser
+
+privacybrowser-release-windows-x86_64: submodule-update
+	$(rbm) build release --target release --target browser-windows-x86_64 --target privacybrowser
+
+privacybrowser-release-macos: submodule-update
+	$(rbm) build release --target release --target browser-macos --target privacybrowser
+
+privacybrowser-release-src: submodule-update
+	$(rbm) build release --target release --target browser-src --target privacybrowser
+
+privacybrowser-alpha: submodule-update
+	$(rbm) build release --target alpha --target browser-all-desktop --target privacybrowser
+
+privacybrowser-alpha-desktop: submodule-update
+	$(rbm) build release --target alpha --target browser-all-desktop --target privacybrowser
+
+privacybrowser-alpha-linux-x86_64: submodule-update
+	$(rbm) build release --target alpha --target browser-linux-x86_64 --target privacybrowser
+
+privacybrowser-alpha-linux-x86_64-asan: submodule-update
+	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target privacybrowser
+
+privacybrowser-alpha-windows-x86_64: submodule-update
+	$(rbm) build release --target alpha --target browser-windows-x86_64 --target privacybrowser
+
+privacybrowser-alpha-macos: submodule-update
+	$(rbm) build release --target alpha --target browser-macos --target privacybrowser
+
+privacybrowser-alpha-src: submodule-update
+	$(rbm) build release --target alpha --target browser-src --target privacybrowser
+
+privacybrowser-nightly: submodule-update
+	$(rbm) build release --target nightly --target browser-all-desktop --target privacybrowser
+
+privacybrowser-nightly-desktop: submodule-update
+	$(rbm) build release --target nightly --target browser-all-desktop --target privacybrowser
+
+privacybrowser-nightly-linux-x86_64: submodule-update
+	$(rbm) build release --target nightly --target browser-linux-x86_64 --target privacybrowser
+
+privacybrowser-nightly-linux-x86_64-asan: submodule-update
+	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target privacybrowser
+
+privacybrowser-nightly-windows-x86_64: submodule-update
+	$(rbm) build release --target nightly --target browser-windows-x86_64 --target privacybrowser
+
+privacybrowser-nightly-macos: submodule-update
+	$(rbm) build release --target nightly --target browser-macos --target privacybrowser
+
+privacybrowser-nightly-src: submodule-update
+	$(rbm) build release --target nightly --target browser-src --target privacybrowser
+
+privacybrowser-testbuild: submodule-update
+	$(rbm) build release --target testbuild --target browser-all-desktop --target privacybrowser
+
+privacybrowser-testbuild-desktop: submodule-update
+	$(rbm) build release --target testbuild --target browser-all-desktop --target privacybrowser
+
+privacybrowser-testbuild-linux-x86_64: submodule-update
+	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target privacybrowser
+
+privacybrowser-testbuild-linux-x86_64-asan: submodule-update
+	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target privacybrowser
+
+privacybrowser-testbuild-windows-x86_64: submodule-update
+	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target privacybrowser
+
+privacybrowser-testbuild-macos: submodule-update
+	$(rbm) build release --target testbuild --target browser-macos --target privacybrowser
+
+privacybrowser-testbuild-macos-x86_64: submodule-update
+	$(rbm) build release --target testbuild --target browser-macos-x86_64 --target privacybrowser
+
+privacybrowser-testbuild-macos-aarch64: submodule-update
+	$(rbm) build release --target testbuild --target browser-macos-aarch64 --target privacybrowser
+
+privacybrowser-testbuild-src: submodule-update
+	$(rbm) build release --target testbuild --target browser-src-testbuild --target privacybrowser
+
+privacybrowser-incrementals-release: submodule-update
+	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target privacybrowser
+	tools/update-responses/download_missing_versions release
+	tools/update-responses/gen_incrementals release
+	$(rbm) build release --step hash_incrementals --target release --target privacybrowser
+
+privacybrowser-incrementals-alpha: submodule-update
+	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target privacybrowser
+	tools/update-responses/download_missing_versions alpha
+	tools/update-responses/gen_incrementals alpha
+	$(rbm) build release --step hash_incrementals --target alpha --target privacybrowser
+
+privacybrowser-incrementals-nightly: submodule-update
+	$(rbm) build release --step update_responses_config --target nightly --target privacybrowser
+	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly
+	$(rbm) build release --step hash_incrementals --target nightly --target privacybrowser
+
+privacybrowser-update_responses-release: submodule-update
+	$(rbm) build release --step update_responses_config --target release --target signed --target privacybrowser
+	$(rbm) build release --step create_update_responses_tar --target release --target signed --target privacybrowser
+
+privacybrowser-update_responses-alpha: submodule-update
+	$(rbm) build release --step update_responses_config --target alpha --target signed --target privacybrowser
+	$(rbm) build release --step create_update_responses_tar --target alpha --target signed --target privacybrowser
+
+privacybrowser-dmg2mar-release: submodule-update
+	$(rbm) build release --step update_responses_config --target release --target signed --target privacybrowser
+	$(rbm) build release --step dmg2mar --target release --target signed --target privacybrowser
+	tools/update-responses/download_missing_versions release
+	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
+
+privacybrowser-dmg2mar-alpha: submodule-update
+	$(rbm) build release --step update_responses_config --target alpha --target signed --target privacybrowser
+	$(rbm) build release --step dmg2mar --target alpha --target signed --target privacybrowser
+	tools/update-responses/download_missing_versions alpha
+	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
+
+
+############################
+# Toolchain Update Targets #
+############################
+
+list_translation_updates-release:
+	$(rbm) showconf --target release --step list_updates translation list_updates
+
+list_translation_updates-alpha:
+	$(rbm) showconf --target alpha --step list_updates translation list_updates
+
+list_toolchain_updates-fenix: submodule-update
+	$(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7
+
+list_toolchain_updates-firefox-linux: submodule-update
+	$(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-linux-x86_64
+
+list_toolchain_updates-firefox-windows: submodule-update
+	$(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-windows-x86_64
+
+list_toolchain_updates-firefox-macos: submodule-update
+	$(rbm) build firefox --step list_toolchain_updates --target nightly --target torbrowser-macos
+
+list_toolchain_updates-android-components: submodule-update
+	$(rbm) build android-components --step list_toolchain_updates --target nightly --target torbrowser-android-armv7
+
+list_toolchain_updates-application-services: submodule-update
+	$(rbm) build application-services --step list_toolchain_updates --target nightly --target torbrowser-android-armv7
+
+list_toolchain_updates-geckoview: submodule-update
+	$(rbm) build geckoview --step list_toolchain_updates --target nightly --target torbrowser-android-armv7
+
+create_glean_deps_tarball: submodule-update
+	 $(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7
+
+create_glean_deps_tarball-with_torsocks: submodule-update
+	$(rbm) build glean --step create_glean_deps_tarball --target alpha --target torbrowser-android-armv7 --target with_torsocks
+
+get_gradle_dependencies_list-fenix: submodule-update
+	$(rbm) build fenix --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7
+
+get_gradle_dependencies_list-application-services: submodule-update
+	$(rbm) build application-services --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7
+
+get_gradle_dependencies_list-android-components: submodule-update
+	$(rbm) build android-components --step get_gradle_dependencies_list --target nightly --target torbrowser-android-armv7
+
+cargo_vendor-application-services: submodule-update
+	$(rbm) build application-services --step cargo_vendor --target nightly --target torbrowser-android-armv7
+
+cargo_vendor-cbindgen-android: submodule-update
+	$(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-android-armv7
+
+cargo_vendor-cbindgen: submodule-update
+	$(rbm) build cbindgen --step cargo_vendor --target nightly --target torbrowser-linux-x86_64
+
+cargo_vendor-uniffi-rs: submodule-update
+	$(rbm) build uniffi-rs --step cargo_vendor --target nightly --target torbrowser-linux-x86_64
+
+
 ##################
 # Common Targets #
 ##################
@@ -464,6 +595,12 @@ basebrowser-testbuild-src: submodule-update
 submodule-update:
 	git submodule update --init
 
+signtag-release: submodule-update
+	$(rbm) build release --step signtag --target release --target torbrowser
+
+signtag-alpha: submodule-update
+	$(rbm) build release --step signtag --target alpha --target torbrowser
+
 fetch: submodule-update
 	$(rbm) fetch
 

README

@@ -96,9 +96,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 instead of
-Tor Browser. To build Base Browser, replace `torbrowser` by `basebrowser`
-in the target name.
+Similar makefile targets exist for building Base Browser and Privacy Browser
+instead of Tor Browser. To build Base Browser, replace `torbrowser` by
+`basebrowser` in the target name. For Privacy Browser, use `privacybrowser`.
 
 
 Updating git sources

doc/MAKEFILE.txt

@@ -75,6 +75,11 @@ basebrowser-*
 The same rules for building Tor Browser also exist for building
 Base Browser.
 
+privacybrowser-*
+----------------
+The same rules for building Tor Browser also exist for building
+Privacy Browser.
+
 fetch
 -----
 Fetch new commits from all components. This is useful when you want to

projects/browser/build

@@ -61,7 +61,7 @@ unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zi
 MARTOOLS=$rootdir/mar-tools
 
 mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-[% IF !c("var/macos") -%]
+[% IF !c("var/macos") && c("var/tor-browser") -%]
   cp "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$TBDIR/$PROFILEPATH/"
 [% END %]
 

projects/browser/config

@@ -67,6 +67,9 @@ targets:
   basebrowser:
     var:
       prefs_file: 001-base-profile.js
+  privacybrowser:
+    var:
+      prefs_file: 001-base-profile.js
 
 input_files:
   - project: container-image

projects/firefox/build

@@ -175,8 +175,8 @@ export LANG=C.UTF-8
   [% IF c("var/tor-browser") -%]
         --with-tor-browser-version=[% c("var/torbrowser_version") %] \
         --enable-update-channel=[% c("var/channel") %] \
-        --with-branding=[% c("var/branding_directory") %] \
   [% END %] \
+  [% IF !c("var/base-browser") -%]--with-branding=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %][% END %] \
   [% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]
 
 ./mach build --verbose

projects/firefox/config

@@ -15,7 +15,7 @@ var:
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   browser_branch: '12.5-1'
   browser_build: 1
-  branding_directory: 'browser/branding/tb-alpha'
+  branding_directory_prefix: 'tb'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   nightly_updates_osname: '[% c("var/osname") %]'
   deps:
@@ -65,15 +65,15 @@ targets:
     # basebrowser tag always has a -build1 suffix
     git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build1'
 
-  release:
-    var:
-      branding_directory: 'browser/branding/tb-release'
-
   nightly:
     git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]'
     tag_gpg_id: 0
+
+  privacybrowser:
+    git_url: git@gitlab.torproject.org:tpo/applications/privacy-browser.git
     var:
-      branding_directory: 'browser/branding/tb-nightly'
+      branding_directory_prefix: 'pb'
+      browser_branch: '12.0-1'
 
   linux-x86_64:
     var:

projects/release/config

@@ -53,10 +53,10 @@ targets:
       asan-build: '-asan'
   browser-linux-i686:
     var:
-      browser-linux-i686: 1
+      browser-linux-i686: '[% c("var/browser_type") != "privacybrowser" %]'
   browser-windows-i686:
     var:
-      browser-windows-i686: 1
+      browser-windows-i686: '[% c("var/browser_type") != "privacybrowser" %]'
   browser-windows-x86_64:
     var:
       browser-windows-x86_64: 1
@@ -93,6 +93,9 @@ targets:
   basebrowser:
     var:
       browser_type: basebrowser
+  privacybrowser:
+    var:
+      browser_type: privacybrowser
 
   release:
     var:

rbm.conf

@@ -236,6 +236,15 @@ targets:
       Project_Name: 'Base Browser'
       ProjectName: BaseBrowser
 
+  privacybrowser:
+    var:
+      privacy-browser: 1
+      project-name: privacy-browser
+      projectname: privacybrowser
+      Project_Name: 'Privacy Browser'
+      ProjectName: PrivacyBrowser
+      exe_name: privacybrowser
+
   torbrowser-testbuild:
     - testbuild
     - alpha
@@ -244,6 +253,10 @@ targets:
     - testbuild
     - alpha
     - basebrowser
+  privacybrowser-testbuild:
+    - testbuild
+    - alpha
+    - privacybrowser
   testbuild:
     var:
       testbuild: 1
@@ -369,6 +382,10 @@ targets:
     - linux-x86_64
     - linux
     - basebrowser
+  privacybrowser-linux-x86_64:
+    - linux-x86_64
+    - linux
+    - privacybrowser
   torbrowser-linux-x86_64-asan:
     - linux-asan
     - linux-x86_64
@@ -379,6 +396,11 @@ targets:
     - linux-x86_64
     - linux
     - basebrowser
+  privacybrowser-linux-x86_64-asan:
+    - linux-asan
+    - linux-x86_64
+    - linux
+    - privacybrowser
   torbrowser-linux-i686:
     - linux-i686
     - linux
@@ -475,6 +497,10 @@ targets:
     - windows-x86_64
     - windows
     - basebrowser
+  privacybrowser-windows-x86_64:
+    - windows-x86_64
+    - windows
+    - privacybrowser
   windows-x86_64:
     arch: x86_64
     var:
@@ -538,6 +564,19 @@ targets:
     - macos-aarch64
     - macos
     - basebrowser
+  privacybrowser-macos:
+    - macos-universal
+    - macos-x86_64
+    - macos
+    - privacybrowser
+  privacybrowser-macos-x86_64:
+    - macos-x86_64
+    - macos
+    - privacybrowser
+  privacybrowser-macos-aarch64:
+    - macos-aarch64
+    - macos
+    - privacybrowser
   macos-universal:
     var:
       macos_universal: 1