Commit da23c8cd authored by Georg Koppen's avatar Georg Koppen
Browse files

Merge remote-tracking branch 'boklm/bug_25099_v10'

parents a750c930 0f019cf3

.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
/out

/release

/alpha

/alpha_nightly

/nightly

/testbuild

/rbm.local.conf

Makefile

+0 −33
Original line number Diff line number Diff line
@@ -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

README

+1 −8
Original line number Diff line number Diff line
@@ -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/$version directory.



If you want to build for a specific platform only, append the platform

name to the makefile target:

README.MAKEFILE

+0 −11
Original line number Diff line number Diff line
@@ -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

projects/firefox/get-moz-build-date

+2 −3
Original line number Diff line number Diff line
@@ -6,9 +6,8 @@ use strict; 
die "wrong number of arguments" unless @ARGV == 2;

my ($year, $version) = @ARGV;

my $date;

if ($version eq 'tbb-nightly') {

  my (undef, undef, undef, $day, $mon, $y) = localtime;

  $date = sprintf("%d%02d%02d010101", $y + 1900, $mon + 1, $day);

if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) {

  $date = sprintf("%d%02d%02d010101", $1, $2, $3);

} else {

  my @v = split(/[\.ab]/, $version);

  push @v, '0' if @v < 4;