[svn:dbd-oracle] r14655 - dbd-oracle/trunk

Author: byterock
Date: Thu Jan 27 05:32:17 2011
New Revision: 14655

Modified:
   dbd-oracle/trunk/Changes
   dbd-oracle/trunk/Makefile.PL

Log:
Added DBI to PREREQ_PM in Makefile.PL by Martin J. Evans
Added build_requires in Makefile.PL by Martin J. Evans
Added workaround for ExtUtils::MakeMaker problems by Martin J. Evans
Added LICENSE to Makefile.PL by Martin J. Evans



Modified: dbd-oracle/trunk/Changes
==============================================================================
--- dbd-oracle/trunk/Changes	(original)
+++ dbd-oracle/trunk/Changes	Thu Jan 27 05:32:17 2011
@@ -1,3 +1,11 @@
+=head1 Changes in DBD-Oracle 1.28 (svn rev 14583)
+
+  Added DBI to PREREQ_PM in Makefile.PL by Martin J. Evans
+  Added build_requires in Makefile.PL by Martin J. Evans
+  Added workaround for ExtUtils::MakeMaker problems by Martin J. Evans
+  Added LICENSE to Makefile.PL by Martin J. Evans
+
+
 =head1 Changes in DBD-Oracle 1.27 (svn rev 14583)
 
   This version removes �PERL_POLLUTE� and adds in PL_ where required so it will be fully compatible with Perl 5.13

Modified: dbd-oracle/trunk/Makefile.PL
==============================================================================
--- dbd-oracle/trunk/Makefile.PL	(original)
+++ dbd-oracle/trunk/Makefile.PL	Thu Jan 27 05:32:17 2011
@@ -46,7 +46,8 @@
 my %opts = (
     NAME => 'DBD::Oracle',
     VERSION_FROM => 'Oracle.pm',
-    PREREQ_PM => { "Test::Simple" => 0.40 }, # actually Test::More pkg in T::S dist
+    PREREQ_PM => { "Test::Simple" => 0.40, # actually Test::More pkg in T::S dist
+                   "DBI"          => 1.51},
     EXE_FILES => [ "ora_explain$exe_ext" ],
     OBJECT => '$(O_FILES)',
     DEFINE => '',
@@ -58,16 +59,22 @@
 	COMPRESS	=> 'gzip -v9', SUFFIX => 'gz',
     },
     META_MERGE => {
-       configure_requires => { DBI => '1.51' }
+       configure_requires => { "DBI" => '1.51' },
+       build_requires => {"DBI" => '1.51',
+                          "ExtUtils::MakeMaker" => 0}
     },
 );
-if ($ExtUtils::MakeMaker::VERSION >= 5.43) {
+my $eumm = $ExtUtils::MakeMaker::VERSION;
+$eumm =~ tr/_//d;
+
+if ($eumm >= 5.43) {
     $opts{AUTHOR} = 'Tim Bunce (dbi-users@perl.org)';
     $opts{ABSTRACT_FROM} = 'Oracle.pm';
     $opts{PREREQ_PM} = { DBI => 1.51 };
     $opts{CAPI} = 'TRUE' if $Config{archname} =~ /-object\b/i;
 }
 
+$opts{LICENSE} = 'perl' if $eumm >= 6.3002;
 $opts{CCFLAGS} = "-P $Config{ccflags}" if $Config{cc} eq 'bcc32';  # force C++
 $opts{LINKTYPE} = 'static' if $Config{dlsrc} =~ /dl_none/;
 
@@ -282,11 +289,10 @@
   
       print "Using $OCIDIR/lib/$oci_compiler_dir/$OCILIB.lib\n";
       $opts{LIBS} = [ "-L$OH/$OCIDIR/LIB/$oci_compiler_dir $OCILIB" ];
-      
     };
 
-    my $OCIINCLUDE = "-I\"$OH/$OCIDIR/include\" -I\"$OH/rdbms/demo\"";
-    $opts{INC}     = "$OCIINCLUDE -I\"$dbi_arch_dir\"";
+    my $OCIINCLUDE = "-I$OH/$OCIDIR/include -I$OH/rdbms/demo";
+    $opts{INC}  = "$OCIINCLUDE -I$dbi_arch_dir";
 }
 
 # --- UNIX Variants ---

• [svn:dbd-oracle] r14655 - dbd-oracle/trunk by byterock