commit 07ffaa91443f12ed53b0bbe9645c1f2666e9f39e Author: Nicolas Vigier <boklm@torproject.org> Date: Thu Nov 14 23:43:50 2019 +0100 Bug 25099: Remove the alpha_nightly target --- .gitignore | 1 - Makefile | 33 --------------------------------- README | 9 +-------- README.MAKEFILE | 11 ----------- projects/release/config | 6 ------ 5 files changed, 1 insertion(+), 59 deletions(-) diff --git a/.gitignore b/.gitignore index efd3840..8239960 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ /out /release /alpha -/alpha_nightly /nightly /testbuild /rbm.local.conf diff --git a/Makefile b/Makefile index 9f61bfb..6edb7e3 100644 --- a/Makefile +++ b/Makefile @@ -110,39 +110,6 @@ nightly-osx-x86_64: submodule-update nightly-src: submodule-update $(rbm) build release --target nightly --target torbrowser-src -alpha_nightly: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-all - -alpha_nightly-android-armv7: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-android-armv7 - -alpha_nightly-android-x86: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-android-x86 - -alpha_nightly-android-x86_64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-android-x86_64 - -alpha_nightly-android-aarch64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-android-aarch64 - -alpha_nightly-linux-x86_64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-linux-x86_64 - -alpha_nightly-linux-i686: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-linux-i686 - -alpha_nightly-windows-i686: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-windows-i686 - -alpha_nightly-windows-x86_64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-windows-x86_64 - -alpha_nightly-osx-x86_64: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-osx-x86_64 - -alpha_nightly-src: submodule-update - $(rbm) build release --target alpha_nightly --target torbrowser-src - testbuild: submodule-update $(rbm) build release --target testbuild --target torbrowser-all diff --git a/README b/README index 481db2e..6dc5112 100644 --- a/README +++ b/README @@ -59,17 +59,10 @@ channel you want to build: $ make release $ make alpha $ make nightly - $ make alpha_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 -nightly or alpha_nightly can be found in the nightly/$date or -alpha_nightly/$date directory. - -The alpha and alpha_nightly make target will build the same thing. The -only difference is the output directory. The alpha_nightly target can be -useful if you want to do a test build without polluting your alpha -directory. +nightly can be found in the nightly/$date directory. If you want to build for a specific platform only, append the platform name to the makefile target: diff --git a/README.MAKEFILE b/README.MAKEFILE index e106ca4..e07224e 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -36,17 +36,6 @@ nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, ----------------------------------------------------------------------- Same as nightly, for the selected platform only. -alpha_nightly -------------- -Build Tor Browser for the alpha channel, for all supported platforms. -This is the same as 'make alpha', but the output directory is different. -The resulting build can be found in directory alpha_nightly/$date - -alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86,android-x86_64,android-aarch64} ------------------------------------------------------------------------------ -The same as alpha_nightly, for the selected platform only. - testbuild --------- Build a Tor Browser test build. To make the build faster, only the en-US diff --git a/projects/release/config b/projects/release/config index d1aee8c..c705a6f 100644 --- a/projects/release/config +++ b/projects/release/config @@ -76,12 +76,6 @@ targets: build_target: nightly publish_dir: '[% c("var/today") %]' - alpha_nightly: - output_dir: 'alpha_nightly' - var: - build_target: alpha - publish_dir: '[% c("var/today") %]' - alpha: output_dir: alpha var: