Fix problem matching against commented out REQUIRES lines, and fix problem where we didn't test some modules from the REQUIRES line.
git-svn-id: svn://10.0.0.236/trunk@144651 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -105,7 +105,7 @@ sub domakefile {
|
||||
$lastLine =~ s/\\$//;
|
||||
chomp($lastLine);
|
||||
}
|
||||
elsif ( $lastLine =~ m#(REQUIRES\s*=\s*)(.*)$# ) {
|
||||
elsif ( $lastLine =~ m#^(REQUIRES\s*=\s*)(.*)$# ) {
|
||||
$requiresLines[$#requiresLines+1] = $_;
|
||||
$lastLine = "";
|
||||
my $requires = $1;
|
||||
@@ -128,6 +128,7 @@ sub domakefile {
|
||||
}
|
||||
else {
|
||||
splice(@reqs, $index, 1); # if it's not in .deps, don't write it out
|
||||
$index--; # adjust index after splicing
|
||||
$modified = 1;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user