[tor-commits] [tor-browser-build/master] Bug 26410: Stop using old MAR format in the next esr60-based alpha

[gk at torproject.org]

commit 2846221abfaeb05837e7d4a2056741df555dbd5e
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Jun 28 14:29:24 2018 +0200

    Bug 26410: Stop using old MAR format in the next esr60-based alpha
    
    However we keep setting MAR_OLD_FORMAT=1 on the stable release for now.
---
 Makefile                   | 6 +++---
 projects/tor-browser/build | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 3b5c2d9..b667960 100644
--- a/Makefile
+++ b/Makefile
@@ -119,7 +119,7 @@ incrementals-release: submodule-update
 incrementals-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals
 	tools/update-responses/download_missing_versions alpha
-	MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha
+	tools/update-responses/gen_incrementals alpha
 	$(rbm) build release --step hash_incrementals --target alpha
 
 update_responses-release: submodule-update
@@ -138,9 +138,9 @@ dmg2mar-release: submodule-update
 
 dmg2mar-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target signed
-	MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target alpha --target signed
+	$(rbm) build release --step dmg2mar --target alpha --target signed
 	tools/update-responses/download_missing_versions alpha
-	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha
+	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
 
 submodule-update:
 	git submodule update --init
diff --git a/projects/tor-browser/build b/projects/tor-browser/build
index 0c3e583..50fdc30 100644
--- a/projects/tor-browser/build
+++ b/projects/tor-browser/build
@@ -264,9 +264,11 @@ popd
 cd $distdir
 
 [% IF c("var/build_mar") -%]
-  # Let's use the bzip2 format for now so that users can update to the first
-  # esr60-based Tor Browser.
-  export MAR_OLD_FORMAT=1
+  [% IF c("var/release") -%]
+    # Let's use the bzip2 format for now so that users can update to the first
+    # esr60-based Tor Browser.
+    export MAR_OLD_FORMAT=1
+  [% END -%]
   # Create full MAR file and compressed package.
   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"