commit 6427b82f2a2819ffce640a7bfcee7702360e7bad Author: Georg Koppen gk@torproject.org Date: Thu Nov 29 10:02:29 2018 +0000
Bug 28581: Add armv7 target to README files --- README | 1 + README.HACKING | 18 +++++++++++------- README.MAKEFILE | 16 ++++++++-------- 3 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/README b/README index 8ebef9b..5fb32ba 100644 --- a/README +++ b/README @@ -79,6 +79,7 @@ name to the makefile target: $ make nightly-linux-i686 $ make nightly-windows-i686 $ make nightly-osx-x86_64 + $ make nightly-android-armv7
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/README.HACKING b/README.HACKING index 9b846a7..d9b0674 100644 --- a/README.HACKING +++ b/README.HACKING @@ -44,16 +44,18 @@ In each of those places, an option can be defined: The targets are usually used to select:
- the platform: torbrowser-linux-x86_64, torbrowser-linux-i686, - torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64 + torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, + torbrowser-android-armv7 - the channel: release, nightly, alpha
The targets torbrowser-linux-x86_64, torbrowser-linux-i686, -torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64 are -special cases. They do not contain options directly, instead they contain a -list of other targets. For instance, the torbrowser-linux-x86_64 target is -pointing to the linux-x86_64 and linux targets. You should define an option -under the linux target if it applies to Linux on both architectures, or under -the linux-x86_64 if it only applies to the x86_64 architecture. +torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64, and +torbrowser-android-armv7 are special cases. They do not contain options +directly, instead they contain a list of other targets. For instance, the +torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux +targets. You should define an option under the linux target if it applies to +Linux on both architectures, or under the linux-x86_64 if it only applies to the +x86_64 architecture.
An option that is defined at the root of rbm.conf can be overridden by an other definition under a target, or inside projects/$project/config. @@ -152,6 +154,8 @@ $platform should be one of the following:
- torbrowser-osx-x86_64
+ - torbrowser-android-armv7 + For example, to see tor's build script for linux x86_64 on the alpha channel, you can use:
diff --git a/README.MAKEFILE b/README.MAKEFILE index 7fd05e9..1514780 100644 --- a/README.MAKEFILE +++ b/README.MAKEFILE @@ -7,8 +7,8 @@ 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} ---------------------------------------------------------- +release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +----------------------------------------------------------------------- Same as release, for the selected platform only.
alpha @@ -16,8 +16,8 @@ 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} -------------------------------------------------------- +alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +--------------------------------------------------------------------- Same as alpha, for the selected platform only.
nightly @@ -29,8 +29,8 @@ components.
The resulting build can be found in directory nightly/$date
-nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} ---------------------------------------------------------- +nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +----------------------------------------------------------------------- Same as nightly, for the selected platform only.
alpha_nightly @@ -39,8 +39,8 @@ 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} ---------------------------------------------------------------- +alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7} +----------------------------------------------------------------------------- The same as alpha_nightly, for the selected platform only.
testbuild