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

Commits:

3 changed files:

Changes:

  • projects/browser/build.android
    ... ... @@ -121,6 +121,6 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $
    121 121 
     [% END -%]
    122 122
    123 123 
     [% IF c("var/nightly") -%]
    124 
    -  # mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts"
    125 
    -  # cp -r $rootdir/[% c('input_files_by_name/fenix') %]/artifacts [% dest_dir %]/[% c('filename') %]
    124 
    +  mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts/"
    125 
    +  mv $rootdir/[% c('input_files_by_name/fenix') %]/geckoview/artifacts/[% c("var/abi") %] [% dest_dir %]/[% c('filename') %]/artifacts
    126 126 
     [% END %]

  • projects/geckoview/build_apk
    ... ... @@ -5,6 +5,19 @@ echo "Starting the creation of the fat AAR $(date)"
    5 5
    6 6 
     tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
    7 7
    8 
    +mkdir -p $outdir/[% project %]/artifacts
    9 
    +
    10 
    +[% IF c("var/nightly") -%]
    11 
    +  mkdir -p $outdir/[% project %]/artifacts/armeabi-v7a
    12 
    +  mv $rootdir/[% c('input_files_by_name/geckoview_armv7') %]/artifacts/* $outdir/[% project %]/artifacts/armeabi-v7a
    13 
    +  mkdir -p $outdir/[% project %]/artifacts/arm64-v8a
    14 
    +  mv $rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/artifacts/* $outdir/[% project %]/artifacts/arm64-v8a
    15 
    +  mkdir -p $outdir/[% project %]/artifacts/x86
    16 
    +  mv $rootdir/[% c('input_files_by_name/geckoview_x86') %]/artifacts/* $outdir/[% project %]/artifacts/x86
    17 
    +  mkdir -p $outdir/[% project %]/artifacts/x86_64
    18 
    +  mv $rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/artifacts/* $outdir/[% project %]/artifacts/x86_64
    19 
    +[% END -%]
    20 
    +
    8 21 
     # Specify the architectures we want to merge
    9 22 
     export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86,x86_64
    10 23 
     export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/*.aar

  • projects/release/build
    1 
    -#!/bin/sh
    1 
    +#!/bin/bash
    2 2 
     [% c("var/set_default_env") -%]
    3 3 
     # reset HOME which was changed by var/set_default_env, for gpg
    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 
    +
    8 
    +function mv_files {
    9 
    +  inputfile="$1"
    10 
    +  if test -d "$inputfile"/artifacts
    11 
    +  then
    12 
    +    mkdir -p "$destdir"/artifacts
    13 
    +    mv "$inputfile"/artifacts/* "$destdir"/artifacts
    14 
    +    rmdir "$inputfile"/artifacts
    15 
    +  fi
    16 
    +  mv "$inputfile"/* "$destdir"/
    17 
    +}
    18 
    +
    7 19 
     [% IF c("var/browser_platforms/android-armv7") -%]
    8 
    -  mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/
    20 
    +  mv_files "[% c('input_files_by_name/android-armv7') %]"
    9 21 
     [% END -%]
    10 22 
     [% IF c("var/browser_platforms/android-x86") -%]
    11 
    -  mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/
    23 
    +  mv_files "[% c('input_files_by_name/android-x86') %]"
    12 24 
     [% END -%]
    13 25 
     [% IF c("var/browser_platforms/android-x86_64") -%]
    14 
    -  mv [% c('input_files_by_name/android-x86_64') %]/* "$destdir"/
    26 
    +  mv_files "[% c('input_files_by_name/android-x86_64') %]"
    15 27 
     [% END -%]
    16 28 
     [% IF c("var/browser_platforms/android-aarch64") -%]
    17 
    -  mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/
    29 
    +  mv_files "[% c('input_files_by_name/android-aarch64') %]"
    18 30 
     [% END -%]
    19 31 
     [% IF c("var/browser_platforms/windows-i686") -%]
    20 
    -  mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/
    32 
    +  mv_files "[% c('input_files_by_name/windows-i686') %]"
    21 33 
     [% END -%]
    22 34 
     [% IF c("var/browser_platforms/windows-x86_64") -%]
    23 
    -  mv [% c('input_files_by_name/windows-x86_64') %]/* "$destdir"/
    35 
    +  mv_files "[% c('input_files_by_name/windows-x86_64') %]"
    24 36 
     [% END -%]
    25 37 
     [% IF c("var/browser_platforms/macos") -%]
    26 
    -  mv [% c('input_files_by_name/macos') %]/* "$destdir"/
    38 
    +  mv_files "[% c('input_files_by_name/macos') %]"
    27 39 
     [% END -%]
    28 40 
     [% IF c("var/browser_platforms/macos-x86_64") -%]
    29 
    -  mv [% c('input_files_by_name/macos-x86_64') %]/* "$destdir"/
    41 
    +  mv_files "[% c('input_files_by_name/macos-x86_64') %]"
    30 42 
     [% END -%]
    31 43 
     [% IF c("var/browser_platforms/macos-aarch64") -%]
    32 
    -  mv [% c('input_files_by_name/macos-aarch64') %]/* "$destdir"/
    44 
    +  mv_files "[% c('input_files_by_name/macos-aarch64') %]"
    33 45 
     [% END -%]
    34 46 
     [% IF c("var/browser_platforms/linux-i686") -%]
    35 
    -  mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/
    47 
    +  mv_files "[% c('input_files_by_name/linux-i686') %]"
    36 48 
     [% END -%]
    37 49 
     [% IF c("var/browser_platforms/linux-x86_64") -%]
    38 
    -  mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/
    50 
    +  mv_files "[% c('input_files_by_name/linux-x86_64') %]"
    39 51 
     [% END -%]
    40 52 
     [% IF c("var/browser_platforms/linux-aarch64") -%]
    41 
    -  mv [% c('input_files_by_name/linux-aarch64') %]/* "$destdir"/
    53 
    +  mv_files "[% c('input_files_by_name/linux-aarch64') %]"
    42 54 
     [% END -%]
    43 55 
     [% IF c("var/linux-packages") || c("var/linux-packages-aarch64") -%]
    44 56 
       [% IF c("var/linux-packages") -%]
    45 
    -    mv [% c('input_files_by_name/deb-packages') %]/* "$destdir"/
    57 
    +    mv_files "[% c('input_files_by_name/deb-packages') %]"
    46 58 
       [% END -%]
    47 59 
       [% IF c("var/linux-packages-aarch64") -%]
    48 
    -    mv [% c('input_files_by_name/deb-packages-aarch64') %]/* "$destdir"/
    60 
    +    mv_files "[% c('input_files_by_name/deb-packages-aarch64') %]"
    49 61 
       [% END -%]
    50 
    -  mv [% c('input_files_by_name/rpm-packages') %]/* "$destdir"/
    62 
    +  mv_files "[% c('input_files_by_name/rpm-packages') %]"
    51 63 
     [% END -%]
    52 64 
     [% IF c("var/browser-src") -%]
    53 65 
       mv  [% c('input_files_by_name/src-firefox') %]      \

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/095e29b44a1989eb69d387fa372e2694000cd313 at 1751973074