Fix xz path issue on Windows, follow-up. a=jorgk DONTBUILD THUNDERBIRD560b4_2017092101_RELBRANCH
authorTom Prince <mozilla@hocat.ca>
Fri, 22 Sep 2017 16:51:31 -0600
branchTHUNDERBIRD560b4_2017092101_RELBRANCH
changeset 673914 dc62e9442e97c77e852794130fe42fcb7d639ec6
parent 673913 61ae47a5725a8c13735280dd3f19954a3d1fe090
child 673915 c94b394a1aa3e7dba40a57ac131d6bcaf0deb79c
push id82679
push userbmo:mozilla@hocat.ca
push dateTue, 03 Oct 2017 00:15:54 +0000
reviewersjorgk
milestone56.0
Fix xz path issue on Windows, follow-up. a=jorgk DONTBUILD
tools/update-packaging/unwrap_full_update.pl
--- a/tools/update-packaging/unwrap_full_update.pl
+++ b/tools/update-packaging/unwrap_full_update.pl
@@ -34,17 +34,17 @@ else {
 if (defined($ENV{"XZ"})) {
     $XZ = $ENV{"XZ"};
     print "Using \$XZ environment variable.\n";
 }
 else {
     if (system("xz --version > /dev/null 2>&1") != 0) {
         # Some of the Windows build systems have xz.exe in topsrcdir/xz/.
         my $xzwinpath, $sep;
-        if (__FILE__ =~ m/\\/) { 
+        if (__FILE__ =~ m/\\|^[a-zA-Z]:/) {
             $xzwinpath = File::Spec::Win32->rel2abs(__FILE__);
             $sep = "\\";
         }
         else {
             $xzwinpath = File::Spec->rel2abs(__FILE__);
             $sep = "/";
         }
         $xzwinpath = substr($xzwinpath, 0, rindex($xzwinpath, $sep));