Author: byterock
Date: Fri Jan 15 12:20:07 2010
New Revision: 13729

Added:
   dbd-oracle/branches/DBDOracle8/Oracle8.ex/
      - copied from r13727, /dbd-oracle/branches/DBDOracle8/Oracle.ex/
Removed:
   dbd-oracle/branches/DBDOracle8/Oracle.ex/
Modified:
   dbd-oracle/branches/DBDOracle8/blib/arch/auto/DBD/Oracle8/mk.pm

Log:
another rename

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 12:20:07 2010
@@ -1,6 +1,6 @@
 $dbd_oracle_mm_opts = {

                         'NAME' => 'DBD::Oracle8',

-                        'INC' => '-IC:/oracle/ora92/oci/include 
-IC:/oracle/ora92/rdbms/demo -IC:/Perl10/site/lib/auto/DBI/',

+                        'INC' => '-IC:/oracle/ora92/oci/include 
-IC:/oracle/ora92/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI',

                         'LIBS' => [

                                     '-LC:/oracle/ora92/oci/LIB/MSVC OCI'

                                   ],

@@ -27,38 +27,36 @@
                                        }

                       };

 $dbd_oracle_mm_self = bless( {

-                               'MM_Win32_VERSION' => '6.55_02',

+                               'MM_Win32_VERSION' => '6.52',

                                'BSLOADLIBS' => '',

                                'ECHO_N' => '$(ABSPERLRUN)  -e "print 
q...@argv}" --',

                                'BOOTDEP' => '',

-                               'INSTALLSITESCRIPT' => 'C:\\Perl10\\site\\bin',

+                               'INSTALLSITESCRIPT' => 'C:\\Perl\\site\\bin',

                                'CCDLFLAGS' => ' ',

-                               'LDDLFLAGS' => '-dll -nologo -nodefaultlib 
-debug -opt:ref,icf  -libpath:"C:\\Perl10\\lib\\CORE"  -machine:x86',

+                               'LDDLFLAGS' => '-dll -nologo -nodefaultlib 
-debug -opt:ref,icf  -libpath:"C:\\Perl\\lib\\CORE"  -machine:x86',

                                'DESTINSTALLVENDORMAN3DIR' => 
'$(DESTDIR)$(INSTALLVENDORMAN3DIR)',

                                '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:/Perl10/lib/ExtUtils/MakeMaker.pm',

+                               'MAKEMAKER' => 
'C:/Perl/site/lib/ExtUtils/MakeMaker.pm',

                                'USEMAKEFILE' => '-f',

                                'RM_RF' => '$(ABSPERLRUN) -MExtUtils::Command 
-e "rm_rf" --',

                                'PMLIBDIRS' => [

                                                 'lib'

                                               ],

                                'INST_LIBDIR' => '$(INST_LIB)\\DBD',

-                               'SITEARCHEXP' => 'C:\\Perl10\\site\\lib',

+                               'SITEARCHEXP' => 'C:\\Perl\\site\\lib',

                                'ABSTRACT' => 'Oracle database driver for the 
DBI module',

                                'INST_MAN1DIR' => 'blib\\man1',

                                'MAN3EXT' => '3',

                                'XS' => {

                                          'Oracle8.xs' => 'Oracle8.c'

                                        },

-                               'MAKE' => 'C:\\Perl\\bin\\nmake.exe',

+                               'MAKE' => 'nmake',

                                'FULL_AR' => '',

                                'TRUE' => '$(ABSPERLRUN)  -e "exit 0" --',

-                               'FULLPERL' => 'C:\\Perl10\\bin\\perl.exe',

+                               'FULLPERL' => 'C:\\Perl\\bin\\perl.exe',

                                'DIR' => $dbd_oracle_mm_opts->{'DIR'},

                                'CONFIG' => [

                                              'ar',

@@ -85,11 +83,10 @@
                                              'vendorlibexp'

                                            ],

                                'DESTDIR' => '',

-                               'INSTALLSITEHTMLDIR' => 'C:\\Perl10\\html',

                                'MAN1PODS' => {

                                                'ora_explain' => 
'$(INST_MAN1DIR)\\ora_explain.$(MAN1EXT)'

                                              },

-                               'INSTALLSITEBIN' => 'C:\\Perl10\\site\\bin',

+                               'INSTALLSITEBIN' => 'C:\\Perl\\site\\bin',

                                'CHMOD' => '$(ABSPERLRUN) -MExtUtils::Command 
-e "chmod" --',

                                'DESTINSTALLVENDORLIB' => 
'$(DESTDIR)$(INSTALLVENDORLIB)',

                                'OBJ_EXT' => '.obj',

@@ -101,10 +98,10 @@
                                       ],

                                'EXE_FILES' => 
$dbd_oracle_mm_opts->{'EXE_FILES'},

                                'TARFLAGS' => 'cvf',

-                               'PERL_INC' => 'C:\\Perl10\\lib\\CORE',

+                               'PERL_INC' => 'C:\\Perl\\lib\\CORE',

                                'HAS_LINK_CODE' => 1,

-                               'INSTALLPRIVLIB' => 'C:\\Perl10\\lib',

-                               'SITELIBEXP' => 'C:\\Perl10\\site\\lib',

+                               'INSTALLPRIVLIB' => 'C:\\Perl\\lib',

+                               'SITELIBEXP' => 'C:\\Perl\\site\\lib',

                                'DESTINSTALLPRIVLIB' => 
'$(DESTDIR)$(INSTALLPRIVLIB)',

                                'VENDORLIBEXP' => '',

                                'DEFINE' => ' -DUTF8_SUPPORT 
-DORA_OCI_VERSION=\\"8.1.7.0\\"',

@@ -114,8 +111,8 @@
                                                'ora_explain.PL' => 
'ora_explain'

                                              },

                                'VENDORARCHEXP' => '',

-                               'MM_VERSION' => '6.55_02',

-                               'INSTALLSCRIPT' => 'C:\\Perl10\\bin',

+                               'MM_VERSION' => '6.52',

+                               'INSTALLSCRIPT' => 'C:\\Perl\\bin',

                                'CC' => 'cl',

                                'LIBS' => $dbd_oracle_mm_opts->{'LIBS'},

                                'DLEXT' => 'dll',

@@ -135,23 +132,21 @@
                                              '# This Makefile is for the 
DBD::Oracle8 extension to perl.

 #

 # It was generated automatically by MakeMaker version

-# 6.55_02 (Revision: 65502) from the contents of

+# 6.52 (Revision: 65199) 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[-IC:/oracle/ora92/oci/include -IC:/oracle/ora92/rdbms/demo 
-IC:/Perl10/site/lib/auto/DBI/]',

+                                             '#     INC => 
q[-IC:/oracle/ora92/oci/include -IC:/oracle/ora92/rdbms/demo 
-IC:\\Perl\\site\\lib\\auto\\DBI]',

                                              '#     LIBS => 
[q[-LC:/oracle/ora92/oci/LIB/MSVC OCI]]',

                                              '#     NAME => q[DBD::Oracle8]',

                                              '#     OBJECT => q[$(O_FILES)]',

@@ -164,12 +159,11 @@
                                            ],

                                'FULLPERLRUNINST' => '$(FULLPERLRUN) 
"-I$(INST_ARCHLIB)" "-I$(INST_LIB)"',

                                'MAP_TARGET' => 'perl',

-                               'INSTALLMAN3DIR' => 'C:\\Perl10\\man\\man3',

-                               'PERLPREFIX' => 'C:\\Perl10',

+                               'INSTALLMAN3DIR' => 'C:\\Perl\\man\\man3',

+                               'PERLPREFIX' => 'C:\\Perl',

                                'AUTHOR' => 'Tim Bunce ([email protected])',

-                               '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',

+                               'INC' => '-IC:/oracle/ora92/oci/include 
-IC:/oracle/ora92/rdbms/demo -IC:\\Perl\\site\\lib\\auto\\DBI',

+                               'LDFLAGS' => '-nologo -nodefaultlib -debug 
-opt:ref,icf  -libpath:"C:\\Perl\\lib\\CORE"  -machine:x86',

                                'dist' => $dbd_oracle_mm_opts->{'dist'},

                                'INSTALLVENDORMAN1DIR' => '',

                                'MAKEFILE_OLD' => 'Makefile.old',

@@ -185,7 +179,6 @@
                                'DESTINSTALLVENDORMAN1DIR' => 
'$(DESTDIR)$(INSTALLVENDORMAN1DIR)',

                                'INST_ARCHLIBDIR' => '$(INST_ARCHLIB)\\DBD',

                                'OBJECT' => '$(O_FILES)',

-                               'BUILD_REQUIRES' => {},

                                'NAME_SYM' => 'DBD_Oracle8',

                                'RANLIB' => 'rem',

                                'DIRFILESEP' => '^\\',

@@ -194,7 +187,7 @@
                                'COMPRESS' => 'gzip --best',

                                'SUFFIX' => '.gz',

                                'MAN1EXT' => '1',

-                               'PERL_LIB' => 'C:\\Perl10\\lib',

+                               'PERL_LIB' => 'C:\\Perl\\lib',

                                'ECHO' => '$(ABSPERLRUN) -l -e "print 
q...@argv}" --',

                                'EXPORT_LIST' => '$(BASEEXT).def',

                                'INST_BOOT' => 
'$(INST_ARCHAUTODIR)\\$(BASEEXT).bs',

@@ -215,11 +208,11 @@
                                'DIST_DEFAULT' => 'tardist',

                                'SKIPHASH' => {},

                                'NOOP' => 'rem',

-                               'PERL_ARCHLIB' => 'C:\\Perl10\\lib',

+                               'PERL_ARCHLIB' => 'C:\\Perl\\lib',

                                'VERSION_SYM' => '1_00',

                                'VERSION_MACRO' => 'VERSION',

                                'WARN_IF_OLD_PACKLIST' => '$(ABSPERLRUN) 
-MExtUtils::Command::MM -e "warn_if_old_packlist" --',

-                               'MM_REVISION' => 65502,

+                               'MM_REVISION' => 65199,

                                'RM_F' => '$(ABSPERLRUN) -MExtUtils::Command -e 
"rm_f" --',

                                'LIBC' => 'msvcrt.lib',

                                'UNINST' => 0,

@@ -233,7 +226,7 @@
                                'MACROEND' => '',

                                'ARGS' => {

                                            'NAME' => 'DBD::Oracle8',

-                                           'INC' => 
'-IC:/oracle/ora92/oci/include -IC:/oracle/ora92/rdbms/demo 
-IC:/Perl10/site/lib/auto/DBI/',

+                                           'INC' => 
'-IC:/oracle/ora92/oci/include -IC:/oracle/ora92/rdbms/demo 
-IC:\\Perl\\site\\lib\\auto\\DBI',

                                            'LIBS' => 
$dbd_oracle_mm_opts->{'LIBS'},

                                            'AUTHOR' => 'Tim Bunce 
([email protected])',

                                            'DIR' => 
$dbd_oracle_mm_opts->{'DIR'},

@@ -259,7 +252,7 @@
                                'DLBASE' => '$(BASEEXT)',

                                'INST_MAN3DIR' => 'blib\\man3',

                                'CCCDLFLAGS' => ' ',

-                               'INSTALLSITEARCH' => 'C:\\Perl10\\site\\lib',

+                               'INSTALLSITEARCH' => 'C:\\Perl\\site\\lib',

                                'PMLIBPARENTDIRS' => [

                                                       'lib'

                                                     ],

@@ -270,18 +263,17 @@
                                'RCS_LABEL' => 'rcs -Nv$(VERSION_SYM): -q',

                                'NAME' => 'DBD::Oracle8',

                                'PARENT_NAME' => 'DBD',

-                               'INSTALLSITELIB' => 'C:\\Perl10\\site\\lib',

+                               'INSTALLSITELIB' => 'C:\\Perl\\site\\lib',

                                'MAKE_APERL_FILE' => 'Makefile.aperl',

                                'ZIP' => 'zip',

                                'VERSION_FROM' => 'Oracle8.pm',

-                               'SITEPREFIX' => 'C:\\Perl10\\site',

+                               'SITEPREFIX' => 'C:\\Perl\\site',

                                'INSTALLVENDORSCRIPT' => '',

                                'TO_UNIX' => '$(NOECHO) $(NOOP)',

-                               'PERL' => 'C:\\Perl10\\bin\\perl.exe',

+                               'PERL' => 'C:\\Perl\\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" --',

@@ -300,11 +292,10 @@
                                'PREFIX' => '$(SITEPREFIX)',

                                'INSTALLDIRS' => 'site',

                                'INST_ARCHLIB' => 'blib\\arch',

-                               'INSTALLHTMLDIR' => 'C:\\Perl10\\html',

-                               'PERL_ARCHIVE' => '$(PERL_INC)\\perl510.lib',

+                               'PERL_ARCHIVE' => '$(PERL_INC)\\perl58.lib',

                                'INSTALLVENDORARCH' => '',

+                               'INSTALLBIN' => 'C:\\Perl\\bin',

                                'DESTINSTALLSITEMAN1DIR' => 
'$(DESTDIR)$(INSTALLSITEMAN1DIR)',

-                               'INSTALLBIN' => 'C:\\Perl10\\bin',

                                'INSTALLSITEMAN3DIR' => '$(INSTALLMAN3DIR)',

                                'PERL_ARCHIVE_AFTER' => '',

                                'MAN3PODS' => {

@@ -312,9 +303,8 @@
                                                'Oraperl.pm' => 
'$(INST_MAN3DIR)\\DBD\\Oraperl.$(MAN3EXT)'

                                              },

                                'LIBPERL_A' => 'libperl.lib',

-                               'INSTALLARCHLIB' => 'C:\\Perl10\\lib',

+                               'INSTALLARCHLIB' => 'C:\\Perl\\lib',

                                'LIB_EXT' => '.lib',

-                               'DESTINSTALLSITEHTMLDIR' => 
'$(DESTDIR)$(INSTALLSITEHTMLDIR)',

                                'AR_STATIC_ARGS' => 'cr',

                                'INSTALLVENDORMAN3DIR' => '',

                                'EXE_EXT' => '.exe',

@@ -334,7 +324,7 @@
                                        },

                                'ABSPERLRUNINST' => '$(ABSPERLRUN) 
"-I$(INST_ARCHLIB)" "-I$(INST_LIB)"',

                                'PERL_CORE' => 0,

-                               'INSTALLMAN1DIR' => 'C:\\Perl10\\man\\man1',

+                               'INSTALLMAN1DIR' => 'C:\\Perl\\man\\man1',

                                'SO' => 'dll',

                                'VERSION' => '1.00',

                                'DIST_CP' => 'best',

Reply via email to