[tor-commits] [tor-browser-build/master] Bug 40026: Fix full .mar creation for esr78

[gk at torproject.org]

commit 9bbec35a53f80d2408bf680de67cee505a317a1a
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jul 21 06:18:44 2020 +0000

    Bug 40026: Fix full .mar creation for esr78
    
    At the same time we remove the MBSDIFF environment variable as it is not
    needed for full .mar file generation.
---
 projects/tor-browser/build | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 386ea26..155a7bc 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -262,7 +262,10 @@ cd $distdir
 [% IF c("var/build_mar") -%]
   # Create full MAR file and compressed package.
   [% SET mar_file = 'tor-browser-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %]
-  MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR"
+  MAR=$MARTOOLS/mar \
+  MOZ_PRODUCT_VERSION=[% c("var/torbrowser_version") %] \
+  MAR_CHANNEL_ID=torbrowser-torproject-[% c("var/channel") %] \
+  $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR"
 [% END -%]
 
 [% IF c("var/linux") %]
@@ -377,7 +380,10 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
 
       [% IF build_mar -%]
         # Create full MAR file and compressed package for this locale.
-        MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]"
+        MAR=$MARTOOLS/mar \
+        MOZ_PRODUCT_VERSION=[% c("var/torbrowser_version") %] \
+        MAR_CHANNEL_ID=torbrowser-torproject-[% c("var/channel") %] \
+        $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]"
       [% END -%]
 
       [% IF c("var/linux") %]