Commit 12d52de1 authored by boklm's avatar boklm Committed by Georg Koppen
Browse files

Bug 26411: Stop using old MAR format in the second esr60-based stable release

parent ad725d86

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ signtag-alpha: submodule-update 
incrementals-release: submodule-update

	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals

	tools/update-responses/download_missing_versions release

	MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release

	tools/update-responses/gen_incrementals release

	$(rbm) build release --step hash_incrementals --target release



incrementals-alpha: submodule-update
@@ -132,9 +132,9 @@ update_responses-alpha: submodule-update 


dmg2mar-release: submodule-update

	$(rbm) build release --step update_responses_config --target release --target signed

	MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target release --target signed

	$(rbm) build release --step dmg2mar --target release --target signed

	tools/update-responses/download_missing_versions release

	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals release

	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release



dmg2mar-alpha: submodule-update

	$(rbm) build release --step update_responses_config --target alpha --target signed

projects/tor-browser/build

+0 −5
Original line number Diff line number Diff line
@@ -274,11 +274,6 @@ popd 
cd $distdir



[% IF c("var/build_mar") -%]

  [% 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"