Use the AddFile function consistently in MSVC build scripts

david-rowley · david-rowley · commit ed1884a2fede · 2021-07-28T23:43:40.000+12:00
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
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ sub AddFiles`
`58`	`58`
`59`	`59`	`while (my $f = shift)`
`60`	`60`	`{`
`61`		`- $self->{files}->{ $dir . "/" . $f } = 1;`
	`61`	`+ $self->AddFile($dir . "/" . $f, 1);`
`62`	`62`	`}`
`63`	`63`	`return;`
`64`	`64`	`}`
`@@ -77,14 +77,14 @@ sub ReplaceFile`
`77`	`77`	`if ($file eq $filename)`
`78`	`78`	`{`
`79`	`79`	`delete $self->{files}{$file};`
`80`		`- $self->{files}{$newname} = 1;`
	`80`	`+ $self->AddFile($newname);`
`81`	`81`	`return;`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`	`elsif ($file =~ m/($re)/)`
`85`	`85`	`{`
`86`	`86`	`delete $self->{files}{$file};`
`87`		`- $self->{files}{"$newname/$filename"} = 1;`
	`87`	`+ $self->AddFile("$newname/$filename");`
`88`	`88`	`return;`
`89`	`89`	`}`
`90`	`90`	`}`
`@@ -259,11 +259,11 @@ sub AddDir`
`259`	`259`	`if ($f =~ /^\$\(top_builddir\)\/(.*)/)`
`260`	`260`	`{`
`261`	`261`	`$f = $1;`
`262`		`- $self->{files}->{$f} = 1;`
	`262`	`+ $self->AddFile($f);`
`263`	`263`	`}`
`264`	`264`	`else`
`265`	`265`	`{`
`266`		`- $self->{files}->{"$reldir/$f"} = 1;`
	`266`	`+ $self->AddFile("$reldir/$f");`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`	`$mf =~ s{OBJS[^=]=\s(.*)$}{}m;`