boklm pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

4 changed files:

Changes:

  • Makefile
    ... ... @@ -17,6 +17,12 @@ torbrowser: submodule-update
    17 17
     torbrowser-release: submodule-update
    
    18 18
     	$(rbm) build release --target release --target browser-all --target torbrowser
    
    19 19
     
    
    20
    +torbrowser-release-desktop: submodule-update
    
    21
    +	$(rbm) build release --target release --target browser-all-desktop --target torbrowser
    
    22
    +
    
    23
    +torbrowser-release-android: submodule-update
    
    24
    +	$(rbm) build release --target release --target browser-all-android --target torbrowser
    
    25
    +
    
    20 26
     torbrowser-release-android-armv7: submodule-update
    
    21 27
     	$(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target torbrowser
    
    22 28
     
    
    ... ... @@ -56,6 +62,12 @@ torbrowser-release-src: submodule-update
    56 62
     torbrowser-alpha: submodule-update
    
    57 63
     	$(rbm) build release --target alpha --target browser-all --target torbrowser
    
    58 64
     
    
    65
    +torbrowser-alpha-desktop: submodule-update
    
    66
    +	$(rbm) build release --target alpha --target browser-all-desktop --target torbrowser
    
    67
    +
    
    68
    +torbrowser-alpha-android: submodule-update
    
    69
    +	$(rbm) build release --target alpha --target browser-all-android --target torbrowser
    
    70
    +
    
    59 71
     torbrowser-alpha-android-armv7: submodule-update
    
    60 72
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target torbrowser
    
    61 73
     
    
    ... ... @@ -95,6 +107,12 @@ torbrowser-alpha-src: submodule-update
    95 107
     torbrowser-nightly: submodule-update
    
    96 108
     	$(rbm) build release --target nightly --target browser-all --target torbrowser
    
    97 109
     
    
    110
    +torbrowser-nightly-desktop: submodule-update
    
    111
    +	$(rbm) build release --target nightly --target browser-all-desktop --target torbrowser
    
    112
    +
    
    113
    +torbrowser-nightly-android: submodule-update
    
    114
    +	$(rbm) build release --target nightly --target browser-all-android --target torbrowser
    
    115
    +
    
    98 116
     torbrowser-nightly-android-armv7: submodule-update
    
    99 117
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target torbrowser
    
    100 118
     
    
    ... ... @@ -134,6 +152,12 @@ torbrowser-nightly-src: submodule-update
    134 152
     torbrowser-testbuild: submodule-update
    
    135 153
     	$(rbm) build release --target testbuild --target browser-all --target torbrowser
    
    136 154
     
    
    155
    +torbrowser-testbuild-desktop: submodule-update
    
    156
    +	$(rbm) build release --target testbuild --target browser-all-desktop --target torbrowser
    
    157
    +
    
    158
    +torbrowser-testbuild-android: submodule-update
    
    159
    +	$(rbm) build release --target testbuild --target browser-all-android --target torbrowser
    
    160
    +
    
    137 161
     torbrowser-testbuild-android-armv7: submodule-update
    
    138 162
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target torbrowser
    
    139 163
     
    

  • README
    ... ... @@ -101,8 +101,14 @@ the subuid(5) and subgid(5) man pages.
    101 101
     Starting a build
    
    102 102
     ----------------
    
    103 103
     
    
    104
    -To start a build, run one of the following commands, depending on the
    
    105
    -channel you want to build:
    
    104
    +To start a build, run the following command, to build the default
    
    105
    +channel (which should be `alpha` on the main branch, and `release` on
    
    106
    +the maint-* branches, as defined in var/browser_default_channel):
    
    107
    +
    
    108
    +  $ make torbrowser
    
    109
    +
    
    110
    +If you want to build an other channel, you can also use one of the
    
    111
    +following commands:
    
    106 112
     
    
    107 113
       $ make torbrowser-release
    
    108 114
       $ make torbrowser-alpha
    
    ... ... @@ -134,9 +140,9 @@ mar file will be created. If you want to base your testbuild on the latest
    134 140
     nightly code insted, rename rbm.local.conf.example to rbm.local.conf
    
    135 141
     and adapt the torbrowser-testbuild option accordingly.
    
    136 142
     
    
    137
    -Similar makefile targets exist for building Base Browser and Privacy Browser
    
    143
    +Similar makefile targets exist for building Base Browser and Mullvad Browser
    
    138 144
     instead of Tor Browser. To build Base Browser, replace `torbrowser` by
    
    139
    -`basebrowser` in the target name. For Privacy Browser, use `privacybrowser`.
    
    145
    +`basebrowser` in the target name. For Mullvad Browser, use `mullvadbrowser`.
    
    140 146
     
    
    141 147
     
    
    142 148
     Updating git sources
    

  • doc/MAKEFILE.txt
    1 1
     Description of makefile rules
    
    2 2
     =============================
    
    3 3
     
    
    4
    +torbrowser
    
    5
    +----------
    
    6
    +Build Tor Browser for the default channel, defined in
    
    7
    +var/browser_default_channel, and platforms, defined in
    
    8
    +var/browser_platforms. After the build, this target also generates the
    
    9
    +incrementals.
    
    4 10
     
    
    5 11
     torbrowser-release
    
    6 12
     ------------------
    
    7
    -Build Tor Browser for the release channel, for all supported platforms.
    
    8
    -The resulting build can be found in directory torbrowser/release/$version.
    
    13
    +Build Tor Browser for the release channel, for all supported platforms
    
    14
    +(defined in var/browser_platforms). The resulting build can be found in
    
    15
    +directory torbrowser/release/$version.
    
    9 16
     
    
    10 17
     torbrowser-release-{linux-x86_64,linux-i686,windows-i686,macos,
    
    11 18
                         android-armv7, android-x86,android-x86_64,
    
    ... ... @@ -78,7 +85,7 @@ Base Browser.
    78 85
     mullvadbrowser-*
    
    79 86
     ----------------
    
    80 87
     The same rules for building Tor Browser also exist for building
    
    81
    -Privacy Browser.
    
    88
    +Mullvad Browser.
    
    82 89
     
    
    83 90
     fetch
    
    84 91
     -----
    

  • projects/release/config
    ... ... @@ -14,7 +14,18 @@ var:
    14 14
     targets:
    
    15 15
       browser-all:
    
    16 16
         - browser-src
    
    17
    -    - browser-all-target
    
    17
    +  browser-all-desktop:
    
    18
    +    var:
    
    19
    +      browser-src: '[% ! c("var/testbuild") %]'
    
    20
    +      browser_platforms:
    
    21
    +        is_android_release: 0
    
    22
    +        is_desktop_release: 1
    
    23
    +  browser-all-android:
    
    24
    +    var:
    
    25
    +      browser-src: '[% ! c("var/testbuild") %]'
    
    26
    +      browser_platforms:
    
    27
    +        is_android_release: 1
    
    28
    +        is_desktop_release: 0
    
    18 29
       browser-single-platform:
    
    19 30
         var:
    
    20 31
           browser_platforms:
    
    ... ... @@ -79,9 +90,6 @@ targets:
    79 90
       browser-src-testbuild:
    
    80 91
         var:
    
    81 92
           browser-src: 1
    
    82
    -  browser-all-target:
    
    83
    -    var:
    
    84
    -      browser-all-target: 1
    
    85 93
     
    
    86 94
       notarget:
    
    87 95
         - torbrowser