ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winemaker: Try to find the real case of a given filename or path from project files.

This commit is contained in:
André Hentschel 2013-06-12 23:00:45 +02:00 committed by Alexandre Julliard
parent bf236d423f
commit 1337726318
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/winemaker
View File

@ -21,7 +21,7 @@ use strict;
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
# #
my $version="0.8.3"; my $version="0.8.4";
use Cwd; use Cwd;
use File::Basename; use File::Basename;
@ -683,6 +683,11 @@ sub source_scan_project_file($$$)
# Additional Include Directories # Additional Include Directories
$sfilet=$1; $sfilet=$1;
$sfilet=~s/\\/\//g; $sfilet=~s/\\/\//g;
my @compinc=split /\/+/, $sfilet;
my $realinc=search_from($path, \@compinc);
if (defined $realinc) {
$sfilet=$realinc;
}
if ($sfilet=~/^\w:/) { if ($sfilet=~/^\w:/) {
print STDERR "warning: Can't fix path $sfilet\n" print STDERR "warning: Can't fix path $sfilet\n"
} else { } else {
@ -894,6 +899,11 @@ sub source_scan_project_file($$$)
$sfilet=~s/\\\\/\\/g; #remove double backslash $sfilet=~s/\\\\/\\/g; #remove double backslash
$sfilet=~s/^\.\\//; #remove starting 'this directory' $sfilet=~s/^\.\\//; #remove starting 'this directory'
$sfilet=~s/\\/\//g; #make slashes out of backslashes $sfilet=~s/\\/\//g; #make slashes out of backslashes
my @compsrc=split(/\/+/, $sfilet);
my $realsrc=search_from($path, \@compsrc);
if (defined $realsrc) {
$sfilet=$realsrc;
}
if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) { if ($sfilet =~ /\.c$/i and $sfilet !~ /\.(dbg|spec)\.c$/) {
push @sources_c,$sfilet; push @sources_c,$sfilet;
} elsif ($sfilet =~ /\.cpp$/i) { } elsif ($sfilet =~ /\.cpp$/i) {
@ -961,6 +971,11 @@ sub source_scan_project_file($$$)
$configt=~s/\\/\//g; $configt=~s/\\/\//g;
my @addincl = split(/\s*;\s*/, $configt); my @addincl = split(/\s*;\s*/, $configt);
foreach $configt (@addincl) { foreach $configt (@addincl) {
my @compinc=split(/\/+/, $configt);
my $realinc=search_from($path, \@compinc);
if (defined $realinc) {
$configt=$realinc;
}
push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt; push @{@$project_settings[$T_INCLUDE_PATH]},"-I".$configt;
} }
} }