Bug 815963 - Use a more specific pattern to make ../../dist/bin to ../../dist. r=dhylands

Otherwise, it causes the build break when B2G root path contains bin/.
This commit is contained in:
Alan Huang 2012-12-07 13:59:34 +08:00
parent ebfc1d2d82
commit 80c4ca8e52

View File

@ -300,8 +300,15 @@ sub do_copyfile
}
}
# Translate: */../../*/bin/*
# into: */../../*/*
# (where the *'s are interpreted using shell-notation and
# it matches not only forward slashes but also backslashes.)
# $1 = */../../*/
# $2 = bin/
# $3 = *
if ($flat) {
$destpath =~ s|bin[/\\]||;
$destpath =~ s|(.*[/\\]\.\.[/\\]\.\.[/\\].+[/\\])(bin[/\\])(.*)|$1$3|;
}
# create the destination path if it doesn't exist