[tor-commits] [tor-browser-build/maint-10.5] Bug 40333: Add a temporary ff91esr target in rbm.conf

[sysrqb at torproject.org]

commit 2df9fec5496899de07c6820f0e13c16e3cdb6d85
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Jul 8 16:47:24 2021 +0200

    Bug 40333: Add a temporary ff91esr target in rbm.conf
---
 projects/cbindgen/config |  2 +-
 projects/clang/build     |  2 +-
 projects/clang/config    |  6 +++---
 projects/node/config     |  2 +-
 projects/rust/build      |  4 ++--
 projects/rust/config     |  8 +++++---
 rbm.conf                 | 11 +++++++++++
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/projects/cbindgen/config b/projects/cbindgen/config
index 125d0e4..6b7695e 100644
--- a/projects/cbindgen/config
+++ b/projects/cbindgen/config
@@ -13,7 +13,7 @@ var:
     use_container: 1
 
 targets:
-  android:
+  ff91esr:
     var:
       cbindgen_version: 0.19.0
       cbindgen_hash: d9e490ce8b836194595bd30611253a7028059da2
diff --git a/projects/clang/build b/projects/clang/build
index 05a93dc..608d80c 100644
--- a/projects/clang/build
+++ b/projects/clang/build
@@ -25,7 +25,7 @@ export LLVM_HOME=$(pwd)
 mkdir build
 cd build
 # XXX: remove duplicated parts while fixing tor-browser-build#40048
-[% IF ! c("var/android") %]
+[% IF ! c("var/ff91esr") %]
   cmake .. -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$distdir \
                                -DCMAKE_BUILD_TYPE:STRING=Release \
        [% IF c("var/rlbox") -%]-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly \[% END -%]
diff --git a/projects/clang/config b/projects/clang/config
index 2d12335..3ce6d97 100644
--- a/projects/clang/config
+++ b/projects/clang/config
@@ -8,7 +8,7 @@ var:
     use_container: 1
 
 targets:
-  android:
+  ff91esr:
     var:
       llvm_version: '[% pc("llvm-project", "version") %]'
 
@@ -32,7 +32,7 @@ input_files:
     name: cmake
   - project: clang-source
     name: clang-source
-    enable: '[% ! c("var/android") %]'
+    enable: '[% ! c("var/ff91esr") %]'
   - project: llvm-project
     name: clang-source
-    enable: '[% c("var/android") %]'
+    enable: '[% c("var/ff91esr") %]'
diff --git a/projects/node/config b/projects/node/config
index 87de822..30fce8d 100644
--- a/projects/node/config
+++ b/projects/node/config
@@ -8,7 +8,7 @@ var:
     use_container: 1
 
 targets:
-  android:
+  ff91esr:
     var:
       node_version: 10.23.1
       node_hash: 88aa16f5af79615b183ca55ed81393763169e75d1fb96013cf1831895c6cedfa
diff --git a/projects/rust/build b/projects/rust/build
index 9609758..d4061eb 100644
--- a/projects/rust/build
+++ b/projects/rust/build
@@ -4,7 +4,7 @@ distdir=/var/tmp/dist/[% project %]
 mkdir -p $distdir
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %]
 export PATH="/var/tmp/dist/cmake/bin:$PATH"
-[% IF c("var/android") %]
+[% IF c("var/ff91esr") %]
   tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %]
   export PATH=/var/tmp/dist/ninja:$PATH
 [% END %]
@@ -40,7 +40,7 @@ mkdir /var/tmp/build
 tar -C /var/tmp/build -xf  [% c('input_files_by_name/rust') %]
 cd /var/tmp/build/rustc-[% c('version') %]-src
 
-[% IF ! c("var/android") %]
+[% IF ! c("var/ff91esr") %]
   # LLVM has reproducibility issues when optimizing bitcode, which we need to
   # patch. See: #32053 for more details.
   cd src/llvm-project
diff --git a/projects/rust/config b/projects/rust/config
index b6e22d7..05d33b2 100644
--- a/projects/rust/config
+++ b/projects/rust/config
@@ -9,10 +9,12 @@ var:
     use_container: 1
 
 targets:
-  android:
+  ff91esr:
     var:
       current_version: 1.52.0
       previous_version: 1.51.0
+  android:
+    var:
       arch_deps:
         - libssl-dev
         - pkg-config
@@ -81,7 +83,7 @@ input_files:
     name: cmake
   - project: ninja
     name: ninja
-    enable: '[% c("var/android") %]'
+    enable: '[% c("var/ff91esr") %]'
   - project: '[% c("var/compiler") %]'
     name: '[% c("var/compiler") %]'
   - URL: 'https://static.rust-lang.org/dist/rustc-[% c("var/current_version") %]-src.tar.gz'
@@ -98,4 +100,4 @@ input_files:
     enable: '[% c("var/windows-i686") %]'
   - filename: 43909.patch
     name: 43909
-    enable: '[% ! c("var/android") %]'
+    enable: '[% ! c("var/ff91esr") %]'
diff --git a/rbm.conf b/rbm.conf
index 95ec20a..7eb2e00 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -265,9 +265,17 @@ targets:
         - zip
         - unzip
 
+  # Temporary target for the switch to firefox91. We use it to switch each
+  # platform separately to firefox91, and we should remove it once all
+  # platforms have been moved to it.
+  ff91esr:
+    var:
+      ff91esr: 1
+
   torbrowser-android-armv7:
     - android-armv7
     - android
+    - ff91esr
   android-armv7:
     arch: armv7
     var:
@@ -279,6 +287,7 @@ targets:
   torbrowser-android-x86:
     - android-x86
     - android
+    - ff91esr
   android-x86:
     arch: x86
     var:
@@ -290,6 +299,7 @@ targets:
   torbrowser-android-x86_64:
     - android-x86_64
     - android
+    - ff91esr
   android-x86_64:
     arch: x86_64
     var:
@@ -301,6 +311,7 @@ targets:
   torbrowser-android-aarch64:
     - android-aarch64
     - android
+    - ff91esr
   android-aarch64:
     arch: aarch64
     var: