boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
f62b1a5e
by Nicolas Vigier at 2026-05-20T10:49:35+02:00
3 changed files:
Changes:
| ... | ... | @@ -68,7 +68,7 @@ done |
| 68 | 68 | MARTOOLS=$rootdir/mar-tools
|
| 69 | 69 | [% END -%]
|
| 70 | 70 | |
| 71 | -mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
|
|
| 71 | +cp -a [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
|
|
| 72 | 72 | [% IF c("var/mullvad-browser") -%]
|
| 73 | 73 | mv [% c('input_files_by_name/ublock-origin') %] "$TBDIR/$EXTSPATH/uBlock0@raymondhill.net.xpi"
|
| 74 | 74 | mv [% c('input_files_by_name/mullvad-extension') %] "$TBDIR/$EXTSPATH/{d19a89b9-76c1-4a61-bcd4-49e8de916403}.xpi"
|
| ... | ... | @@ -413,4 +413,20 @@ cd $distdir |
| 413 | 413 | cp -a $rootdir/[% c('input_files_by_name/firefox-aarch64') %]/artifacts "$OUTDIR"
|
| 414 | 414 | [% END -%]
|
| 415 | 415 | cp -a $rootdir/[% c('input_files_by_name/firefox') %]/artifacts "$OUTDIR"
|
| 416 | + [%
|
|
| 417 | + SET artifacts_archs = [ c("var/osname") ];
|
|
| 418 | + IF c("var/macos_universal");
|
|
| 419 | + SET artifacts_archs = [ 'macos-aarch64', 'macos-x86_64' ];
|
|
| 420 | + END;
|
|
| 421 | + |
|
| 422 | + FOREACH artifacts_arch = artifacts_archs;
|
|
| 423 | + SET arch_ext = artifacts_arch == 'macos-aarch64' ? '-aarch64' : '';
|
|
| 424 | + %]
|
|
| 425 | + cp -a $rootdir/[% c('input_files_by_name/noscript') %] \
|
|
| 426 | + $rootdir/[% c('input_files_by_name/fonts') %] \
|
|
| 427 | + [% IF c("var/tor-browser") -%]
|
|
| 428 | + $rootdir/[% c('input_files_by_name/tor-expert-bundle' _ arch_ext) %]/tor-expert-bundle.tar.gz \
|
|
| 429 | + [% END -%]
|
|
| 430 | + "$OUTDIR/artifacts/[% artifacts_arch %]/"
|
|
| 431 | + [% END %]
|
|
| 416 | 432 | [% END %] |
| ... | ... | @@ -133,7 +133,11 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $ |
| 133 | 133 | [% END -%]
|
| 134 | 134 | |
| 135 | 135 | [% IF c("var/dev_artifacts") -%]
|
| 136 | - mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts/android-[% c('var/abi') %]"
|
|
| 136 | + artifacts_dir="[% dest_dir %]/[% c('filename') %]/artifacts/android-[% c('var/abi') %]"
|
|
| 137 | + mkdir -p "$artifacts_dir"
|
|
| 137 | 138 | mv $rootdir/[% c('input_files_by_name/fenix') %]/geckoview/artifacts/[% c('var/abi') %]/* \
|
| 138 | - "[% dest_dir %]/[% c('filename') %]/artifacts/android-[% c('var/abi') %]"
|
|
| 139 | + [% IF c("var/tor-browser") -%]
|
|
| 140 | + "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" \
|
|
| 141 | + [% END -%]
|
|
| 142 | + "$artifacts_dir"
|
|
| 139 | 143 | [% END %] |
| ... | ... | @@ -40,6 +40,12 @@ echo "Starting ./mach build $(date)" |
| 40 | 40 | |
| 41 | 41 | ./mach python -m mozbuild.action.test_archive mozharness mozharness.zip
|
| 42 | 42 | mv mozharness.zip $artifactsdir
|
| 43 | + |
|
| 44 | + cp -a \
|
|
| 45 | + [% IF !c("var/firefox-browser") %]$rootdir/[% c('input_files_by_name/application-services') %][% END %] \
|
|
| 46 | + $rootdir/[% c('input_files_by_name/cbindgen') %] \
|
|
| 47 | + $rootdir/[% c('input_files_by_name/node') %] \
|
|
| 48 | + $artifactsdir
|
|
| 43 | 49 | [% END %]
|
| 44 | 50 | |
| 45 | 51 | echo "Build finished, copying the AAR to the to the destination directory $(date)"
|