Bug 1387227 - Use tooltool provided xz; r=me a=jorgk DONTBUILD
authorTom Prince <mozilla@hocat.ca>
Thu, 03 Aug 2017 18:50:39 -0600
changeset 28614 a0cedf86bdab256d625bf0842d827bd68eb40182
parent 28613 2794411e10d663af0b80f37b5f33382f40f8e9ba
child 28615 4faa0ad7e1e8e9b7c38426c13dca2e4bd9508d76
child 28617 f39bbe313d6de4c83c2fccd85ebe7e972e67926e
push id2021
push usermozilla@jorgk.com
push dateThu, 21 Sep 2017 17:07:59 +0000
treeherdercomm-beta@a0cedf86bdab [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, jorgk
bugs1387227
Bug 1387227 - Use tooltool provided xz; r=me a=jorgk DONTBUILD MozReview-Commit-ID: 8uc7HDN3IVT
mail/config/mozconfigs/win32/debug
mail/config/mozconfigs/win32/l10n-mozconfig
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win32/release
mail/config/mozconfigs/win64/debug
mail/config/mozconfigs/win64/l10n-mozconfig
mail/config/mozconfigs/win64/nightly
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -24,8 +24,11 @@ export MOZ_PACKAGE_JSSHELL=1
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ b/mail/config/mozconfigs/win32/l10n-mozconfig
@@ -25,8 +25,11 @@ MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -27,8 +27,11 @@ export MOZ_PACKAGE_JSSHELL=1
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/release
@@ -28,8 +28,11 @@ export MOZ_PACKAGE_JSSHELL=1
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@@ -24,8 +24,11 @@ MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win64/l10n-mozconfig
+++ b/mail/config/mozconfigs/win64/l10n-mozconfig
@@ -24,8 +24,11 @@ MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -27,8 +27,11 @@ export MOZ_PACKAGE_JSSHELL=1
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=$INCLUDE:/c/Office\ 2010\ Developer\ Resources/Outlook\ 2010\ MAPI\ Headers
 mk_export_correct_style INCLUDE
 
 # Run client.py
 mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
 mk_add_options ALWAYS_RUN_CLIENT_PY=1
+
+# Use the TOOLTOOL provided xz for mar generation.
+mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"