projects/cmake/config

@@ -15,4 +15,4 @@ input_files:
     enable: '[% c("var/linux") %]'
     target:
       - '[% c("var/channel") %]'
-      - 'torbrowser-linux-x86_64'
+      - 'basebrowser-linux-x86_64'

projects/firefox/config

@@ -189,7 +189,7 @@ input_files:
     enable: '[% c("var/linux-cross") %]'
     target:
       - '[% c("var/channel") %]'
-      - 'torbrowser-linux-x86_64'
+      - 'basebrowser-linux-x86_64'
   - project: nasm
     name: nasm
     enable: '[% ! c("var/linux-cross") %]'
@@ -198,7 +198,7 @@ input_files:
     enable: '[% c("var/linux-cross") %]'
     target:
       - '[% c("var/channel") %]'
-      - 'torbrowser-linux-x86_64'
+      - 'basebrowser-linux-x86_64'
   - project: python
     name: python
     enable: '[% c("var/linux") %]'
@@ -210,13 +210,13 @@ input_files:
     enable: '[% c("var/linux-cross") %]'
     target:
       - '[% c("var/channel") %]'
-      - 'torbrowser-linux-x86_64'
+      - 'basebrowser-linux-x86_64'
   - project: gcc
     name: gcc
     enable: '[% c("var/linux-cross") %]'
     target:
       - '[% c("var/channel") %]'
-      - 'torbrowser-linux-x86_64'
+      - 'basebrowser-linux-x86_64'
   - project: fxc2
     name: fxc2
     enable: '[% c("var/windows") %]'

projects/firefox/list_toolchain_updates_checks

@@ -44,12 +44,11 @@ check_update_needed cbindgen "$needed" "$current"
 
 # nasm
 read -d '' p << 'EOF' || true
-if (m/^\\s*MODERN_NASM_VERSION\\s*=\\s*LooseVersion\\("([^"]+)"\\)/) {
-  print $1;
-  exit;
-}
+my $nasm = YAML::XS::LoadFile('taskcluster/ci/toolchain/nasm.yml');
+my $linux64 = 'linux64-nasm';
+print substr $nasm->{$linux64}{'fetches'}{'fetch'}[0], 5;
 EOF
-needed=$(cat python/mozboot/mozboot/base.py | perl -ne "$p")
+needed=$(perl -MYAML::XS -e "$p")
 current='2.15.05'
 check_update_needed nasm "$needed" "$current"
 

projects/gcc/config

@@ -1,13 +1,12 @@
 # vim: filetype=yaml sw=2
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+filename: '[% project %]-[% c("version") %]-[% IF c("linux-cross") %][% c("var/osname") %][% ELSE %]x86[% END %]-[% c("var/build_id") %].tar.gz'
 # Note: When updating the gcc version, if this includes a libstdc++
 # ABI change we should also update projects/firefox/abicheck.cc to
 # require the new version.
-version: '[% c("var/gcc_version") %]'
+version: '[% pc("gcc-source", "version") %]'
 container:
   use_container: 1
 var:
-  gcc_version: '[% pc("gcc-source", "version") %]'
   distdir: gcc
   deps:
     - build-essential

projects/mingw-w64/config

@@ -2,11 +2,10 @@
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: https://git.code.sf.net/p/mingw-w64/mingw-w64
 git_hash: aa08f56da559016f10336dddca85d59f9bdc9e02
-version: '[% c("abbrev") %]'
+version: '[% pc("gcc-source", "version") %]'
 container:
   use_container: 1
 var:
-  gcc_version: '[% pc("gcc-source", "version") %]'
   deps:
     - automake
     - build-essential

projects/openssl/build

@@ -8,7 +8,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
 [% IF c("var/osname") == "linux-i686" -%]
 export CC='gcc -m32'
 [% END %]
-# OpenSSL preprends the host triple to $CC
+# OpenSSL prepends the host triple to $CC
 [% IF c("var/osx") -%]
   # Tricking OpenSSL into using our clang as cross-compiler
   ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin-cc

projects/rust/build

@@ -7,7 +7,7 @@ export PATH="/var/tmp/dist/cmake/bin:$PATH"
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %]
 export PATH=/var/tmp/dist/binutils/bin:$PATH
 tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust_prebuilt') %]
-cd /var/tmp/dist/rust-[% c('var/version') %]-x86_64-unknown-linux-gnu
+cd /var/tmp/dist/rust-[% c('version') %]-x86_64-unknown-linux-gnu
 ./install.sh --prefix=$distdir-rust-prebuilt
 export PATH="$distdir-rust-prebuilt/bin:$PATH"
 

projects/rust/config

@@ -1,16 +1,12 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-version: '[% c("var/version") %]'
+version: '1.60.0'
 container:
   use_container: 1
 
-var:
-  version: 1.60.0
-
 targets:
   android:
     var:
-      version: 1.60.0
       arch_deps:
         - libssl-dev
         - pkg-config
@@ -103,7 +99,7 @@ input_files:
     enable: '[% c("var/linux-cross") %]'
     target:
       - '[% c("var/channel") %]'
-      - 'browser-linux-x86_64'
+      - 'basebrowser-linux-x86_64'
   - project: clang
     name: clang
     # On Windows we the basic Clang without additional Windows stuff because we
@@ -111,12 +107,12 @@ input_files:
     # libgcc, and the GNU/LLVM is a tier 3 platform supported only for x86_64).
     # macOS does not need Clang because it comes already with its compiler.
     enable: '[% c("var/linux") || c("var/android") || c("var/windows") %]'
-  - URL: 'https://static.rust-lang.org/dist/rustc-[% c("var/version") %]-src.tar.gz'
+  - URL: 'https://static.rust-lang.org/dist/rustc-[% c("version") %]-src.tar.gz'
     name: rust
     sig_ext: asc
     file_gpg_id: 1
     gpg_keyring: rust.gpg
-  - URL: 'https://static.rust-lang.org/dist/rust-[% c("var/version") %]-x86_64-unknown-linux-gnu.tar.xz'
+  - URL: 'https://static.rust-lang.org/dist/rust-[% c("version") %]-x86_64-unknown-linux-gnu.tar.xz'
     name: rust_prebuilt
     sig_ext: asc
     file_gpg_id: 1

projects/tor/config

@@ -83,7 +83,7 @@ input_files:
     enable: '[% c("var/linux-cross") %]'
     target:
       - '[% c("var/channel") %]'
-      - 'torbrowser-linux-x86_64'
+      - 'basebrowser-linux-x86_64'
   - name: zstd
     project: zstd
     enable: '[% c("var/android") %]'