Don't duplicate references and libraries in MSVC scripts

david-rowley · david-rowley · commit 15f16ec6511c · 2021-07-29T10:41:31.000+12:00
In order not to duplicate references and libraries in the Visual Studio project files produced by the MSVC build scripts, have them check if a particular reference or library already exists before adding the same one again. Reviewed-by: Álvaro Herrera, Andrew Dunstan, 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
@@ -124,7 +124,10 @@ sub AddReference
 
 	while (my $ref = shift)
 	{
-		push @{ $self->{references} }, $ref;
+		if (! grep { $_ eq $ref} @{ $self->{references} })
+		{
+			push @{ $self->{references} }, $ref;
+		}
 		$self->AddLibrary(
 			"__CFGNAME__/" . $ref->{name} . "/" . $ref->{name} . ".lib");
 	}
@@ -141,7 +144,11 @@ sub AddLibrary
 		$lib = '&quot;' . $lib . "&quot;";
 	}
 
-	push @{ $self->{libraries} }, $lib;
+	if (! grep { $_ eq $lib} @{ $self->{libraries} })
+	{
+		push @{ $self->{libraries} }, $lib;
+	}
+
 	if ($dbgsuffix)
 	{
 		push @{ $self->{suffixlib} }, $lib;

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,10 @@ sub AddReference`
`124`	`124`
`125`	`125`	`while (my $ref = shift)`
`126`	`126`	`{`
`127`		`- push @{ $self->{references} }, $ref;`
	`127`	`+ if (! grep { $_ eq $ref} @{ $self->{references} })`
	`128`	`+ {`
	`129`	`+ push @{ $self->{references} }, $ref;`
	`130`	`+ }`
`128`	`131`	`$self->AddLibrary(`
`129`	`132`	`"__CFGNAME__/" . $ref->{name} . "/" . $ref->{name} . ".lib");`
`130`	`133`	`}`
`@@ -141,7 +144,11 @@ sub AddLibrary`
`141`	`144`	`$lib = '"' . $lib . """;`
`142`	`145`	`}`
`143`	`146`
`144`		`- push @{ $self->{libraries} }, $lib;`
	`147`	`+ if (! grep { $_ eq $lib} @{ $self->{libraries} })`
	`148`	`+ {`
	`149`	`+ push @{ $self->{libraries} }, $lib;`
	`150`	`+ }`
	`151`	`+`
`145`	`152`	`if ($dbgsuffix)`
`146`	`153`	`{`
`147`	`154`	`push @{ $self->{suffixlib} }, $lib;`