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

Commits:

6 changed files:

Changes:

  • .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
    ... ... @@ -65,6 +65,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
    65 65 
         - [ ] `var/torbrowser_build`: updated to `${MULLVAD_BROWSER_BUILD_N}`
    66 66 
         - [ ] `var/browser_release_date`: updated to build date. For the build to be reproducible, the date should be in the past when building.
    67 67 
           - **⚠️ WARNING**: If we have updated `var/torbrowser_build` without updating the `firefox` tag, then we can leave this unchanged to avoid forcing a firefox re-build (e.g. when bumping `var/torbrowser_build` to build2, build3, etc due to non-firefox related build issues)
    68 
    +    - [ ] `var/browser_platforms`: updated to enable the platforms included in this release
    68 69 
         - [ ] `var/torbrowser_incremental_from`: updated to previous Desktop version
    69 70 
           - **NOTE**: We try to build incrementals for the previous 3 desktop versions
    70 71 
           - **⚠️ WARNING**: Really *actually* make sure this is the previous Desktop version or else the `make mullvadbrowser-incrementals-*` step will fail
    ... ... @@ -111,7 +112,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
    111 112 
     - [ ] Build the tag:
    112 113 
       - Run:
    113 114 
         ```bash
    114 
    -    make mullvadbrowser-alpha && make mullvadbrowser-incrementals-alpha
    115 
    +    make mullvadbrowser
    115 116 
         ```
    116 117 
         - [ ] Tor Project build machine
    117 118 
         - [ ] Local developer machine

  • .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
    ... ... @@ -65,6 +65,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
    65 65 
         - [ ] `var/torbrowser_build`: updated to `${TOR_BROWSER_BUILD_N}`
    66 66 
         - [ ] `var/browser_release_date`: updated to build date. For the build to be reproducible, the date should be in the past when building.
    67 67 
           - **⚠️ WARNING**: If we have updated `var/torbrowser_build` without updating the `firefox` or `geckoview` tags, then we can leave this unchanged to avoid forcing a firefox re-build (e.g. when bumping `var/torbrwoser_build` to build2, build3, etc due to non-firefox related build issues)
    68 
    +    - [ ] `var/browser_platforms`: updated to enable the platforms included in this release
    68 69 
         - [ ] ***(Desktop Only)*** `var/torbrowser_incremental_from`: updated to previous Desktop version
    69 70 
           - **NOTE**: We try to build incrementals for the previous 3 desktop versions
    70 71 
           - **⚠️ WARNING**: Really *actually* make sure this is the previous Desktop version or else the `make torbrowser-incrementals-*` step will fail
    ... ... @@ -135,7 +136,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
    135 136 
     - [ ] Build the tag:
    136 137 
       - Run:
    137 138 
         ```bash
    138 
    -    make torbrowser-alpha && make torbrowser-incrementals-alpha
    139 
    +    make torbrowser
    139 140 
         ```
    140 141 
         - [ ] Tor Project build machine
    141 142 
         - [ ] Local developer machine

  • Makefile
    1 1 
     rbm=./rbm/rbm
    2 
    +browser_default_channel=$(shell $(rbm) showconf release var/browser_default_channel)
    2 3
    3 
    -all: torbrowser-release
    4 
    +.PHONY: torbrowser mullvadbrowser
    5 
    +all: torbrowser mullvadbrowser
    4 6
    5 7 
     #######################
    6 8 
     # Tor Browser Targets #
    7 9 
     #######################
    8 10
    11 
    +torbrowser: submodule-update
    12 
    +	@echo Building torbrowser-$(browser_default_channel)
    13 
    +	$(MAKE) torbrowser-$(browser_default_channel)
    14 
    +	@echo Building incrementals for torbrowser-$(browser_default_channel)
    15 
    +	$(MAKE) torbrowser-incrementals-$(browser_default_channel)
    16 
    +
    9 17 
     torbrowser-release: submodule-update
    10 18 
     	$(rbm) build release --target release --target browser-all --target torbrowser
    11 19
    12 
    -torbrowser-release-android: submodule-update
    13 
    -	$(rbm) build release --target release --target browser-all-android --target torbrowser
    14 
    -
    15 20 
     torbrowser-release-android-armv7: submodule-update
    16 
    -	$(rbm) build release --target release --target browser-android-armv7 --target torbrowser
    21 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target torbrowser
    17 22
    18 23 
     torbrowser-release-android-x86: submodule-update
    19 
    -	$(rbm) build release --target release --target browser-android-x86 --target torbrowser
    24 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86 --target torbrowser
    20 25
    21 26 
     torbrowser-release-android-x86_64: submodule-update
    22 
    -	$(rbm) build release --target release --target browser-android-x86_64 --target torbrowser
    27 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target torbrowser
    23 28
    24 29 
     torbrowser-release-android-aarch64: submodule-update
    25 
    -	$(rbm) build release --target release --target browser-android-aarch64 --target torbrowser
    26 
    -
    27 
    -torbrowser-release-desktop: submodule-update
    28 
    -	$(rbm) build release --target release --target browser-all-desktop --target torbrowser
    30 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    29 31
    30 32 
     torbrowser-release-linux-x86_64: submodule-update
    31 
    -	$(rbm) build release --target release --target browser-linux-x86_64 --target torbrowser
    33 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
    32 34
    33 35 
     torbrowser-release-linux-x86_64-asan: submodule-update
    34 
    -	$(rbm) build release --target release --target browser-linux-x86_64-asan --target torbrowser
    36 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
    35 37
    36 38 
     torbrowser-release-linux-i686: submodule-update
    37 
    -	$(rbm) build release --target release --target browser-linux-i686 --target torbrowser
    39 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-i686 --target torbrowser
    38 40
    39 41 
     torbrowser-release-linux-aarch64: submodule-update
    40 
    -	$(rbm) build release --target release --target browser-linux-aarch64 --target torbrowser
    42 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
    41 43
    42 44 
     torbrowser-release-windows-i686: submodule-update
    43 
    -	$(rbm) build release --target release --target browser-windows-i686 --target torbrowser
    45 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-windows-i686 --target torbrowser
    44 46
    45 47 
     torbrowser-release-windows-x86_64: submodule-update
    46 
    -	$(rbm) build release --target release --target browser-windows-x86_64 --target torbrowser
    48 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-windows-x86_64 --target torbrowser
    47 49
    48 50 
     torbrowser-release-macos: submodule-update
    49 
    -	$(rbm) build release --target release --target browser-macos --target torbrowser
    51 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-macos --target torbrowser
    50 52
    51 53 
     torbrowser-release-src: submodule-update
    52 
    -	$(rbm) build release --target release --target browser-src --target torbrowser
    54 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-src --target torbrowser
    53 55
    54 56 
     torbrowser-alpha: submodule-update
    55 57 
     	$(rbm) build release --target alpha --target browser-all --target torbrowser
    56 58
    57 
    -torbrowser-alpha-android: submodule-update
    58 
    -	$(rbm) build release --target alpha --target browser-all-android --target torbrowser
    59 
    -
    60 59 
     torbrowser-alpha-android-armv7: submodule-update
    61 
    -	$(rbm) build release --target alpha --target browser-android-armv7 --target torbrowser
    60 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target torbrowser
    62 61
    63 62 
     torbrowser-alpha-android-x86: submodule-update
    64 
    -	$(rbm) build release --target alpha --target browser-android-x86 --target torbrowser
    63 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86 --target torbrowser
    65 64
    66 65 
     torbrowser-alpha-android-x86_64: submodule-update
    67 
    -	$(rbm) build release --target alpha --target browser-android-x86_64 --target torbrowser
    66 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target torbrowser
    68 67
    69 68 
     torbrowser-alpha-android-aarch64: submodule-update
    70 
    -	$(rbm) build release --target alpha --target browser-android-aarch64 --target torbrowser
    71 
    -
    72 
    -torbrowser-alpha-desktop: submodule-update
    73 
    -	$(rbm) build release --target alpha --target browser-all-desktop --target torbrowser
    69 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    74 70
    75 71 
     torbrowser-alpha-linux-x86_64: submodule-update
    76 
    -	$(rbm) build release --target alpha --target browser-linux-x86_64 --target torbrowser
    72 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
    77 73
    78 74 
     torbrowser-alpha-linux-x86_64-asan: submodule-update
    79 
    -	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target torbrowser
    75 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
    80 76
    81 77 
     torbrowser-alpha-linux-aarch64: submodule-update
    82 
    -	$(rbm) build release --target alpha --target browser-linux-aarch64 --target torbrowser
    78 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
    83 79
    84 80 
     torbrowser-alpha-linux-i686: submodule-update
    85 
    -	$(rbm) build release --target alpha --target browser-linux-i686 --target torbrowser
    81 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-i686 --target torbrowser
    86 82
    87 83 
     torbrowser-alpha-windows-i686: submodule-update
    88 
    -	$(rbm) build release --target alpha --target browser-windows-i686 --target torbrowser
    84 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-i686 --target torbrowser
    89 85
    90 86 
     torbrowser-alpha-windows-x86_64: submodule-update
    91 
    -	$(rbm) build release --target alpha --target browser-windows-x86_64 --target torbrowser
    87 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-x86_64 --target torbrowser
    92 88
    93 89 
     torbrowser-alpha-macos: submodule-update
    94 
    -	$(rbm) build release --target alpha --target browser-macos --target torbrowser
    90 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-macos --target torbrowser
    95 91
    96 92 
     torbrowser-alpha-src: submodule-update
    97 
    -	$(rbm) build release --target alpha --target browser-src --target torbrowser
    93 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-src --target torbrowser
    98 94
    99 95 
     torbrowser-nightly: submodule-update
    100 96 
     	$(rbm) build release --target nightly --target browser-all --target torbrowser
    101 97
    102 
    -torbrowser-nightly-android: submodule-update
    103 
    -	$(rbm) build release --target nightly --target browser-all-android --target torbrowser
    104 
    -
    105 98 
     torbrowser-nightly-android-armv7: submodule-update
    106 
    -	$(rbm) build release --target nightly --target browser-android-armv7 --target torbrowser
    99 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target torbrowser
    107 100
    108 101 
     torbrowser-nightly-android-x86: submodule-update
    109 
    -	$(rbm) build release --target nightly --target browser-android-x86 --target torbrowser
    102 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86 --target torbrowser
    110 103
    111 104 
     torbrowser-nightly-android-x86_64: submodule-update
    112 
    -	$(rbm) build release --target nightly --target browser-android-x86_64 --target torbrowser
    105 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target torbrowser
    113 106
    114 107 
     torbrowser-nightly-android-aarch64: submodule-update
    115 
    -	$(rbm) build release --target nightly --target browser-android-aarch64 --target torbrowser
    116 
    -
    117 
    -torbrowser-nightly-desktop: submodule-update
    118 
    -	$(rbm) build release --target nightly --target browser-all-desktop --target torbrowser
    108 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    119 109
    120 110 
     torbrowser-nightly-linux-x86_64: submodule-update
    121 
    -	$(rbm) build release --target nightly --target browser-linux-x86_64 --target torbrowser
    111 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
    122 112
    123 113 
     torbrowser-nightly-linux-x86_64-asan: submodule-update
    124 
    -	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target torbrowser
    114 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
    125 115
    126 116 
     torbrowser-nightly-linux-aarch64: submodule-update
    127 
    -	$(rbm) build release --target nightly --target browser-linux-aarch64 --target torbrowser
    117 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
    128 118
    129 119 
     torbrowser-nightly-linux-i686: submodule-update
    130 
    -	$(rbm) build release --target nightly --target browser-linux-i686 --target torbrowser
    120 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-i686 --target torbrowser
    131 121
    132 122 
     torbrowser-nightly-windows-i686: submodule-update
    133 
    -	$(rbm) build release --target nightly --target browser-windows-i686 --target torbrowser
    123 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-i686 --target torbrowser
    134 124
    135 125 
     torbrowser-nightly-windows-x86_64: submodule-update
    136 
    -	$(rbm) build release --target nightly --target browser-windows-x86_64 --target torbrowser
    126 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-x86_64 --target torbrowser
    137 127
    138 128 
     torbrowser-nightly-macos: submodule-update
    139 
    -	$(rbm) build release --target nightly --target browser-macos --target torbrowser
    129 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-macos --target torbrowser
    140 130
    141 131 
     torbrowser-nightly-src: submodule-update
    142 
    -	$(rbm) build release --target nightly --target browser-src --target torbrowser
    132 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-src --target torbrowser
    143 133
    144 134 
     torbrowser-testbuild: submodule-update
    145 135 
     	$(rbm) build release --target testbuild --target browser-all --target torbrowser
    146 136
    147 
    -torbrowser-testbuild-android: submodule-update
    148 
    -	$(rbm) build release --target testbuild --target browser-all-android --target torbrowser
    149 
    -
    150 137 
     torbrowser-testbuild-android-armv7: submodule-update
    151 
    -	$(rbm) build release --target testbuild --target browser-android-armv7 --target torbrowser
    138 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target torbrowser
    152 139
    153 140 
     torbrowser-testbuild-android-x86: submodule-update
    154 
    -	$(rbm) build release --target testbuild --target browser-android-x86 --target torbrowser
    141 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86 --target torbrowser
    155 142
    156 143 
     torbrowser-testbuild-android-x86_64: submodule-update
    157 
    -	$(rbm) build release --target testbuild --target browser-android-x86_64 --target torbrowser
    144 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target torbrowser
    158 145
    159 146 
     torbrowser-testbuild-android-aarch64: submodule-update
    160 
    -	$(rbm) build release --target testbuild --target browser-android-aarch64 --target torbrowser
    161 
    -
    162 
    -torbrowser-testbuild-desktop: submodule-update
    163 
    -	$(rbm) build release --target testbuild --target browser-all-desktop --target torbrowser
    147 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    164 148
    165 149 
     torbrowser-testbuild-linux-x86_64: submodule-update
    166 
    -	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target torbrowser
    150 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
    167 151
    168 152 
     torbrowser-testbuild-linux-x86_64-asan: submodule-update
    169 
    -	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target torbrowser
    153 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target torbrowser
    170 154
    171 155 
     torbrowser-testbuild-linux-i686: submodule-update
    172 
    -	$(rbm) build release --target testbuild --target browser-linux-i686 --target torbrowser
    156 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-i686 --target torbrowser
    173 157
    174 158 
     torbrowser-testbuild-linux-aarch64: submodule-update
    175 
    -	$(rbm) build release --target testbuild --target browser-linux-aarch64 --target torbrowser
    159 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target torbrowser
    176 160
    177 161 
     torbrowser-testbuild-windows-x86_64: submodule-update
    178 
    -	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target torbrowser
    162 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-x86_64 --target torbrowser
    179 163
    180 164 
     torbrowser-testbuild-windows-i686: submodule-update
    181 
    -	$(rbm) build release --target testbuild --target browser-windows-i686 --target torbrowser
    165 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-i686 --target torbrowser
    182 166
    183 167 
     torbrowser-testbuild-macos: submodule-update
    184 
    -	$(rbm) build release --target testbuild --target browser-macos --target torbrowser
    168 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos --target torbrowser
    185 169
    186 170 
     torbrowser-testbuild-macos-x86_64: submodule-update
    187 
    -	$(rbm) build release --target testbuild --target browser-macos-x86_64 --target torbrowser
    171 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-x86_64 --target torbrowser
    188 172
    189 173 
     torbrowser-testbuild-macos-aarch64: submodule-update
    190 
    -	$(rbm) build release --target testbuild --target browser-macos-aarch64 --target torbrowser
    174 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-aarch64 --target torbrowser
    191 175
    192 176 
     torbrowser-testbuild-src: submodule-update
    193 
    -	$(rbm) build release --target testbuild --target browser-src-testbuild --target torbrowser
    177 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-src-testbuild --target torbrowser
    194 178
    195 179 
     torbrowser-incrementals-release: submodule-update
    196 180 
     	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser
    ... ... @@ -259,188 +243,164 @@ torbrowser-compare-mar-signed-unsigned-alpha: submodule-update
    259 243 
     basebrowser-release: submodule-update
    260 244 
     	$(rbm) build release --target release --target browser-all --target basebrowser
    261 245
    262 
    -basebrowser-release-android: submodule-update
    263 
    -	$(rbm) build release --target release --target browser-all-android --target basebrowser
    264 
    -
    265 246 
     basebrowser-release-android-armv7: submodule-update
    266 
    -	$(rbm) build release --target release --target browser-android-armv7 --target basebrowser
    247 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target basebrowser
    267 248
    268 249 
     basebrowser-release-android-x86: submodule-update
    269 
    -	$(rbm) build release --target release --target browser-android-x86 --target basebrowser
    250 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86 --target basebrowser
    270 251
    271 252 
     basebrowser-release-android-x86_64: submodule-update
    272 
    -	$(rbm) build release --target release --target browser-android-x86_64 --target basebrowser
    253 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    273 254
    274 255 
     basebrowser-release-android-aarch64: submodule-update
    275 
    -	$(rbm) build release --target release --target browser-android-aarch64 --target basebrowser
    276 
    -
    277 
    -basebrowser-release-desktop: submodule-update
    278 
    -	$(rbm) build release --target release --target browser-all-desktop --target basebrowser
    256 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    279 257
    280 258 
     basebrowser-release-linux-x86_64: submodule-update
    281 
    -	$(rbm) build release --target release --target browser-linux-x86_64 --target basebrowser
    259 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    282 260
    283 261 
     basebrowser-release-linux-x86_64-asan: submodule-update
    284 
    -	$(rbm) build release --target release --target browser-linux-x86_64-asan --target basebrowser
    262 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    285 263
    286 264 
     basebrowser-release-linux-i686: submodule-update
    287 
    -	$(rbm) build release --target release --target browser-linux-i686 --target basebrowser
    265 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-i686 --target basebrowser
    288 266
    289 267 
     basebrowser-release-linux-aarch64: submodule-update
    290 
    -	$(rbm) build release --target release --target browser-linux-aarch64 --target basebrowser
    268 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    291 269
    292 270 
     basebrowser-release-windows-i686: submodule-update
    293 
    -	$(rbm) build release --target release --target browser-windows-i686 --target basebrowser
    271 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-windows-i686 --target basebrowser
    294 272
    295 273 
     basebrowser-release-windows-x86_64: submodule-update
    296 
    -	$(rbm) build release --target release --target browser-windows-x86_64 --target basebrowser
    274 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
    297 275
    298 276 
     basebrowser-release-macos: submodule-update
    299 
    -	$(rbm) build release --target release --target browser-macos --target basebrowser
    277 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-macos --target basebrowser
    300 278
    301 279 
     basebrowser-release-src: submodule-update
    302 
    -	$(rbm) build release --target release --target browser-src --target basebrowser
    280 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-src --target basebrowser
    303 281
    304 282 
     basebrowser-alpha: submodule-update
    305 283 
     	$(rbm) build release --target alpha --target browser-all --target basebrowser
    306 284
    307 
    -basebrowser-alpha-android: submodule-update
    308 
    -	$(rbm) build release --target alpha --target browser-all-android --target basebrowser
    309 
    -
    310 285 
     basebrowser-alpha-android-armv7: submodule-update
    311 
    -	$(rbm) build release --target alpha --target browser-android-armv7 --target basebrowser
    286 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target basebrowser
    312 287
    313 288 
     basebrowser-alpha-android-x86: submodule-update
    314 
    -	$(rbm) build release --target alpha --target browser-android-x86 --target basebrowser
    289 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86 --target basebrowser
    315 290
    316 291 
     basebrowser-alpha-android-x86_64: submodule-update
    317 
    -	$(rbm) build release --target alpha --target browser-android-x86_64 --target basebrowser
    292 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    318 293
    319 294 
     basebrowser-alpha-android-aarch64: submodule-update
    320 
    -	$(rbm) build release --target alpha --target browser-android-aarch64 --target basebrowser
    321 
    -
    322 
    -basebrowser-alpha-desktop: submodule-update
    323 
    -	$(rbm) build release --target alpha --target browser-all-desktop --target basebrowser
    295 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    324 296
    325 297 
     basebrowser-alpha-linux-x86_64: submodule-update
    326 
    -	$(rbm) build release --target alpha --target browser-linux-x86_64 --target basebrowser
    298 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    327 299
    328 300 
     basebrowser-alpha-linux-x86_64-asan: submodule-update
    329 
    -	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target basebrowser
    301 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    330 302
    331 303 
     basebrowser-alpha-linux-i686: submodule-update
    332 
    -	$(rbm) build release --target alpha --target browser-linux-i686 --target basebrowser
    304 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-i686 --target basebrowser
    333 305
    334 306 
     basebrowser-alpha-linux-aarch64: submodule-update
    335 
    -	$(rbm) build release --target alpha --target browser-linux-aarch64 --target basebrowser
    307 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    336 308
    337 309 
     basebrowser-alpha-windows-i686: submodule-update
    338 
    -	$(rbm) build release --target alpha --target browser-windows-i686 --target basebrowser
    310 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-i686 --target basebrowser
    339 311
    340 312 
     basebrowser-alpha-windows-x86_64: submodule-update
    341 
    -	$(rbm) build release --target alpha --target browser-windows-x86_64 --target basebrowser
    313 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
    342 314
    343 315 
     basebrowser-alpha-macos: submodule-update
    344 
    -	$(rbm) build release --target alpha --target browser-macos --target basebrowser
    316 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-macos --target basebrowser
    345 317
    346 318 
     basebrowser-alpha-src: submodule-update
    347 
    -	$(rbm) build release --target alpha --target browser-src --target basebrowser
    319 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-src --target basebrowser
    348 320
    349 321 
     basebrowser-nightly: submodule-update
    350 322 
     	$(rbm) build release --target nightly --target browser-all --target basebrowser
    351 323
    352 
    -basebrowser-nightly-android: submodule-update
    353 
    -	$(rbm) build release --target nightly --target browser-all-android --target basebrowser
    354 
    -
    355 324 
     basebrowser-nightly-android-armv7: submodule-update
    356 
    -	$(rbm) build release --target nightly --target browser-android-armv7 --target basebrowser
    325 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target basebrowser
    357 326
    358 327 
     basebrowser-nightly-android-x86: submodule-update
    359 
    -	$(rbm) build release --target nightly --target browser-android-x86 --target basebrowser
    328 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86 --target basebrowser
    360 329
    361 330 
     basebrowser-nightly-android-x86_64: submodule-update
    362 
    -	$(rbm) build release --target nightly --target browser-android-x86_64 --target basebrowser
    331 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    363 332
    364 333 
     basebrowser-nightly-android-aarch64: submodule-update
    365 
    -	$(rbm) build release --target nightly --target browser-android-aarch64 --target basebrowser
    366 
    -
    367 
    -basebrowser-nightly-desktop: submodule-update
    368 
    -	$(rbm) build release --target nightly --target browser-all-desktop --target basebrowser
    334 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    369 335
    370 336 
     basebrowser-nightly-linux-x86_64: submodule-update
    371 
    -	$(rbm) build release --target nightly --target browser-linux-x86_64 --target basebrowser
    337 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    372 338
    373 339 
     basebrowser-nightly-linux-x86_64-asan: submodule-update
    374 
    -	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target basebrowser
    340 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    375 341
    376 342 
     basebrowser-nightly-linux-i686: submodule-update
    377 
    -	$(rbm) build release --target nightly --target browser-linux-i686 --target basebrowser
    343 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-i686 --target basebrowser
    378 344
    379 345 
     basebrowser-nightly-linux-aarch64: submodule-update
    380 
    -	$(rbm) build release --target nightly --target browser-linux-aarch64 --target basebrowser
    346 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    381 347
    382 348 
     basebrowser-nightly-windows-i686: submodule-update
    383 
    -	$(rbm) build release --target nightly --target browser-windows-i686 --target basebrowser
    349 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-i686 --target basebrowser
    384 350
    385 351 
     basebrowser-nightly-windows-x86_64: submodule-update
    386 
    -	$(rbm) build release --target nightly --target browser-windows-x86_64 --target basebrowser
    352 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
    387 353
    388 354 
     basebrowser-nightly-macos: submodule-update
    389 
    -	$(rbm) build release --target nightly --target browser-macos --target basebrowser
    355 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-macos --target basebrowser
    390 356
    391 357 
     basebrowser-nightly-src: submodule-update
    392 
    -	$(rbm) build release --target nightly --target browser-src --target basebrowser
    358 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-src --target basebrowser
    393 359
    394 360 
     basebrowser-testbuild: submodule-update
    395 361 
     	$(rbm) build release --target testbuild --target browser-all --target basebrowser
    396 362
    397 
    -basebrowser-testbuild-android: submodule-update
    398 
    -	$(rbm) build release --target testbuild --target browser-all-android --target basebrowser
    399 
    -
    400 363 
     basebrowser-testbuild-android-armv7: submodule-update
    401 
    -	$(rbm) build release --target testbuild --target browser-android-armv7 --target basebrowser
    364 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target basebrowser
    402 365
    403 366 
     basebrowser-testbuild-android-x86: submodule-update
    404 
    -	$(rbm) build release --target testbuild --target browser-android-x86 --target basebrowser
    367 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86 --target basebrowser
    405 368
    406 369 
     basebrowser-testbuild-android-x86_64: submodule-update
    407 
    -	$(rbm) build release --target testbuild --target browser-android-x86_64 --target basebrowser
    370 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    408 371
    409 372 
     basebrowser-testbuild-android-aarch64: submodule-update
    410 
    -	$(rbm) build release --target testbuild --target browser-android-aarch64 --target basebrowser
    411 
    -
    412 
    -basebrowser-testbuild-desktop: submodule-update
    413 
    -	$(rbm) build release --target testbuild --target browser-all-desktop --target basebrowser
    373 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    414 374
    415 375 
     basebrowser-testbuild-linux-x86_64: submodule-update
    416 
    -	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target basebrowser
    376 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    417 377
    418 378 
     basebrowser-testbuild-linux-x86_64-asan: submodule-update
    419 
    -	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target basebrowser
    379 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target basebrowser
    420 380
    421 381 
     basebrowser-testbuild-linux-i686: submodule-update
    422 
    -	$(rbm) build release --target testbuild --target browser-linux-i686 --target basebrowser
    382 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-i686 --target basebrowser
    423 383
    424 384 
     basebrowser-testbuild-linux-aarch64: submodule-update
    425 
    -	$(rbm) build release --target testbuild --target browser-linux-aarch64 --target basebrowser
    385 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target basebrowser
    426 386
    427 387 
     basebrowser-testbuild-windows-x86_64: submodule-update
    428 
    -	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target basebrowser
    388 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-x86_64 --target basebrowser
    429 389
    430 390 
     basebrowser-testbuild-windows-i686: submodule-update
    431 
    -	$(rbm) build release --target testbuild --target browser-windows-i686 --target basebrowser
    391 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-i686 --target basebrowser
    432 392
    433 393 
     basebrowser-testbuild-macos: submodule-update
    434 
    -	$(rbm) build release --target testbuild --target browser-macos --target basebrowser
    394 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos --target basebrowser
    435 395
    436 396 
     basebrowser-testbuild-macos-x86_64: submodule-update
    437 
    -	$(rbm) build release --target testbuild --target browser-macos-x86_64 --target basebrowser
    397 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-x86_64 --target basebrowser
    438 398
    439 399 
     basebrowser-testbuild-macos-aarch64: submodule-update
    440 
    -	$(rbm) build release --target testbuild --target browser-macos-aarch64 --target basebrowser
    400 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-aarch64 --target basebrowser
    441 401
    442 402 
     basebrowser-testbuild-src: submodule-update
    443 
    -	$(rbm) build release --target testbuild --target browser-src-testbuild --target basebrowser
    403 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-src-testbuild --target basebrowser
    444 404
    445 405 
     basebrowser-incrementals-nightly: submodule-update
    446 406 
     	$(rbm) build release --step update_responses_config --target nightly --target basebrowser
    ... ... @@ -452,107 +412,101 @@ basebrowser-incrementals-nightly: submodule-update
    452 412 
     # Mullvad Browser Targets #
    453 413 
     ###########################
    454 414
    455 
    -mullvadbrowser-release: submodule-update
    456 
    -	$(rbm) build release --target release --target browser-all-desktop --target mullvadbrowser
    415 
    +mullvadbrowser: submodule-update
    416 
    +	@echo Building mullvadbrowser-$(browser_default_channel)
    417 
    +	$(MAKE) mullvadbrowser-$(browser_default_channel)
    418 
    +	@echo Building incrementals for mullvadbrowser-$(browser_default_channel)
    419 
    +	$(MAKE) mullvadbrowser-incrementals-$(browser_default_channel)
    457 420
    458 
    -mullvadbrowser-release-desktop: submodule-update
    459 
    -	$(rbm) build release --target release --target browser-all-desktop --target mullvadbrowser
    421 
    +mullvadbrowser-release: submodule-update
    422 
    +	$(rbm) build release --target release --target browser-all --target mullvadbrowser
    460 423
    461 424 
     mullvadbrowser-release-linux-x86_64: submodule-update
    462 
    -	$(rbm) build release --target release --target browser-linux-x86_64 --target mullvadbrowser
    425 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
    463 426
    464 427 
     mullvadbrowser-release-linux-x86_64-asan: submodule-update
    465 
    -	$(rbm) build release --target release --target browser-linux-x86_64-asan --target mullvadbrowser
    428 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
    466 429
    467 430 
     mullvadbrowser-release-linux-aarch64: submodule-update
    468 
    -	$(rbm) build release --target release --target browser-linux-aarch64 --target mullvadbrowser
    431 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
    469 432
    470 433 
     mullvadbrowser-release-windows-x86_64: submodule-update
    471 
    -	$(rbm) build release --target release --target browser-windows-x86_64 --target mullvadbrowser
    434 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-windows-x86_64 --target mullvadbrowser
    472 435
    473 436 
     mullvadbrowser-release-macos: submodule-update
    474 
    -	$(rbm) build release --target release --target browser-macos --target mullvadbrowser
    437 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-macos --target mullvadbrowser
    475 438
    476 439 
     mullvadbrowser-release-src: submodule-update
    477 
    -	$(rbm) build release --target release --target browser-src --target mullvadbrowser
    440 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-src --target mullvadbrowser
    478 441
    479 442 
     mullvadbrowser-alpha: submodule-update
    480 
    -	$(rbm) build release --target alpha --target browser-all-desktop --target mullvadbrowser
    481 
    -
    482 
    -mullvadbrowser-alpha-desktop: submodule-update
    483 
    -	$(rbm) build release --target alpha --target browser-all-desktop --target mullvadbrowser
    443 
    +	$(rbm) build release --target alpha --target browser-all --target mullvadbrowser
    484 444
    485 445 
     mullvadbrowser-alpha-linux-x86_64: submodule-update
    486 
    -	$(rbm) build release --target alpha --target browser-linux-x86_64 --target mullvadbrowser
    446 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
    487 447
    488 448 
     mullvadbrowser-alpha-linux-x86_64-asan: submodule-update
    489 
    -	$(rbm) build release --target alpha --target browser-linux-x86_64-asan --target mullvadbrowser
    449 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
    490 450
    491 451 
     mullvadbrowser-alpha-linux-aarch64: submodule-update
    492 
    -	$(rbm) build release --target alpha --target browser-linux-aarch64 --target mullvadbrowser
    452 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
    493 453
    494 454 
     mullvadbrowser-alpha-windows-x86_64: submodule-update
    495 
    -	$(rbm) build release --target alpha --target browser-windows-x86_64 --target mullvadbrowser
    455 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-windows-x86_64 --target mullvadbrowser
    496 456
    497 457 
     mullvadbrowser-alpha-macos: submodule-update
    498 
    -	$(rbm) build release --target alpha --target browser-macos --target mullvadbrowser
    458 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-macos --target mullvadbrowser
    499 459
    500 460 
     mullvadbrowser-alpha-src: submodule-update
    501 
    -	$(rbm) build release --target alpha --target browser-src --target mullvadbrowser
    461 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-src --target mullvadbrowser
    502 462
    503 463 
     mullvadbrowser-nightly: submodule-update
    504 
    -	$(rbm) build release --target nightly --target browser-all-desktop --target mullvadbrowser
    505 
    -
    506 
    -mullvadbrowser-nightly-desktop: submodule-update
    507 
    -	$(rbm) build release --target nightly --target browser-all-desktop --target mullvadbrowser
    464 
    +	$(rbm) build release --target nightly --target browser-all --target mullvadbrowser
    508 465
    509 466 
     mullvadbrowser-nightly-linux-x86_64: submodule-update
    510 
    -	$(rbm) build release --target nightly --target browser-linux-x86_64 --target mullvadbrowser
    467 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
    511 468
    512 469 
     mullvadbrowser-nightly-linux-x86_64-asan: submodule-update
    513 
    -	$(rbm) build release --target nightly --target browser-linux-x86_64-asan --target mullvadbrowser
    470 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
    514 471
    515 472 
     mullvadbrowser-nightly-linux-aarch64: submodule-update
    516 
    -	$(rbm) build release --target nightly --target browser-linux-aarch64 --target mullvadbrowser
    473 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
    517 474
    518 475 
     mullvadbrowser-nightly-windows-x86_64: submodule-update
    519 
    -	$(rbm) build release --target nightly --target browser-windows-x86_64 --target mullvadbrowser
    476 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-windows-x86_64 --target mullvadbrowser
    520 477
    521 478 
     mullvadbrowser-nightly-macos: submodule-update
    522 
    -	$(rbm) build release --target nightly --target browser-macos --target mullvadbrowser
    479 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-macos --target mullvadbrowser
    523 480
    524 481 
     mullvadbrowser-nightly-src: submodule-update
    525 
    -	$(rbm) build release --target nightly --target browser-src --target mullvadbrowser
    482 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-src --target mullvadbrowser
    526 483
    527 484 
     mullvadbrowser-testbuild: submodule-update
    528 
    -	$(rbm) build release --target testbuild --target browser-all-desktop --target mullvadbrowser
    529 
    -
    530 
    -mullvadbrowser-testbuild-desktop: submodule-update
    531 
    -	$(rbm) build release --target testbuild --target browser-all-desktop --target mullvadbrowser
    485 
    +	$(rbm) build release --target testbuild --target browser-all --target mullvadbrowser
    532 486
    533 487 
     mullvadbrowser-testbuild-linux-x86_64: submodule-update
    534 
    -	$(rbm) build release --target testbuild --target browser-linux-x86_64 --target mullvadbrowser
    488 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target mullvadbrowser
    535 489
    536 490 
     mullvadbrowser-testbuild-linux-x86_64-asan: submodule-update
    537 
    -	$(rbm) build release --target testbuild --target browser-linux-x86_64-asan --target mullvadbrowser
    491 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64-asan --target mullvadbrowser
    538 492
    539 493 
     mullvadbrowser-testbuild-linux-aarch64: submodule-update
    540 
    -	$(rbm) build release --target testbuild --target browser-linux-aarch64 --target mullvadbrowser
    494 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-aarch64 --target mullvadbrowser
    541 495
    542 496 
     mullvadbrowser-testbuild-windows-x86_64: submodule-update
    543 
    -	$(rbm) build release --target testbuild --target browser-windows-x86_64 --target mullvadbrowser
    497 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-windows-x86_64 --target mullvadbrowser
    544 498
    545 499 
     mullvadbrowser-testbuild-macos: submodule-update
    546 
    -	$(rbm) build release --target testbuild --target browser-macos --target mullvadbrowser
    500 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos --target mullvadbrowser
    547 501
    548 502 
     mullvadbrowser-testbuild-macos-x86_64: submodule-update
    549 
    -	$(rbm) build release --target testbuild --target browser-macos-x86_64 --target mullvadbrowser
    503 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-x86_64 --target mullvadbrowser
    550 504
    551 505 
     mullvadbrowser-testbuild-macos-aarch64: submodule-update
    552 
    -	$(rbm) build release --target testbuild --target browser-macos-aarch64 --target mullvadbrowser
    506 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-macos-aarch64 --target mullvadbrowser
    553 507
    554 508 
     mullvadbrowser-testbuild-src: submodule-update
    555 
    -	$(rbm) build release --target testbuild --target browser-src-testbuild --target mullvadbrowser
    509 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-src-testbuild --target mullvadbrowser
    556 510
    557 511 
     mullvadbrowser-incrementals-release: submodule-update
    558 512 
     	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target mullvadbrowser
    ... ... @@ -701,7 +655,7 @@ cargo_vendor-rcodesign: submodule-update
    701 655 
     ##################
    702 656
    703 657 
     submodule-update:
    704 
    -	git submodule update --init
    658 
    +	@git submodule update --init
    705 659
    706 660 
     # requires tpo_user variable be set in rbm.local.conf
    707 661 
     torbrowser-upload-sha256sums-release: submodule-update

  • projects/release/build
    ... ... @@ -4,40 +4,40 @@
    4 4 
     [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %]
    5 5 
     destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]"
    6 6 
     mkdir -p "$destdir"
    7 
    -[% IF c("var/browser-android-armv7") -%]
    7 
    +[% IF c("var/browser_platforms/android-armv7") -%]
    8 8 
       mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/
    9 9 
     [% END -%]
    10 
    -[% IF c("var/browser-android-x86") -%]
    10 
    +[% IF c("var/browser_platforms/android-x86") -%]
    11 11 
       mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/
    12 12 
     [% END -%]
    13 
    -[% IF c("var/browser-android-x86_64") -%]
    13 
    +[% IF c("var/browser_platforms/android-x86_64") -%]
    14 14 
       mv [% c('input_files_by_name/android-x86_64') %]/* "$destdir"/
    15 15 
     [% END -%]
    16 
    -[% IF c("var/browser-android-aarch64") -%]
    16 
    +[% IF c("var/browser_platforms/android-aarch64") -%]
    17 17 
       mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/
    18 18 
     [% END -%]
    19 
    -[% IF c("var/browser-windows-i686") -%]
    19 
    +[% IF c("var/browser_platforms/windows-i686") -%]
    20 20 
       mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/
    21 21 
     [% END -%]
    22 
    -[% IF c("var/browser-windows-x86_64") -%]
    22 
    +[% IF c("var/browser_platforms/windows-x86_64") -%]
    23 23 
       mv [% c('input_files_by_name/windows-x86_64') %]/* "$destdir"/
    24 24 
     [% END -%]
    25 
    -[% IF c("var/browser-macos") -%]
    25 
    +[% IF c("var/browser_platforms/macos") -%]
    26 26 
       mv [% c('input_files_by_name/macos') %]/* "$destdir"/
    27 27 
     [% END -%]
    28 
    -[% IF c("var/browser-macos-x86_64") -%]
    28 
    +[% IF c("var/browser_platforms/macos-x86_64") -%]
    29 29 
       mv [% c('input_files_by_name/macos-x86_64') %]/* "$destdir"/
    30 30 
     [% END -%]
    31 
    -[% IF c("var/browser-macos-aarch64") -%]
    31 
    +[% IF c("var/browser_platforms/macos-aarch64") -%]
    32 32 
       mv [% c('input_files_by_name/macos-aarch64') %]/* "$destdir"/
    33 33 
     [% END -%]
    34 
    -[% IF c("var/browser-linux-i686") -%]
    34 
    +[% IF c("var/browser_platforms/linux-i686") -%]
    35 35 
       mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/
    36 36 
     [% END -%]
    37 
    -[% IF c("var/browser-linux-x86_64") -%]
    37 
    +[% IF c("var/browser_platforms/linux-x86_64") -%]
    38 38 
       mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/
    39 39 
     [% END -%]
    40 
    -[% IF c("var/browser-linux-aarch64") -%]
    40 
    +[% IF c("var/browser_platforms/linux-aarch64") -%]
    41 41 
       mv [% c('input_files_by_name/linux-aarch64') %]/* "$destdir"/
    42 42 
     [% END -%]
    43 43 
     [% IF c("var/linux-packages") || c("var/linux-packages-aarch64") -%]

  • projects/release/config
    ... ... @@ -10,75 +10,69 @@ var:
    10 10
    11 11 
     targets:
    12 12 
       browser-all:
    13 
    -    - browser-linux-x86_64
    14 
    -    - browser-linux-i686
    15 
    -    - browser-linux-aarch64
    16 
    -    - browser-windows-i686
    17 
    -    - browser-windows-x86_64
    18 
    -    - browser-macos
    19 
    -    - browser-android-armv7
    20 
    -    - browser-android-x86
    21 
    -    - browser-android-x86_64
    22 
    -    - browser-android-aarch64
    23 13 
         - browser-src
    24 14 
         - browser-all-target
    25 
    -  browser-all-desktop:
    26 
    -    - browser-linux-x86_64
    27 
    -    - browser-linux-i686
    28 
    -    - browser-linux-aarch64
    29 
    -    - browser-windows-i686
    30 
    -    - browser-windows-x86_64
    31 
    -    - browser-macos
    32 
    -    - browser-src
    33 
    -    - browser-all-target
    34 
    -  browser-all-android:
    35 
    -    - browser-android-armv7
    36 
    -    - browser-android-x86
    37 
    -    - browser-android-x86_64
    38 
    -    - browser-android-aarch64
    15 
    +  browser-single-platform:
    16 
    +    var:
    17 
    +      browser_platforms:
    18 
    +        is_android_release: 0
    19 
    +        is_desktop_release: 0
    39 20 
       browser-android-armv7:
    40 21 
         var:
    41 
    -      browser-android-armv7: 1
    22 
    +      browser_platforms:
    23 
    +        android-armv7: 1
    42 24 
       browser-android-x86:
    43 25 
         var:
    44 
    -      browser-android-x86: 1
    26 
    +      browser_platforms:
    27 
    +        android-x86: 1
    45 28 
       browser-android-x86_64:
    46 29 
         var:
    47 
    -      browser-android-x86_64: 1
    30 
    +      browser_platforms:
    31 
    +        android-x86_64: 1
    48 32 
       browser-android-aarch64:
    49 33 
         var:
    50 
    -      browser-android-aarch64: 1
    34 
    +      browser_platforms:
    35 
    +        android-aarch64: 1
    51 36 
       browser-linux-x86_64:
    52 37 
         var:
    53 
    -      browser-linux-x86_64: 1
    38 
    +      browser_platforms:
    39 
    +        linux-x86_64: 1
    54 40 
           linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]'
    55 41 
       browser-linux-x86_64-asan:
    56 42 
         var:
    57 
    -      browser-linux-x86_64: 1
    43 
    +      browser_platforms:
    44 
    +        linux-x86_64: 1
    58 45 
           asan-build: '-asan'
    59 46 
       browser-linux-i686:
    60 47 
         var:
    61 
    -      browser-linux-i686: '[% c("var/browser_type") != "mullvadbrowser" %]'
    48 
    +      browser_platforms:
    49 
    +        linux-i686: 1
    62 50 
           linux-packages: '[% c("var/mullvad-browser") || c("var/tor-browser-linux-packages") %]'
    63 51 
       browser-linux-aarch64:
    64 52 
         var:
    65 
    -      browser-linux-aarch64: '[% ! c("var/browser-all-target") || c("var/testbuild") || c("var/nightly") %]'
    53 
    +      browser_platforms:
    54 
    +        linux-aarch64: 1
    66 55 
           linux-packages-aarch64: '[% (! c("var/browser-all-target") || c("var/testbuild") || c("var/nightly")) && (c("var/mullvad-browser") || c("var/tor-browser-linux-packages")) %]'
    67 56 
       browser-windows-i686:
    68 57 
         var:
    69 
    -      browser-windows-i686: '[% c("var/browser_type") != "mullvadbrowser" %]'
    58 
    +      browser_platforms:
    59 
    +        windows-i686: '[% c("var/browser_type") != "mullvadbrowser" %]'
    70 60 
       browser-windows-x86_64:
    71 61 
         var:
    72 
    -      browser-windows-x86_64: 1
    62 
    +      browser_platforms:
    63 
    +        windows-x86_64: 1
    73 64 
       browser-macos:
    74 65 
         var:
    75 
    -      browser-macos: 1
    66 
    +      browser_platforms:
    67 
    +        macos: 1
    76 68 
       browser-macos-x86_64:
    77 69 
         var:
    78 
    -      browser-macos-x86_64: 1
    70 
    +      browser_platforms:
    71 
    +        macos-x86_64: 1
    79 72 
       browser-macos-aarch64:
    80 73 
         var:
    81 
    -      browser-macos-aarch64: 1
    74 
    +      browser_platforms:
    75 
    +        macos-aarch64: 1
    82 76 
       browser-src:
    83 77 
         var:
    84 78 
           browser-src: '[% ! c("var/testbuild") %]'
    ... ... @@ -93,8 +87,6 @@ targets:
    93 87 
         - torbrowser
    94 88 
         - release
    95 89 
         - browser-all
    96 
    -    - browser-all-android
    97 
    -    - browser-all-desktop
    98 90
    99 91 
       noversiondir:
    100 92 
         var:
    ... ... @@ -156,7 +148,7 @@ input_files:
    156 148 
     # Release
    157 149 
       - name: android-armv7
    158 150 
         project: browser
    159 
    -    enable: '[% c("var/browser-android-armv7") %]'
    151 
    +    enable: '[% c("var/browser_platforms/android-armv7") %]'
    160 152 
         target:
    161 153 
           - '[% c("var/containers_target") %]'
    162 154 
           - '[% c("var/build_target") %]'
    ... ... @@ -164,7 +156,7 @@ input_files:
    164 156
    165 157 
       - name: android-x86
    166 158 
         project: browser
    167 
    -    enable: '[% c("var/browser-android-x86") %]'
    159 
    +    enable: '[% c("var/browser_platforms/android-x86") %]'
    168 160 
         target:
    169 161 
           - '[% c("var/containers_target") %]'
    170 162 
           - '[% c("var/build_target") %]'
    ... ... @@ -172,7 +164,7 @@ input_files:
    172 164
    173 165 
       - name: android-x86_64
    174 166 
         project: browser
    175 
    -    enable: '[% c("var/browser-android-x86_64") %]'
    167 
    +    enable: '[% c("var/browser_platforms/android-x86_64") %]'
    176 168 
         target:
    177 169 
           - '[% c("var/containers_target") %]'
    178 170 
           - '[% c("var/build_target") %]'
    ... ... @@ -180,7 +172,7 @@ input_files:
    180 172
    181 173 
       - name: android-aarch64
    182 174 
         project: browser
    183 
    -    enable: '[% c("var/browser-android-aarch64") %]'
    175 
    +    enable: '[% c("var/browser_platforms/android-aarch64") %]'
    184 176 
         target:
    185 177 
           - '[% c("var/containers_target") %]'
    186 178 
           - '[% c("var/build_target") %]'
    ... ... @@ -188,28 +180,28 @@ input_files:
    188 180
    189 181 
       - name: linux-x86_64
    190 182 
         project: browser
    191 
    -    enable: '[% c("var/browser-linux-x86_64") %]'
    183 
    +    enable: '[% c("var/browser_platforms/linux-x86_64") %]'
    192 184 
         target:
    193 185 
           - '[% c("var/build_target") %]'
    194 186 
           - '[% c("var/browser_type") %]-linux-x86_64[% c("var/asan-build") %]'
    195 187
    196 188 
       - name: linux-i686
    197 189 
         project: browser
    198 
    -    enable: '[% c("var/browser-linux-i686") %]'
    190 
    +    enable: '[% c("var/browser_platforms/linux-i686") %]'
    199 191 
         target:
    200 192 
           - '[% c("var/build_target") %]'
    201 193 
           - '[% c("var/browser_type") %]-linux-i686'
    202 194
    203 195 
       - name: linux-aarch64
    204 196 
         project: browser
    205 
    -    enable: '[% c("var/browser-linux-aarch64") %]'
    197 
    +    enable: '[% c("var/browser_platforms/linux-aarch64") %]'
    206 198 
         target:
    207 199 
           - '[% c("var/build_target") %]'
    208 200 
           - '[% c("var/browser_type") %]-linux-aarch64'
    209 201
    210 202 
       - name: deb-packages
    211 203 
         project: linux-packages
    212 
    -    enable: '[% c("var/linux-packages") %]'
    204 
    +    enable: '[% c("var/browser_platforms/packages") %]'
    213 205 
         # Add $browser_type-linux-x86_64 target for container config
    214 206 
         target:
    215 207 
           - '[% IF c("var/testbuild") %]testbuild[% END %]'
    ... ... @@ -247,21 +239,21 @@ input_files:
    247 239
    248 240 
       - name: windows-i686
    249 241 
         project: browser
    250 
    -    enable: '[% c("var/browser-windows-i686") %]'
    242 
    +    enable: '[% c("var/browser_platforms/windows-i686") %]'
    251 243 
         target:
    252 244 
           - '[% c("var/build_target") %]'
    253 245 
           - '[% c("var/browser_type") %]-windows-i686'
    254 246
    255 247 
       - name: windows-x86_64
    256 248 
         project: browser
    257 
    -    enable: '[% c("var/browser-windows-x86_64") %]'
    249 
    +    enable: '[% c("var/browser_platforms/windows-x86_64") %]'
    258 250 
         target:
    259 251 
           - '[% c("var/build_target") %]'
    260 252 
           - '[% c("var/browser_type") %]-windows-x86_64'
    261 253
    262 254 
       - name: macos
    263 255 
         project: browser
    264 
    -    enable: '[% c("var/browser-macos") %]'
    256 
    +    enable: '[% c("var/browser_platforms/macos") %]'
    265 257 
         target:
    266 258 
           - '[% c("var/build_target") %]'
    267 259 
           - '[% c("var/browser_type") %]-macos'
    ... ... @@ -269,7 +261,7 @@ input_files:
    269 261 
      # non-universal macos build
    270 262 
       - name: macos-x86_64
    271 263 
         project: browser
    272 
    -    enable: '[% c("var/browser-macos-x86_64") %]'
    264 
    +    enable: '[% c("var/browser_platforms/macos-x86_64") %]'
    273 265 
         target:
    274 266 
           - '[% c("var/build_target") %]'
    275 267 
           - '[% c("var/browser_type") %]-macos-x86_64'
    ... ... @@ -277,7 +269,7 @@ input_files:
    277 269 
      # non-universal macos build
    278 270 
       - name: macos-aarch64
    279 271 
         project: browser
    280 
    -    enable: '[% c("var/browser-macos-aarch64") %]'
    272 
    +    enable: '[% c("var/browser_platforms/macos-aarch64") %]'
    281 273 
         target:
    282 274 
           - '[% c("var/build_target") %]'
    283 275 
           - '[% c("var/browser_type") %]-macos-aarch64'

  • rbm.conf
    ... ... @@ -79,6 +79,20 @@ var:
    79 79 
       # to be reproducible, browser_release_date should always be in the past.
    80 80 
       browser_release_date: '2025/02/10 18:18:25'
    81 81 
       browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]'
    82 
    +  browser_default_channel: alpha
    83 
    +  browser_platforms:
    84 
    +    is_android_release: '[% c("var/tor-browser") %]'
    85 
    +    is_desktop_release: '1'
    86 
    +    android-armv7: '[% c("var/browser_platforms/is_android_release") %]'
    87 
    +    android-x86: '[% c("var/browser_platforms/is_android_release") %]'
    88 
    +    android-x86_64: '[% c("var/browser_platforms/is_android_release") %]'
    89 
    +    android-aarch64: '[% c("var/browser_platforms/is_android_release") %]'
    90 
    +    linux-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]'
    91 
    +    linux-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]'
    92 
    +    linux-aarch64: '[% c("var/browser_platforms/is_desktop_release") && ( c("var/testbuild") || c("var/nightly") ) %]'
    93 
    +    windows-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]'
    94 
    +    windows-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]'
    95 
    +    macos: '[% c("var/browser_platforms/is_desktop_release") %]'
    82 96 
       updater_enabled: 1
    83 97 
       build_mar: 1
    84 98 
       torbrowser_incremental_from:

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help