boklm pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
18e1ee58
by Nicolas Vigier at 2025-07-09T12:34:30+02:00
7 changed files:
- projects/browser/build
- projects/browser/build.android
- projects/firefox/build
- projects/geckoview/build
- projects/geckoview/build_apk
- rbm.conf
- rbm.local.conf.example
Changes:
| ... | ... | @@ -411,7 +411,7 @@ cd $distdir |
| 411 | 411 | popd
|
| 412 | 412 | [% END %]
|
| 413 | 413 | |
| 414 | -[% IF c("var/nightly") -%]
|
|
| 414 | +[% IF c("var/dev_artifacts") -%]
|
|
| 415 | 415 | [% IF c("var/macos_universal") -%]
|
| 416 | 416 | mkdir -p "$OUTDIR"/artifacts/aarch64
|
| 417 | 417 | cp -a $rootdir/[% c('input_files_by_name/firefox-aarch64') %]/artifacts/. "$OUTDIR/artifacts/aarch64"
|
| ... | ... | @@ -120,7 +120,7 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $ |
| 120 | 120 | cp "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" [% dest_dir %]/[% c('filename') %]/$tor_expert_bundle_dest
|
| 121 | 121 | [% END -%]
|
| 122 | 122 | |
| 123 | -[% IF c("var/nightly") -%]
|
|
| 123 | +[% IF c("var/dev_artifacts") -%]
|
|
| 124 | 124 | mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts/"
|
| 125 | 125 | mv $rootdir/[% c('input_files_by_name/fenix') %]/artifacts[% IF !c('var/android_single_arch') %]/[% c("var/abi") %][% END %] [% dest_dir %]/[% c('filename') %]/artifacts
|
| 126 | 126 | [% END %] |
| ... | ... | @@ -123,7 +123,7 @@ echo "Starting ./mach build $(date)" |
| 123 | 123 | ./mach build stage-package
|
| 124 | 124 | [% END -%]
|
| 125 | 125 | |
| 126 | -[% IF c("var/nightly") -%]
|
|
| 126 | +[% IF c("var/dev_artifacts") -%]
|
|
| 127 | 127 | echo "Building development artifacts"
|
| 128 | 128 | |
| 129 | 129 | [% IF c("var/macos") -%]
|
| ... | ... | @@ -34,7 +34,7 @@ echo "Starting ./mach configure $(date)" |
| 34 | 34 | echo "Starting ./mach build $(date)"
|
| 35 | 35 | ./mach build --verbose
|
| 36 | 36 | |
| 37 | -[% IF c("var/nightly") -%]
|
|
| 37 | +[% IF c("var/dev_artifacts") -%]
|
|
| 38 | 38 | echo "Building development artifacts"
|
| 39 | 39 | ./mach package
|
| 40 | 40 |
| ... | ... | @@ -5,9 +5,8 @@ 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 | 8 | |
| 10 | -[% IF c("var/nightly") -%]
|
|
| 9 | +[% IF c("var/dev_artifacts") -%]
|
|
| 11 | 10 | mkdir -p $outdir/[% project %]/artifacts/armeabi-v7a
|
| 12 | 11 | mv $rootdir/[% c('input_files_by_name/geckoview_armv7') %]/artifacts/* $outdir/[% project %]/artifacts/armeabi-v7a
|
| 13 | 12 | mkdir -p $outdir/[% project %]/artifacts/arm64-v8a
|
| ... | ... | @@ -285,6 +285,10 @@ var: |
| 285 | 285 | - zip
|
| 286 | 286 | - zstd
|
| 287 | 287 | |
| 288 | + # Generation of development artifacts is disabled by default. This can
|
|
| 289 | + # be enabled in rbm.local.conf.
|
|
| 290 | + dev_artifacts: 0
|
|
| 291 | + |
|
| 288 | 292 | targets:
|
| 289 | 293 | notarget: linux-x86_64
|
| 290 | 294 | noint:
|
| ... | ... | @@ -65,6 +65,9 @@ var: |
| 65 | 65 | ### upload the files to
|
| 66 | 66 | #tpo_user: username
|
| 67 | 67 | |
| 68 | + ### This option enables generation of development artifacts
|
|
| 69 | + #dev_artifacts: '[% c("var/nightly") %]'
|
|
| 70 | + |
|
| 68 | 71 | ### The clean configuration is used by the cleaning script to find the
|
| 69 | 72 | ### branches and build targets you are using, to compute the list of
|
| 70 | 73 | ### files that should be kept.
|