Unverified Commit 2846221a authored by boklm's avatar boklm
Browse files

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.
parent 7a338d60

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -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

projects/tor-browser/build

+5 −3
Original line number Diff line number Diff line
@@ -264,9 +264,11 @@ 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"