Update PL interpreters for 8.4

Started by Dave Pagealmost 17 years ago2 messages
#1Dave Page
dpage@pgadmin.org
1 attachment(s)

The MSVC++ build system is a little lacking in it's ability to build
against different versions of Perl and TCL. The attached patch doesn't
fix that (unfortunately), but does update the hard-coded library names
so we can use Perl 5.10 and TCL 8.5 with PG 8.4.

--
Dave Page
EnterpriseDB UK: http://www.enterprisedb.com

Attachments:

pl-libs.diffapplication/octet-stream; name=pl-libs.diffDownload
*** Mkvcbuild.pm.orig	2008-05-10 17:07:56.000000000 +0100
--- Mkvcbuild.pm	2009-04-06 13:15:51.194250000 +0100
***************
*** 104,110 ****
              }
          }
          $plperl->AddReference($postgres);
!         $plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');
      }
  
      if ($solution->{options}->{python})
--- 104,117 ----
              }
          }
          $plperl->AddReference($postgres);
!         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,128 ****
          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');
      }
  
      $libpq = $solution->AddProject('libpq','dll','interfaces','src\interfaces\libpq');
--- 129,142 ----
          my $pltcl = $solution->AddProject('pltcl','dll','PLs','src\pl\tcl');
          $pltcl->AddIncludeDir($solution->{options}->{tcl} . '\include');
          $pltcl->AddReference($postgres);
!         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');
#2Magnus Hagander
magnus@hagander.net
In reply to: Dave Page (#1)
Re: Update PL interpreters for 8.4

Dave Page wrote:

The MSVC++ build system is a little lacking in it's ability to build
against different versions of Perl and TCL. The attached patch doesn't
fix that (unfortunately), but does update the hard-coded library names
so we can use Perl 5.10 and TCL 8.5 with PG 8.4.

Applied, thanks.

//Magnus