Verified Commit 30db5fad authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 40410: Get rid of python2

parent b096b32e

projects/browser/build

+2 −2
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ BROWSER_NSI 
  # See https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/issues/40439#note_2838724

  mkdir $rootdir/extensions

  mv "$TBDIR/$EXTSPATH/"* $rootdir/extensions

  MOZ_AUTOMATION=1 $firefox_src/mach python $firefox_src/toolkit/mozapps/installer/unify.py "$TBDIR" "$TBDIR_AARCH64"

  MOZ_AUTOMATION=1 $firefox_src/mach python3 $firefox_src/toolkit/mozapps/installer/unify.py "$TBDIR" "$TBDIR_AARCH64"

  mkdir -p "$TBDIR/$EXTSPATH"

  mv $rootdir/extensions/* "$TBDIR/$EXTSPATH/"

  rm -Rf "$TBDIR_AARCH64"
@@ -351,7 +351,7 @@ cp -a ${TB_STAGE_DIR} $distdir/$PKG_DIR 
[% IF c("var/updater_enabled") -%]

  pushd "$TBDIR[% IF c("var/macos") %]/Contents/Resources/[% END %]"

  rm -f precomplete

  python $MARTOOLS/createprecomplete.py

  python3 $MARTOOLS/createprecomplete.py

  popd

[% END -%]

cd $distdir

projects/browser/config

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ container: 
var:

  ddmg: '[% INCLUDE ddmg.sh %]'

  deps:

    - python

    - python3

    - libparallel-forkmanager-perl

    - libfile-slurp-perl

    - zip

projects/browser/verify_allowed_addons.py

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/env python

#!/usr/bin/env python3



import json

import sys

projects/node/build

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
                              hardened_gcc => 0 }) %]

  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]

  export PATH="/var/tmp/dist/binutils/bin:$PATH"

  [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]

[% END -%]

distdir=/var/tmp/dist/[% project %]

tar -xf [% c('input_files_by_name/node') %]

projects/node/config

+3 −14
Original line number Diff line number Diff line
@@ -7,20 +7,6 @@ var: 
  node_version: 12.22.12

  node_hash: bc42b7f8495b9bfc7f7850dd180bb02a5bdf139cc232b8c6f02a6967e20714f2



targets:

  windows:

    var:

      arch_deps:

        - python2

  macos:

    var:

      arch_deps:

        - python2

  android:

    var:

      arch_deps:

        - python2



input_files:

  - project: container-image

  - project: binutils
@@ -29,6 +15,9 @@ input_files: 
  - project: '[% c("var/compiler") %]'

    name: '[% c("var/compiler") %]'

    enable: '[% c("var/linux") %]'

  - name: python

    project: python

    enable: '[% c("var/linux") %]'

  - URL: 'https://nodejs.org/dist/v[% c("var/node_version") %]/node-v[% c("var/node_version") %].tar.xz'

    sha256sum: '[% c("var/node_hash") %]'

    name: node