Bug 1387227 - Use tooltool provided xz; r=me
authorTom Prince <mozilla@hocat.ca>
Thu, 03 Aug 2017 18:50:39 -0600
changeset 29476 bb864aeadf150c29fb76ee5585c1b0fc8d1415e8
parent 29475 ec7b0d88769d1fb9eed8179c288145479284d2f8
child 29477 2e9acc97f408a4e13a5ac8d2ea4c0eac78796648
push id378
push userclokep@gmail.com
push dateMon, 13 Nov 2017 18:45:35 +0000
reviewersme
bugs1387227
Bug 1387227 - Use tooltool provided xz; r=me 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
@@ -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/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
@@ -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"