Handle libraries in directories with spaces in them.

mhagander · mhagander · commit 03e4dc9ef2ec · 2008-02-05T14:17:23.000Z
Gevik Babakhani
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -3,7 +3,7 @@ package Mkvcbuild;
 #
 # Package that generates build files for msvc build
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.24 2007/11/13 22:49:47 tgl Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.25 2008/02/05 14:17:23 mha Exp $
 #
 use Carp;
 use Win32;
@@ -66,7 +66,9 @@ sub mkvcbuild
     $postgres->AddFiles('src\backend\bootstrap','bootscanner.l','bootparse.y');
     $postgres->AddFiles('src\backend\utils\misc','guc-file.l');
     $postgres->AddDefine('BUILDING_DLL');
-    $postgres->AddLibrary('wsock32.lib ws2_32.lib secur32.lib');
+    $postgres->AddLibrary('wsock32.lib');
+    $postgres->AddLibrary('ws2_32.lib');
+    $postgres->AddLibrary('secur32.lib');
     $postgres->AddLibrary('wldap32.lib') if ($solution->{options}->{ldap});
     $postgres->FullExportDLL('postgres.lib');
 
@@ -179,7 +181,8 @@ sub mkvcbuild
     my $initdb = AddSimpleFrontend('initdb');
     $initdb->AddIncludeDir('src\interfaces\libpq');
     $initdb->AddDefine('FRONTEND');
-    $initdb->AddLibrary('wsock32.lib ws2_32.lib');
+    $initdb->AddLibrary('wsock32.lib');
+    $initdb->AddLibrary('ws2_32.lib');
 
     my $pgconfig = AddSimpleFrontend('pg_config');
 
diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
@@ -3,7 +3,7 @@ package Project;
 #
 # Package that encapsulates a Visual C++ project file generation
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.15 2007/12/11 14:34:43 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.16 2008/02/05 14:17:23 mha Exp $
 #
 use Carp;
 use strict;
@@ -123,6 +123,11 @@ sub AddReference
 sub AddLibrary
 {
     my ($self, $lib, $dbgsuffix) = @_;
+    
+    if ($lib =~ m/\s/)
+    {
+    	$lib = '&quot;' . $lib . "&quot;";
+    }
 
     push @{$self->{libraries}}, $lib;
     if ($dbgsuffix)

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Project;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ project file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.15 2007/12/11 14:34:43 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Project.pm,v 1.16 2008/02/05 14:17:23 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -123,6 +123,11 @@ sub AddReference`
`123`	`123`	`sub AddLibrary`
`124`	`124`	`{`
`125`	`125`	`my ($self, $lib, $dbgsuffix) = @_;`
	`126`	`+`
	`127`	`+ if ($lib =~ m/\s/)`
	`128`	`+ {`
	`129`	`+ $lib = '"' . $lib . """;`
	`130`	`+ }`
`126`	`131`
`127`	`132`	`push @{$self->{libraries}}, $lib;`
`128`	`133`	`if ($dbgsuffix)`