Bug 1405068: Look for xz.exe at the root of a checkout when making incremental updates. r=bhearsum

MozReview-Commit-ID: 8R5kY8cntMc

--HG--
extra : rebase_source : fbe8d80519a8d46fea989bdefb7b2b1436a1a5f5

tools/update-packaging/common.sh

@@ -15,11 +15,23 @@ MBSDIFF=${MBSDIFF:-mbsdiff}
 if [[ -z "${MAR_OLD_FORMAT}" ]]; then
   XZ=${XZ:-xz}
   $XZ --version > /dev/null 2>&1
+  if [ $? -ne 0 ]; then
+    # If $XZ is not set and not found on the path then this is probably
+    # running on a windows buildbot. Some of the Windows build systems have
+    # xz.exe in topsrcdir/xz/. Look in the places this would be in both a
+    # mozilla-central and comm-central build.
+    XZ="$(dirname "$(dirname "$(dirname "$0")")")/xz/xz.exe"
+    $XZ --version > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+      XZ="$(dirname "$(dirname "$(dirname "$(dirname "$0")")")")/xz/xz.exe"
+      $XZ --version > /dev/null 2>&1
       if [ $? -ne 0 ]; then
         echo "xz was not found on this system!"
         echo "exiting"
         exit 1
       fi
+    fi
+  fi
 else
   MAR_OLD_FORMAT=1
   BZIP2=${BZIP2:-bzip2}