From ed1884a2fedeffd2e6902451a9d41f4b3f6e859f Mon Sep 17 00:00:00 2001 From: David Rowley Date: Wed, 28 Jul 2021 23:43:40 +1200 Subject: [PATCH] Use the AddFile function consistently in MSVC build scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We seem to be using a mix of manually adding to the 'files' hash and calling the Addfile() method. Let's just consistently use AddFile(). Reviewed-by: Dagfinn Ilmari Mannsåker Discussion: https://postgr.es/m/CAApHDvpo6g5csCTjc_0C7DMvgFPomVb0Rh-AcW5afd=Ya=LRuw@mail.gmail.com --- src/tools/msvc/Project.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm index 2f1679ab44f..e1a5d139d3c 100644 --- a/src/tools/msvc/Project.pm +++ b/src/tools/msvc/Project.pm @@ -58,7 +58,7 @@ sub AddFiles while (my $f = shift) { - $self->{files}->{ $dir . "/" . $f } = 1; + $self->AddFile($dir . "/" . $f, 1); } return; } @@ -77,14 +77,14 @@ sub ReplaceFile if ($file eq $filename) { delete $self->{files}{$file}; - $self->{files}{$newname} = 1; + $self->AddFile($newname); return; } } elsif ($file =~ m/($re)/) { delete $self->{files}{$file}; - $self->{files}{"$newname/$filename"} = 1; + $self->AddFile("$newname/$filename"); return; } } @@ -259,11 +259,11 @@ sub AddDir if ($f =~ /^\$\(top_builddir\)\/(.*)/) { $f = $1; - $self->{files}->{$f} = 1; + $self->AddFile($f); } else { - $self->{files}->{"$reldir/$f"} = 1; + $self->AddFile("$reldir/$f"); } } $mf =~ s{OBJS[^=]*=\s*(.*)$}{}m;