[tbb-commits] [tor-browser-build/master] Bug 32768: Create a build-infos.json file
sysrqb at torproject.org
sysrqb at torproject.org
Wed Feb 5 00:32:40 UTC 2020
commit 50b8b9db82bbf84713b3af0bbe27d06a729642ab
Author: Nicolas Vigier <boklm at torproject.org>
Date: Mon Dec 16 18:57:22 2019 +0100
Bug 32768: Create a build-infos.json file
Create a file containing firefox platformVersion and buildID.
---
projects/firefox/build | 9 +++++++++
projects/tor-browser/build | 3 +++
rbm.conf | 1 +
3 files changed, 13 insertions(+)
diff --git a/projects/firefox/build b/projects/firefox/build
index 22c5b5d..c334854 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -273,3 +273,12 @@ END;
zip_src => [ 'mar-tools' ],
zip_args => dest_dir _ '/' _ c('filename') _ '/' _ c('var/martools_filename'),
}) %]
+
+[% IF c("var/build_infos_json") -%]
+ cat > "[% dest_dir _ '/' _ c('filename') _ '/build-infos.json' %]" << EOF_BUILDINFOS
+ {
+ "firefox_platform_version" : "[% c("var/firefox_platform_version") %]",
+ "firefox_buildid" : "$MOZ_BUILD_DATE"
+ }
+EOF_BUILDINFOS
+[% END -%]
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 4d44f12..2633ddc 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -297,6 +297,9 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
[% IF c("var/linux") -%]
cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz
[% END -%]
+[% IF c("var/build_infos_json") -%]
+ cp $rootdir/[% c('input_files_by_name/firefox') %]/build-infos.json "$OUTDIR"/build-infos-[% c("var/mar_osname") %].json
+[% END -%]
# Create a tarball with all Linux x86_64 language packs (Bug 32676)
[% IF c("var/release") && c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%]
diff --git a/rbm.conf b/rbm.conf
index f0e22a8..77c6e4a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -158,6 +158,7 @@ targets:
- fr
- ru
max_torbrowser_incremental_from: 2
+ build_infos_json: 1
torbrowser-testbuild:
- testbuild
More information about the tbb-commits
mailing list