Support Perl 5.10 and TCL 8.5 in MSVC builds.

mhagander · mhagander · commit 2762e5555ca3 · 2009-04-07T19:35:57.000Z
We should probably have a better way to do this (meaning
something not hardcoded) eventually, but this fixes the
problem for 8.4.

Dave Page
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.38 2009/03/08 19:13:38 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.39 2009/04/07 19:35:57 mha Exp $
 #
 use Carp;
 use Win32;
@@ -104,7 +104,14 @@ sub mkvcbuild
             }
         }
         $plperl->AddReference($postgres);
-        $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
+        if (-e $solution->{options}->{perl} . '\lib\CORE\perl510.lib')
+        {
+            $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl510.lib');
+        }
+        else
+        {
+            $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
+        }
     }
 
     if ($solution->{options}->{python})
@@ -122,7 +129,14 @@ sub mkvcbuild
         my $pltcl = $solution->AddProject('pltcl','dll','PLs','src\pl\tcl');
         $pltcl->AddIncludeDir($solution->{options}->{tcl} . '\include');
         $pltcl->AddReference($postgres);
-        $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl84.lib');
+        if (-e $solution->{options}->{tcl} . '\lib\tcl85.lib')
+        {
+            $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl85.lib');
+        }
+        else
+        {
+            $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl84.lib');
+        }
     }
 
     $libpq = $solution->AddProject('libpq','dll','interfaces','src\interfaces\libpq');

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.38 2009/03/08 19:13:38 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.39 2009/04/07 19:35:57 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -104,7 +104,14 @@ sub mkvcbuild`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`$plperl->AddReference($postgres);`
`107`		`- $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');`
	`107`	`+ if (-e $solution->{options}->{perl} . '\lib\CORE\perl510.lib')`
	`108`	`+ {`
	`109`	`+ $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl510.lib');`
	`110`	`+ }`
	`111`	`+ else`
	`112`	`+ {`
	`113`	`+ $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');`
	`114`	`+ }`
`108`	`115`	`}`
`109`	`116`
`110`	`117`	`if ($solution->{options}->{python})`
`@@ -122,7 +129,14 @@ sub mkvcbuild`
`122`	`129`	`my $pltcl = $solution->AddProject('pltcl','dll','PLs','src\pl\tcl');`
`123`	`130`	`$pltcl->AddIncludeDir($solution->{options}->{tcl} . '\include');`
`124`	`131`	`$pltcl->AddReference($postgres);`
`125`		`- $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl84.lib');`
	`132`	`+ if (-e $solution->{options}->{tcl} . '\lib\tcl85.lib')`
	`133`	`+ {`
	`134`	`+ $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl85.lib');`
	`135`	`+ }`
	`136`	`+ else`
	`137`	`+ {`
	`138`	`+ $pltcl->AddLibrary($solution->{options}->{tcl} . '\lib\tcl84.lib');`
	`139`	`+ }`
`126`	`140`	`}`
`127`	`141`
`128`	`142`	`$libpq = $solution->AddProject('libpq','dll','interfaces','src\interfaces\libpq');`