This is an automated email from the git hooks/post-receive script.
boklm pushed a commit to branch master in repository builders/tor-browser-build.
commit 543a473af5b8e4609b6ef674a35cb86322d18767 Author: Nicolas Vigier boklm@torproject.org AuthorDate: Thu Jun 9 15:09:34 2022 +0200
Bug 40501: Rename Makefile build targets to torbrowser-* --- Makefile | 114 +++++++++++++++++++++++++++---------------------------- README | 24 ++++++------ doc/HACKING.txt | 10 ++--- doc/MAKEFILE.txt | 55 ++++++++++++++------------- 4 files changed, 103 insertions(+), 100 deletions(-)
diff --git a/Makefile b/Makefile index 6ccb520..c5e607e 100644 --- a/Makefile +++ b/Makefile @@ -1,173 +1,173 @@ rbm=./rbm/rbm
-all: release +all: torbrowser-release
-release: submodule-update +torbrowser-release: submodule-update $(rbm) build release --target release --target browser-all --target torbrowser
-release-android: submodule-update +torbrowser-release-android: submodule-update $(rbm) build release --target release --target browser-all-android --target torbrowser
-release-android-armv7: submodule-update +torbrowser-release-android-armv7: submodule-update $(rbm) build release --target release --target browser-android-armv7 --target torbrowser
-release-android-x86: submodule-update +torbrowser-release-android-x86: submodule-update $(rbm) build release --target release --target browser-android-x86 --target torbrowser
-release-android-x86_64: submodule-update +torbrowser-release-android-x86_64: submodule-update $(rbm) build release --target release --target browser-android-x86_64 --target torbrowser
-release-android-aarch64: submodule-update +torbrowser-release-android-aarch64: submodule-update $(rbm) build release --target release --target browser-android-aarch64 --target torbrowser
-release-desktop: submodule-update +torbrowser-release-desktop: submodule-update $(rbm) build release --target release --target browser-all-desktop --target torbrowser
-release-linux-x86_64: submodule-update +torbrowser-release-linux-x86_64: submodule-update $(rbm) build release --target release --target browser-linux-x86_64 --target torbrowser
-release-linux-x86_64-asan: submodule-update +torbrowser-release-linux-x86_64-asan: submodule-update $(rbm) build release --target release --target browser-linux-x86_64-asan --target torbrowser
-release-linux-i686: submodule-update +torbrowser-release-linux-i686: submodule-update $(rbm) build release --target release --target browser-linux-i686 --target torbrowser
-release-windows-i686: submodule-update +torbrowser-release-windows-i686: submodule-update $(rbm) build release --target release --target browser-windows-i686 --target torbrowser
-release-windows-x86_64: submodule-update +torbrowser-release-windows-x86_64: submodule-update $(rbm) build release --target release --target browser-windows-x86_64 --target torbrowser
-release-osx-x86_64: submodule-update +torbrowser-release-osx-x86_64: submodule-update $(rbm) build release --target release --target browser-osx-x86_64 --target torbrowser
-release-src: submodule-update +torbrowser-release-src: submodule-update $(rbm) build release --target release --target browser-src --target torbrowser
-alpha: submodule-update +torbrowser-alpha: submodule-update $(rbm) build release --target alpha --target browser-all --target torbrowser
-alpha-android: submodule-update +torbrowser-alpha-android: submodule-update $(rbm) build release --target alpha --target browser-all-android --target torbrowser
-alpha-android-armv7: submodule-update +torbrowser-alpha-android-armv7: submodule-update $(rbm) build release --target alpha --target browser-android-armv7 --target torbrowser
-alpha-android-x86: submodule-update +torbrowser-alpha-android-x86: submodule-update $(rbm) build release --target alpha --target browser-android-x86 --target torbrowser
-alpha-android-x86_64: submodule-update +torbrowser-alpha-android-x86_64: submodule-update $(rbm) build release --target alpha --target browser-android-x86_64 --target torbrowser
-alpha-android-aarch64: submodule-update +torbrowser-alpha-android-aarch64: submodule-update $(rbm) build release --target alpha --target browser-android-aarch64 --target torbrowser
-alpha-desktop: submodule-update +torbrowser-alpha-desktop: submodule-update $(rbm) build release --target alpha --target browser-all-desktop --target torbrowser
-alpha-linux-x86_64: submodule-update +torbrowser-alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target browser-linux-x86_64 --target torbrowser
-alpha-linux-x86_64-asan: submodule-update +torbrowser-alpha-linux-x86_64-asan: submodule-update $(rbm) build release --target alpha --target browser-linux-x86_64-asan --target torbrowser
-alpha-linux-i686: submodule-update +torbrowser-alpha-linux-i686: submodule-update $(rbm) build release --target alpha --target browser-linux-i686 --target torbrowser
-alpha-windows-i686: submodule-update +torbrowser-alpha-windows-i686: submodule-update $(rbm) build release --target alpha --target browser-windows-i686 --target torbrowser
-alpha-windows-x86_64: submodule-update +torbrowser-alpha-windows-x86_64: submodule-update $(rbm) build release --target alpha --target browser-windows-x86_64 --target torbrowser
-alpha-osx-x86_64: submodule-update +torbrowser-alpha-osx-x86_64: submodule-update $(rbm) build release --target alpha --target browser-osx-x86_64 --target torbrowser
-alpha-src: submodule-update +torbrowser-alpha-src: submodule-update $(rbm) build release --target alpha --target browser-src --target torbrowser
-nightly: submodule-update +torbrowser-nightly: submodule-update $(rbm) build release --target nightly --target browser-all --target torbrowser
-nightly-android: submodule-update +torbrowser-nightly-android: submodule-update $(rbm) build release --target nightly --target browser-all-android --target torbrowser
-nightly-android-armv7: submodule-update +torbrowser-nightly-android-armv7: submodule-update $(rbm) build release --target nightly --target browser-android-armv7 --target torbrowser
-nightly-android-x86: submodule-update +torbrowser-nightly-android-x86: submodule-update $(rbm) build release --target nightly --target browser-android-x86 --target torbrowser
-nightly-android-x86_64: submodule-update +torbrowser-nightly-android-x86_64: submodule-update $(rbm) build release --target nightly --target browser-android-x86_64 --target torbrowser
-nightly-android-aarch64: submodule-update +torbrowser-nightly-android-aarch64: submodule-update $(rbm) build release --target nightly --target browser-android-aarch64 --target torbrowser
-nightly-desktop: submodule-update +torbrowser-nightly-desktop: submodule-update $(rbm) build release --target nightly --target browser-all-desktop --target torbrowser
-nightly-linux-x86_64: submodule-update +torbrowser-nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target browser-linux-x86_64 --target torbrowser
-nightly-linux-x86_64-asan: submodule-update +torbrowser-nightly-linux-x86_64-asan: submodule-update $(rbm) build release --target nightly --target browser-linux-x86_64-asan --target torbrowser
-nightly-linux-i686: submodule-update +torbrowser-nightly-linux-i686: submodule-update $(rbm) build release --target nightly --target browser-linux-i686 --target torbrowser
-nightly-windows-i686: submodule-update +torbrowser-nightly-windows-i686: submodule-update $(rbm) build release --target nightly --target browser-windows-i686 --target torbrowser
-nightly-windows-x86_64: submodule-update +torbrowser-nightly-windows-x86_64: submodule-update $(rbm) build release --target nightly --target browser-windows-x86_64 --target torbrowser
-nightly-osx-x86_64: submodule-update +torbrowser-nightly-osx-x86_64: submodule-update $(rbm) build release --target nightly --target browser-osx-x86_64 --target torbrowser
-nightly-src: submodule-update +torbrowser-nightly-src: submodule-update $(rbm) build release --target nightly --target browser-src --target torbrowser
-testbuild: submodule-update +torbrowser-testbuild: submodule-update $(rbm) build release --target testbuild --target browser-all --target torbrowser
-testbuild-android: submodule-update +torbrowser-testbuild-android: submodule-update $(rbm) build release --target testbuild --target browser-all-android --target torbrowser
-testbuild-android-armv7: submodule-update +torbrowser-testbuild-android-armv7: submodule-update $(rbm) build release --target testbuild --target browser-android-armv7 --target torbrowser
-testbuild-android-x86: submodule-update +torbrowser-testbuild-android-x86: submodule-update $(rbm) build release --target testbuild --target browser-android-x86 --target torbrowser
-testbuild-android-x86_64: submodule-update +torbrowser-testbuild-android-x86_64: submodule-update $(rbm) build release --target testbuild --target browser-android-x86_64 --target torbrowser
-testbuild-android-aarch64: submodule-update +torbrowser-testbuild-android-aarch64: submodule-update $(rbm) build release --target testbuild --target browser-android-aarch64 --target torbrowser
-testbuild-desktop: submodule-update +torbrowser-testbuild-desktop: submodule-update $(rbm) build release --target testbuild --target browser-all-desktop --target torbrowser
-testbuild-linux-x86_64: submodule-update +torbrowser-testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target browser-linux-x86_64 --target torbrowser
-testbuild-linux-x86_64-asan: submodule-update +torbrowser-testbuild-linux-x86_64-asan: submodule-update $(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target torbrowser
-testbuild-linux-i686: submodule-update +torbrowser-testbuild-linux-i686: submodule-update $(rbm) build release --target testbuild --target browser-linux-i686 --target torbrowser
-testbuild-windows-x86_64: submodule-update +torbrowser-testbuild-windows-x86_64: submodule-update $(rbm) build release --target testbuild --target browser-windows-x86_64 --target torbrowser
-testbuild-windows-i686: submodule-update +torbrowser-testbuild-windows-i686: submodule-update $(rbm) build release --target testbuild --target browser-windows-i686 --target torbrowser
-testbuild-osx-x86_64: submodule-update +torbrowser-testbuild-osx-x86_64: submodule-update $(rbm) build release --target testbuild --target browser-osx-x86_64 --target torbrowser
-testbuild-src: submodule-update +torbrowser-testbuild-src: submodule-update $(rbm) build release --target testbuild --target browser-src-testbuild --target torbrowser
signtag-release: submodule-update diff --git a/README b/README index dcfe4c7..d579362 100644 --- a/README +++ b/README @@ -66,9 +66,9 @@ Starting a build To start a build, run one of the following commands, depending on the channel you want to build:
- $ make release - $ make alpha - $ make nightly + $ make torbrowser-release + $ make torbrowser-alpha + $ make torbrowser-nightly
You can find the build result in the directory release/unsigned/$version or alpha/unsigned/$version for release or alpha builds. The result of @@ -77,15 +77,15 @@ nightly can be found in the nightly/$version directory. If you want to build for a specific platform only, append the platform name to the makefile target:
- $ make nightly-linux-x86_64 - $ make nightly-linux-i686 - $ make nightly-windows-i686 - $ make nightly-windows-x86_64 - $ make nightly-osx-x86_64 - $ make nightly-android-armv7 - $ make nightly-android-aarch64 - $ make nightly-android-x86 - $ make nightly-android-x86_64 + $ make torbrowser-nightly-linux-x86_64 + $ make torbrowser-nightly-linux-i686 + $ make torbrowser-nightly-windows-i686 + $ make torbrowser-nightly-windows-x86_64 + $ make torbrowser-nightly-osx-x86_64 + $ make torbrowser-nightly-android-armv7 + $ make torbrowser-nightly-android-aarch64 + $ make torbrowser-nightly-android-x86 + $ make torbrowser-nightly-android-x86_64
When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. diff --git a/doc/HACKING.txt b/doc/HACKING.txt index 506502d..0e9f4bf 100644 --- a/doc/HACKING.txt +++ b/doc/HACKING.txt @@ -226,8 +226,8 @@ before running the configure script) to apply the patch:
patch -p1 < $rootdir/patch-for-XXXX.patch
-You can now run 'make testbuild' (or an other build target) to start a -build with the patch. +You can now run 'make torbrowser-testbuild' (or an other build target) +to start a build with the patch.
As an alternative, if you have your patch in a git repository, you can edit projects/firefox/config to change the git_url option to point to @@ -348,9 +348,9 @@ For example, if you want to try a Linux x86_64 alpha build, you can run: Types of builds: nightly, alpha, release, and testbuild -------------------------------------------------------
-The testbuild makefile target allows you to do a build quickly in the -testbuild directory, skipping the generation of all the locales and the -.mar files. This is useful during development. +The torbrowser-testbuild makefile target allows you to do a build +quickly in the testbuild directory, skipping the generation of all the +locales and the .mar files. This is useful during development.
In the case of Android builds, we are generating a multi-locale apk, contrary to the desktop builds where we have one bundle for each locale. diff --git a/doc/MAKEFILE.txt b/doc/MAKEFILE.txt index 9603463..4316e67 100644 --- a/doc/MAKEFILE.txt +++ b/doc/MAKEFILE.txt @@ -2,30 +2,32 @@ Description of makefile rules =============================
-release -------- +torbrowser-release +------------------ 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,desktop,android} ------------------------------------------------------------------------ -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. +torbrowser-release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64, + android-armv7, android-x86,android-x86_64, + android-aarch64,desktop,android} +-------------------------------------------------------------------- +Same as torbrowser-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 ------ +torbrowser-alpha +---------------- 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,desktop,android} ---------------------------------------------------------------------- -Same as alpha, for the selected platform only. +torbrowser-alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64, + android-armv7,android-x86,android-x86_64, + android-aarch64,desktop,android} +------------------------------------------------------------------ +Same as torbrowser-alpha, for the selected platform only.
-nightly -------- +torbrowser-nightly +------------------ Build Tor Browser for the nightly channel, for all supported platforms. Many of the components will be based on the master branch. You might want to run "make fetch" before, to fetch the latest commits from all @@ -33,25 +35,26 @@ 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,desktop,android} ------------------------------------------------------------------------ -Same as nightly, for the selected platform only. +torbrowser-nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64, + android-armv7,android-x86,android-x86_64, + android-aarch64,desktop,android} +-------------------------------------------------------------------- +Same as torbrowser-nightly, for the selected platform only.
-testbuild ---------- +torbrowser-testbuild +-------------------- Build a Tor Browser test build. To make the build faster, only the en-US locale is created, without mar files, and without the source tarballs. By default it is based on the alpha channel, but you can change that by editing rbm.local.conf. The resulting build can be found in directory testbuild.
-{release,alpha,nightly,testbuild}-linux-x86_64-asan ----------------------------------------------------- +torbrowser-{release,alpha,nightly,testbuild}-linux-x86_64-asan +-------------------------------------------------------------- Create a build for Linux x86_64 with Address Sanitizer enabled.
-{release,alpha,nightly,testbuild}-src -------------------------------------- +torbrowser-{release,alpha,nightly,testbuild}-src +------------------------------------------------ Create source tarballs for firefox, torbutton and tor-launcher.
fetch