[svn:dbd-oracle] r13727 - in dbd-oracle/branches/DBDOracle8: . blib/arch/auto/DBD/Oracle8 lib/DBD/Oracle8
[email protected] Fri, 15 Jan 2010 11:11:28 -0800 (PST)
Newsgroups
perl.dbd.oracle.changes
Message-ID
<[email protected] >
Author: byterock
Date: Fri Jan 15 11:11:26 2010
New Revision: 13727
Removed:
dbd-oracle/branches/DBDOracle8/Makefile
dbd-oracle/branches/DBDOracle8/dbdimp.obj
Modified:
dbd-oracle/branches/DBDOracle8/blib/arch/auto/DBD/Oracle8/mk.pm
dbd-oracle/branches/DBDOracle8/lib/DBD/Oracle8/GetInfo.pm
Log:
some more changes
Modified: dbd-oracle/branches/DBDOracle8/blib/arch/auto/DBD/Oracle8/mk.pm
==============================================================================
--- dbd-oracle/branches/DBDOracle8/blib/arch/auto/DBD/Oracle8/mk.pm (original)
+++ dbd-oracle/branches/DBDOracle8/blib/arch/auto/DBD/Oracle8/mk.pm Fri Jan 15 11:11:26 2010
@@ -1,8 +1,8 @@
$dbd_oracle_mm_opts = {
'NAME' => 'DBD::Oracle8',
- 'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI',
+ 'INC' => '-IC:/oracle/ora92/oci/include -IC:/oracle/ora92/rdbms/demo -IC:/Perl10/site/lib/auto/DBI/',
'LIBS' => [
- '-LD:/oracle/ora81/oci/LIB/MSVC OCI'
+ '-LC:/oracle/ora92/oci/LIB/MSVC OCI'
],
'AUTHOR' => 'Tim Bunce ([email protected] )',
'DIR' => [],
@@ -27,37 +27,38 @@
}
};
$dbd_oracle_mm_self = bless( {
- 'MM_Win32_VERSION' => '1.1401',
+ 'MM_Win32_VERSION' => '6.55_02',
'BSLOADLIBS' => '',
'ECHO_N' => '$(ABSPERLRUN) -e "print qq{@ARGV}" --',
'BOOTDEP' => '',
- 'INSTALLSITESCRIPT' => 'C:\\Perl\\site\\bin',
+ 'INSTALLSITESCRIPT' => 'C:\\Perl10\\site\\bin',
'CCDLFLAGS' => ' ',
- 'LDDLFLAGS' => '-dll -nologo -nodefaultlib -debug -opt:ref,icf -libpath:"C:\\Perl\\lib\\CORE" -machine:x86',
+ 'LDDLFLAGS' => '-dll -nologo -nodefaultlib -debug -opt:ref,icf -libpath:"C:\\Perl10\\lib\\CORE" -machine:x86',
'DESTINSTALLVENDORMAN3DIR' => '$(DESTDIR)$(INSTALLVENDORMAN3DIR)',
- 'LDLOADLIBS' => 'D:\\oracle\\ora81\\oci\\LIB\\MSVC\\OCI.lib "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\oldnames.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\kernel32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\user32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\gdi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\winspool.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\comdlg32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\advapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\shell32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ole32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\oleaut32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\netapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\uuid.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ws2_32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\mpr.lib" "C:\\Program Files\\
Microsoft Platform SDK\\Lib\\winmm.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\version.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbc32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbccp32.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\msvcrt.lib"',
+ 'LDLOADLIBS' => 'C:\\oracle\\ora92\\oci\\LIB\\MSVC\\OCI.lib "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\oldnames.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\kernel32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\user32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\gdi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\winspool.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\comdlg32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\advapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\shell32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ole32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\oleaut32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\netapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\uuid.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ws2_32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\mpr.lib" "C:\
\Program Files\\Microsoft Platform SDK\\Lib\\winmm.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\version.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbc32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbccp32.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\msvcrt.lib"',
'INST_HTMLDIR' => 'blib\\html',
'PREOP' => '$(NOECHO) $(NOOP)',
'MACROSTART' => '',
'DESTINSTALLVENDORHTMLDIR' => '$(DESTDIR)$(INSTALLVENDORHTMLDIR)',
'XS_VERSION' => '1.00',
- 'MAKEMAKER' => 'C:/Perl/lib/ExtUtils/MakeMaker.pm',
+ 'MAKEMAKER' => 'C:/Perl10/lib/ExtUtils/MakeMaker.pm',
'USEMAKEFILE' => '-f',
- 'RM_RF' => '$(ABSPERLRUN) -MExtUtils::Command -e rm_rf',
+ 'RM_RF' => '$(ABSPERLRUN) -MExtUtils::Command -e "rm_rf" --',
'PMLIBDIRS' => [
'lib'
],
'INST_LIBDIR' => '$(INST_LIB)\\DBD',
- 'SITEARCHEXP' => 'C:\\Perl\\site\\lib',
+ 'SITEARCHEXP' => 'C:\\Perl10\\site\\lib',
'ABSTRACT' => 'Oracle database driver for the DBI module',
'INST_MAN1DIR' => 'blib\\man1',
'MAN3EXT' => '3',
'XS' => {
'Oracle8.xs' => 'Oracle8.c'
},
- 'MAKE' => 'nmake',
+ 'MAKE' => 'C:\\Perl\\bin\\nmake.exe',
'FULL_AR' => '',
- 'FULLPERL' => 'C:\\Perl\\bin\\perl.exe',
+ 'TRUE' => '$(ABSPERLRUN) -e "exit 0" --',
+ 'FULLPERL' => 'C:\\Perl10\\bin\\perl.exe',
'DIR' => $dbd_oracle_mm_opts->{'DIR'},
'CONFIG' => [
'ar',
@@ -84,12 +85,12 @@
'vendorlibexp'
],
'DESTDIR' => '',
- 'INSTALLSITEHTMLDIR' => 'C:\\Perl\\html',
+ 'INSTALLSITEHTMLDIR' => 'C:\\Perl10\\html',
'MAN1PODS' => {
'ora_explain' => '$(INST_MAN1DIR)\\ora_explain.$(MAN1EXT)'
},
- 'INSTALLSITEBIN' => 'C:\\Perl\\site\\bin',
- 'CHMOD' => '$(ABSPERLRUN) -MExtUtils::Command -e chmod',
+ 'INSTALLSITEBIN' => 'C:\\Perl10\\site\\bin',
+ 'CHMOD' => '$(ABSPERLRUN) -MExtUtils::Command -e "chmod" --',
'DESTINSTALLVENDORLIB' => '$(DESTDIR)$(INSTALLVENDORLIB)',
'OBJ_EXT' => '.obj',
'C' => [
@@ -100,10 +101,10 @@
],
'EXE_FILES' => $dbd_oracle_mm_opts->{'EXE_FILES'},
'TARFLAGS' => 'cvf',
- 'PERL_INC' => 'C:\\Perl\\lib\\CORE',
+ 'PERL_INC' => 'C:\\Perl10\\lib\\CORE',
'HAS_LINK_CODE' => 1,
- 'INSTALLPRIVLIB' => 'C:\\Perl\\lib',
- 'SITELIBEXP' => 'C:\\Perl\\site\\lib',
+ 'INSTALLPRIVLIB' => 'C:\\Perl10\\lib',
+ 'SITELIBEXP' => 'C:\\Perl10\\site\\lib',
'DESTINSTALLPRIVLIB' => '$(DESTDIR)$(INSTALLPRIVLIB)',
'VENDORLIBEXP' => '',
'DEFINE' => ' -DUTF8_SUPPORT -DORA_OCI_VERSION=\\"8.1.7.0\\"',
@@ -113,16 +114,17 @@
'ora_explain.PL' => 'ora_explain'
},
'VENDORARCHEXP' => '',
- 'MM_VERSION' => '6.3201',
- 'INSTALLSCRIPT' => 'C:\\Perl\\bin',
+ 'MM_VERSION' => '6.55_02',
+ 'INSTALLSCRIPT' => 'C:\\Perl10\\bin',
'CC' => 'cl',
'LIBS' => $dbd_oracle_mm_opts->{'LIBS'},
'DLEXT' => 'dll',
- 'EQUALIZE_TIMESTAMP' => '$(ABSPERLRUN) "-MExtUtils::Command" -e eqtime',
+ 'EQUALIZE_TIMESTAMP' => '$(ABSPERLRUN) -MExtUtils::Command -e "eqtime" --',
'XS_VERSION_MACRO' => 'XS_VERSION',
'VERBINST' => 0,
'TAR' => 'tar',
'ABSPERL' => '$(PERL)',
+ 'FALSE' => '$(ABSPERLRUN) -e "exit 1" --',
'DESTINSTALLARCHLIB' => '$(DESTDIR)$(INSTALLARCHLIB)',
'INST_STATIC' => '$(INST_ARCHAUTODIR)\\$(BASEEXT)$(LIB_EXT)',
'DISTVNAME' => 'DBD-Oracle8-1.00',
@@ -133,22 +135,24 @@
'# This Makefile is for the DBD::Oracle8 extension to perl.
#
# It was generated automatically by MakeMaker version
-# 6.3201 (Revision: 19606) from the contents of
+# 6.55_02 (Revision: 65502) from the contents of
# Makefile.PL. Don\'t edit this file, edit Makefile.PL instead.
#
# ANY CHANGES MADE HERE WILL BE LOST!
#
# MakeMaker ARGV: ()
#
-# MakeMaker Parameters:
+',
+ '# MakeMaker Parameters:
',
'# ABSTRACT_FROM => q[Oracle8.pm]',
'# AUTHOR => q[Tim Bunce ([email protected] )]',
+ '# BUILD_REQUIRES => { }',
'# DEFINE => q[ -DUTF8_SUPPORT -DORA_OCI_VERSION=\\"8.1.7.0\\"]',
'# DIR => []',
'# EXE_FILES => [q[ora_explain]]',
- '# INC => q[-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI]',
- '# LIBS => [q[-LD:/oracle/ora81/oci/LIB/MSVC OCI]]',
+ '# INC => q[-IC:/oracle/ora92/oci/include -IC:/oracle/ora92/rdbms/demo -IC:/Perl10/site/lib/auto/DBI/]',
+ '# LIBS => [q[-LC:/oracle/ora92/oci/LIB/MSVC OCI]]',
'# NAME => q[DBD::Oracle8]',
'# OBJECT => q[$(O_FILES)]',
'# PREREQ_PM => { DBI=>q[0] }',
@@ -160,12 +164,12 @@
],
'FULLPERLRUNINST' => '$(FULLPERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"',
'MAP_TARGET' => 'perl',
- 'INSTALLMAN3DIR' => 'C:\\Perl\\man\\man3',
- 'PERLPREFIX' => 'C:\\Perl',
+ 'INSTALLMAN3DIR' => 'C:\\Perl10\\man\\man3',
+ 'PERLPREFIX' => 'C:\\Perl10',
'AUTHOR' => 'Tim Bunce ([email protected] )',
- 'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI',
- 'LDFLAGS' => '-nologo -nodefaultlib -debug -opt:ref,icf -libpath:"C:\\Perl\\lib\\CORE" -machine:x86',
- 'INSTALLVENDORHTMLDIR' => 'C:\\Perl\\html',
+ 'INC' => '-IC:/oracle/ora92/oci/include -IC:/oracle/ora92/rdbms/demo -IC:/Perl10/site/lib/auto/DBI/',
+ 'LDFLAGS' => '-nologo -nodefaultlib -debug -opt:ref,icf -libpath:"C:\\Perl10\\lib\\CORE" -machine:x86',
+ 'INSTALLVENDORHTMLDIR' => 'C:\\Perl10\\html',
'dist' => $dbd_oracle_mm_opts->{'dist'},
'INSTALLVENDORMAN1DIR' => '',
'MAKEFILE_OLD' => 'Makefile.old',
@@ -181,6 +185,7 @@
'DESTINSTALLVENDORMAN1DIR' => '$(DESTDIR)$(INSTALLVENDORMAN1DIR)',
'INST_ARCHLIBDIR' => '$(INST_ARCHLIB)\\DBD',
'OBJECT' => '$(O_FILES)',
+ 'BUILD_REQUIRES' => {},
'NAME_SYM' => 'DBD_Oracle8',
'RANLIB' => 'rem',
'DIRFILESEP' => '^\\',
@@ -189,14 +194,14 @@
'COMPRESS' => 'gzip --best',
'SUFFIX' => '.gz',
'MAN1EXT' => '1',
- 'PERL_LIB' => 'C:\\Perl\\lib',
+ 'PERL_LIB' => 'C:\\Perl10\\lib',
'ECHO' => '$(ABSPERLRUN) -l -e "print qq{@ARGV}" --',
'EXPORT_LIST' => '$(BASEEXT).def',
'INST_BOOT' => '$(INST_ARCHAUTODIR)\\$(BASEEXT).bs',
- 'MV' => '$(ABSPERLRUN) -MExtUtils::Command -e mv',
+ 'MV' => '$(ABSPERLRUN) -MExtUtils::Command -e "mv" --',
'OSVERS' => '5.00',
'LD_RUN_PATH' => '',
- 'MKPATH' => '$(ABSPERLRUN) "-MExtUtils::Command" -e mkpath',
+ 'MKPATH' => '$(ABSPERLRUN) -MExtUtils::Command -e "mkpath" --',
'DESTINSTALLMAN1DIR' => '$(DESTDIR)$(INSTALLMAN1DIR)',
'OSNAME' => 'MSWin32',
'AR' => 'lib',
@@ -210,12 +215,12 @@
'DIST_DEFAULT' => 'tardist',
'SKIPHASH' => {},
'NOOP' => 'rem',
- 'PERL_ARCHLIB' => 'C:\\Perl\\lib',
+ 'PERL_ARCHLIB' => 'C:\\Perl10\\lib',
'VERSION_SYM' => '1_00',
'VERSION_MACRO' => 'VERSION',
- 'WARN_IF_OLD_PACKLIST' => '$(ABSPERLRUN) "-MExtUtils::Command::MM" -e warn_if_old_packlist',
- 'MM_REVISION' => '19606',
- 'RM_F' => '$(ABSPERLRUN) -MExtUtils::Command -e rm_f',
+ 'WARN_IF_OLD_PACKLIST' => '$(ABSPERLRUN) -MExtUtils::Command::MM -e "warn_if_old_packlist" --',
+ 'MM_REVISION' => 65502,
+ 'RM_F' => '$(ABSPERLRUN) -MExtUtils::Command -e "rm_f" --',
'LIBC' => 'msvcrt.lib',
'UNINST' => 0,
'PERLRUN' => '$(PERL)',
@@ -228,7 +233,7 @@
'MACROEND' => '',
'ARGS' => {
'NAME' => 'DBD::Oracle8',
- 'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI',
+ 'INC' => '-IC:/oracle/ora92/oci/include -IC:/oracle/ora92/rdbms/demo -IC:/Perl10/site/lib/auto/DBI/',
'LIBS' => $dbd_oracle_mm_opts->{'LIBS'},
'AUTHOR' => 'Tim Bunce ([email protected] )',
'DIR' => $dbd_oracle_mm_opts->{'DIR'},
@@ -241,7 +246,7 @@
'VERSION_FROM' => 'Oracle8.pm',
'PREREQ_PM' => $dbd_oracle_mm_opts->{'PREREQ_PM'}
},
- 'CP' => '$(ABSPERLRUN) -MExtUtils::Command -e cp',
+ 'CP' => '$(ABSPERLRUN) -MExtUtils::Command -e "cp" --',
'DEFINE_VERSION' => '-D$(VERSION_MACRO)=\\"$(VERSION)\\"',
'PREREQ_PM' => $dbd_oracle_mm_opts->{'PREREQ_PM'},
'DESTINSTALLSITELIB' => '$(DESTDIR)$(INSTALLSITELIB)',
@@ -250,11 +255,11 @@
'FULLPERLRUN' => '$(FULLPERL)',
'INSTALLSITEMAN1DIR' => '$(INSTALLMAN1DIR)',
'DESTINSTALLSITEMAN3DIR' => '$(DESTDIR)$(INSTALLSITEMAN3DIR)',
- 'MOD_INSTALL' => '$(ABSPERLRUN) -MExtUtils::Install -e "install({@ARGV}, \'$(VERBINST)\', 0, \'$(UNINST)\');" --',
+ 'MOD_INSTALL' => '$(ABSPERLRUN) -MExtUtils::Install -e "install([ from_to => {@ARGV}, verbose => \'$(VERBINST)\', uninstall_shadows => \'$(UNINST)\', dir_mode => \'$(PERM_DIR)\' ]);" --',
'DLBASE' => '$(BASEEXT)',
'INST_MAN3DIR' => 'blib\\man3',
'CCCDLFLAGS' => ' ',
- 'INSTALLSITEARCH' => 'C:\\Perl\\site\\lib',
+ 'INSTALLSITEARCH' => 'C:\\Perl10\\site\\lib',
'PMLIBPARENTDIRS' => [
'lib'
],
@@ -265,26 +270,27 @@
'RCS_LABEL' => 'rcs -Nv$(VERSION_SYM): -q',
'NAME' => 'DBD::Oracle8',
'PARENT_NAME' => 'DBD',
- 'INSTALLSITELIB' => 'C:\\Perl\\site\\lib',
+ 'INSTALLSITELIB' => 'C:\\Perl10\\site\\lib',
'MAKE_APERL_FILE' => 'Makefile.aperl',
'ZIP' => 'zip',
'VERSION_FROM' => 'Oracle8.pm',
- 'SITEPREFIX' => 'C:\\Perl\\site',
+ 'SITEPREFIX' => 'C:\\Perl10\\site',
'INSTALLVENDORSCRIPT' => '',
'TO_UNIX' => '$(NOECHO) $(NOOP)',
- 'PERL' => 'C:\\Perl\\bin\\perl.exe',
+ 'PERL' => 'C:\\Perl10\\bin\\perl.exe',
'DESTINSTALLVENDORARCH' => '$(DESTDIR)$(INSTALLVENDORARCH)',
'NOECHO' => '@',
'DESTINSTALLVENDORBIN' => '$(DESTDIR)$(INSTALLVENDORBIN)',
'DESTINSTALLHTMLDIR' => '$(DESTDIR)$(INSTALLHTMLDIR)',
'PERM_RW' => 644,
'UMASK_NULL' => 'umask 0',
- 'DOC_INSTALL' => '$(ABSPERLRUN) "-MExtUtils::Command::MM" -e perllocal_install',
- 'TOUCH' => '$(ABSPERLRUN) -MExtUtils::Command -e touch',
+ 'DOC_INSTALL' => '$(ABSPERLRUN) -MExtUtils::Command::MM -e "perllocal_install" --',
+ 'TOUCH' => '$(ABSPERLRUN) -MExtUtils::Command -e "touch" --',
'LD' => 'link',
'PERL_SRC' => undef,
'DESTINSTALLMAN3DIR' => '$(DESTDIR)$(INSTALLMAN3DIR)',
'ZIPFLAGS' => '-r',
+ 'PERM_DIR' => 755,
'DISTNAME' => 'DBD-Oracle8',
'INST_BIN' => 'blib\\bin',
'FIRST_MAKEFILE' => 'Makefile',
@@ -294,11 +300,11 @@
'PREFIX' => '$(SITEPREFIX)',
'INSTALLDIRS' => 'site',
'INST_ARCHLIB' => 'blib\\arch',
- 'INSTALLHTMLDIR' => 'C:\\Perl\\html',
- 'PERL_ARCHIVE' => '$(PERL_INC)\\perl58.lib',
+ 'INSTALLHTMLDIR' => 'C:\\Perl10\\html',
+ 'PERL_ARCHIVE' => '$(PERL_INC)\\perl510.lib',
'INSTALLVENDORARCH' => '',
'DESTINSTALLSITEMAN1DIR' => '$(DESTDIR)$(INSTALLSITEMAN1DIR)',
- 'INSTALLBIN' => 'C:\\Perl\\bin',
+ 'INSTALLBIN' => 'C:\\Perl10\\bin',
'INSTALLSITEMAN3DIR' => '$(INSTALLMAN3DIR)',
'PERL_ARCHIVE_AFTER' => '',
'MAN3PODS' => {
@@ -306,19 +312,19 @@
'Oraperl.pm' => '$(INST_MAN3DIR)\\DBD\\Oraperl.$(MAN3EXT)'
},
'LIBPERL_A' => 'libperl.lib',
- 'INSTALLARCHLIB' => 'C:\\Perl\\lib',
+ 'INSTALLARCHLIB' => 'C:\\Perl10\\lib',
'LIB_EXT' => '.lib',
'DESTINSTALLSITEHTMLDIR' => '$(DESTDIR)$(INSTALLSITEHTMLDIR)',
'AR_STATIC_ARGS' => 'cr',
'INSTALLVENDORMAN3DIR' => '',
'EXE_EXT' => '.exe',
- 'EXTRALIBS' => 'D:\\oracle\\ora81\\oci\\LIB\\MSVC\\OCI.lib "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\oldnames.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\kernel32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\user32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\gdi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\winspool.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\comdlg32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\advapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\shell32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ole32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\oleaut32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\netapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\uuid.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ws2_32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\mpr.lib" "C:\\Program Files\\M
icrosoft Platform SDK\\Lib\\winmm.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\version.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbc32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbccp32.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\msvcrt.lib"',
+ 'EXTRALIBS' => 'C:\\oracle\\ora92\\oci\\LIB\\MSVC\\OCI.lib "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\oldnames.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\kernel32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\user32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\gdi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\winspool.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\comdlg32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\advapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\shell32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ole32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\oleaut32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\netapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\uuid.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ws2_32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\mpr.lib" "C:\\
Program Files\\Microsoft Platform SDK\\Lib\\winmm.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\version.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbc32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbccp32.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\msvcrt.lib"',
'PERM_RWX' => 755,
'DESTINSTALLSITEARCH' => '$(DESTDIR)$(INSTALLSITEARCH)',
'ABSPERLRUN' => '$(ABSPERL)',
'DESTINSTALLVENDORSCRIPT' => '$(DESTDIR)$(INSTALLVENDORSCRIPT)',
'BASEEXT' => 'Oracle8',
- 'TEST_F' => '$(ABSPERLRUN) -MExtUtils::Command -e test_f',
+ 'TEST_F' => '$(ABSPERLRUN) -MExtUtils::Command -e "test_f" --',
'PM' => {
'Oracle8.pm' => '$(INST_LIB)\\DBD\\Oracle8.pm',
'oraperl.ph' => '$(INST_LIB)/oraperl.ph',
@@ -328,10 +334,10 @@
},
'ABSPERLRUNINST' => '$(ABSPERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"',
'PERL_CORE' => 0,
- 'INSTALLMAN1DIR' => 'C:\\Perl\\man\\man1',
+ 'INSTALLMAN1DIR' => 'C:\\Perl10\\man\\man1',
'SO' => 'dll',
'VERSION' => '1.00',
'DIST_CP' => 'best',
'INST_SCRIPT' => 'blib\\script',
- 'UNINSTALL' => '$(ABSPERLRUN) "-MExtUtils::Command::MM" -e uninstall'
+ 'UNINSTALL' => '$(ABSPERLRUN) -MExtUtils::Command::MM -e "uninstall" --'
}, 'PACK001' );
Modified: dbd-oracle/branches/DBDOracle8/lib/DBD/Oracle8/GetInfo.pm
==============================================================================
--- dbd-oracle/branches/DBDOracle8/lib/DBD/Oracle8/GetInfo.pm (original)
+++ dbd-oracle/branches/DBDOracle8/lib/DBD/Oracle8/GetInfo.pm Fri Jan 15 11:11:26 2010
@@ -34,7 +34,7 @@
, 2 => \&sql_data_source_name # SQL_DATA_SOURCE_NAME
, 17 => 'Oracle' # SQL_DBMS_NAME
, 18 => \&sql_dbms_version # SQL_DBMS_VERSION
-, 6 => 'DBD/Oracle.pm' # SQL_DRIVER_NAME
+, 6 => 'DBD/Oracle8.pm' # SQL_DRIVER_NAME
, 7 => $sql_driver_ver # SQL_DRIVER_VER
, 136 => 0 # SQL_DROP_ASSERTION
, 139 => 0 # SQL_DROP_DOMAIN