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

tools: Add some sanity checks in make_makefiles.

This commit is contained in:
Alexandre Julliard 2010-10-23 10:44:05 +02:00
parent 3593b65935
commit 845047eebb
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/make_makefiles
View File

@ -309,6 +309,10 @@ sub parse_makefile($)
$make{$1} = \@list; $make{$1} = \@list;
next; next;
} }
if (/^\s*(TOPSRCDIR|TOPOBJDIR|SRCDIR|VPATH)\s*=\s*(.*)/)
{
die "Variable $1 in $file.in is obsolete";
}
} }
return %make; return %make;
} }
@ -363,6 +367,14 @@ sub update_makefiles(@)
if ($rules eq $makerules{"MAKE_DLL_RULES"}) if ($rules eq $makerules{"MAKE_DLL_RULES"})
{ {
(my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/; (my $name = $file) =~ s/^dlls\/(.*)\/Makefile/$1/;
if ($name =~ /\./)
{
die "Invalid MODULE in $file" unless $make{"MODULE"} eq $name;
}
else
{
die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.dll";
}
my $implib = $make{"IMPORTLIB"} || ""; my $implib = $make{"IMPORTLIB"} || "";
my $implib_srcs = defined($make{"IMPLIB_SRCS"}) && join( " ", @{$make{"IMPLIB_SRCS"}} ); my $implib_srcs = defined($make{"IMPLIB_SRCS"}) && join( " ", @{$make{"IMPLIB_SRCS"}} );
$args .= "," if $implib || $is_win16; $args .= "," if $implib || $is_win16;
@ -374,6 +386,14 @@ sub update_makefiles(@)
elsif ($rules eq $makerules{"MAKE_PROG_RULES"}) elsif ($rules eq $makerules{"MAKE_PROG_RULES"})
{ {
(my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/; (my $name = $file) =~ s/^programs\/(.*)\/Makefile/$1/;
if ($name =~ /\./)
{
die "Invalid MODULE in $file" unless $make{"MODULE"} eq $name;
}
else
{
die "Invalid MODULE in $file" unless $make{"MODULE"} eq "$name.exe";
}
my $install = $dont_install{$name} ? "" : "install"; my $install = $dont_install{$name} ? "" : "install";
$install .= "bin" if $bin_install{$name}; $install .= "bin" if $bin_install{$name};
$args .= "," if $is_win16 || $install; $args .= "," if $is_win16 || $install;