Author: timbo Date: Tue Apr 25 15:55:48 2006 New Revision: 5963 Modified: dbi/trunk/Changes dbi/trunk/Makefile.PL dbi/trunk/lib/DBI/DBD.pm
Log: Fixed build on Win32 (dbd_postamble) thanks to David Golden. https://rt.cpan.org/Ticket/Display.html?id=18452 Modified: dbi/trunk/Changes ============================================================================== --- dbi/trunk/Changes (original) +++ dbi/trunk/Changes Tue Apr 25 15:55:48 2006 @@ -17,6 +17,7 @@ Users of Perl >= 5.9.x will require DBI >= 1.51. Fixed fetching of rows as hash refs to preserve utf8 on field names from $sth->{NAME} thanks to Alexey Gaidukov. + Fixed build on Win32 (dbd_postamble) thanks to David Golden. Improved performance for thread-enabled perls thanks to Gisle Aas. Drivers can now use PERL_NO_GET_CONTEXT thanks to Gisle Aas. Modified: dbi/trunk/Makefile.PL ============================================================================== --- dbi/trunk/Makefile.PL (original) +++ dbi/trunk/Makefile.PL Tue Apr 25 15:55:48 2006 @@ -120,7 +120,7 @@ AUTHOR => 'Tim Bunce ([email protected])', VERSION_FROM => 'DBI.pm', ABSTRACT_FROM => 'DBI.pm', - PREREQ_PM => { "Test::Simple" => 0.40, Storable => 1 }, + PREREQ_PM => { "Test::Simple" => 0.40, Storable => 1, "File::Spec" => 1 }, EXE_FILES => [ "dbiproxy$ext_pl", "dbiprof$ext_pl" ], DIR => [ ], dynamic_lib => { OTHERLDFLAGS => "$::opt_g" }, Modified: dbi/trunk/lib/DBI/DBD.pm ============================================================================== --- dbi/trunk/lib/DBI/DBD.pm (original) +++ dbi/trunk/lib/DBI/DBD.pm Tue Apr 25 15:55:48 2006 @@ -2725,6 +2725,7 @@ use Config qw(%Config); use Carp; use Cwd; +use File::Spec; use strict; use vars qw( @ISA @EXPORT @@ -2873,21 +2874,15 @@ Carp::croak("Unable to locate Driver.xst in @try") unless @xst; Carp::carp( "Multiple copies of Driver.xst found in: @xst") if @xst > 1; print "Using DBI $DBI::VERSION (for perl $] on $Config{archname}) installed in $xst[0]\n"; - return $xst[0]; + return File::Spec->canonpath($xst[0]); } sub dbd_postamble { my $self = shift; _inst_checks(); my $dbi_instarch_dir = ($is_dbi) ? "." : dbd_dbi_arch_dir(); - my $dbi_driver_xst= '$(DBI_INSTARCH_DIR)/Driver.xst'; - my $xstf_h = '$(DBI_INSTARCH_DIR)/Driver_xst.h'; - if ($^O eq 'VMS') { - $dbi_instarch_dir = vmsify($dbi_instarch_dir.'/'); - $dbi_instarch_dir =~ s:/$::; # for buggy old vmsify's? - $dbi_driver_xst= '$(DBI_INSTARCH_DIR)Driver.xst'; - $xstf_h = '$(DBI_INSTARCH_DIR)Driver_xst.h'; - } + my $dbi_driver_xst= File::Spec->catfile($dbi_instarch_dir, 'Driver.xst'); + my $xstf_h = File::Spec->catfile($dbi_instarch_dir, 'Driver_xst.h'); # we must be careful of quotes, expecially for Win32 here. return '
