From: Peter Rabbitson <ribasushi@cpan.org>
Date: Tue, 30 Jun 2009 15:09:03 +0000 (+0200)
Subject: Merge 'trunk' into 'sybase'
X-Git-Tag: v0.08112~14^2~114
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=52d9416dd9674448763b6fdb784d2868ea31c9d2;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'sybase'

r6871@Thesaurus (orig r6870):  ribasushi | 2009-06-30 10:09:03 +0200
Cleanup dependency handling a bit
---

52d9416dd9674448763b6fdb784d2868ea31c9d2
diff --cc Makefile.PL
index aa117a5,d69dfd5..7b8c3be
--- a/Makefile.PL
+++ b/Makefile.PL
@@@ -76,32 -78,37 +78,43 @@@ my %force_requires_if_author = 
    # t/36datetime.t
    # t/60core.t
    'DateTime::Format::SQLite'  => 0,
-   'DateTime::Format::MySQL'   => 0,
-   'DateTime::Format::Pg'      => 0,
- 
-   # t/73oracle_inflate.t
-   'DateTime::Format::Oracle'  => 0,
  
    # t/96_is_deteministic_value.t
-   'DateTime::Format::Strptime' => 0,
+   'DateTime::Format::Strptime'=> 0,
  
-   # t/72pg.t
+   # t/93storage_replication.t
+   'Moose',                    => 0.77,
+   'MooseX::AttributeHelpers'  => 0.12,
+   'MooseX::Types',            => 0.10,
+   'namespace::clean'          => 0.11,
+   'Hash::Merge',              => 0.11,
+ 
+   # database-dependent reqs
+   #
    $ENV{DBICTEST_PG_DSN}
-     ? ('Sys::SigAction'=> 0)
-     : ()
+     ? (
+       'Sys::SigAction' => 0,
+       'DateTime::Format::Pg' => 0,
+     ) : ()
    ,
  
-   # t/93storage_replication.t
-   'Moose',                        => 0.77,
-   'MooseX::AttributeHelpers'      => 0.12,
-   'MooseX::Types',                => 0.10,
-   'namespace::clean'              => 0.11,
-   'Hash::Merge',                  => 0.11,
- 
-   # t/746sybase.t
-   'DateTime::Format::Sybase' => 0,
+   $ENV{DBICTEST_MYSQL_DSN}
+     ? (
+       'DateTime::Format::MySQL' => 0,
+     ) : ()
+   ,
+ 
+   $ENV{DBICTEST_ORACLE_DSN}
+     ? (
+       'DateTime::Format::Oracle' => 0,
+     ) : ()
+   ,
++
++  $ENV{DBICTEST_SYBASE_DSN}
++    ? (
++      'DateTime::Format::Sybase' => 0,
++    ) : ()
++  ,
  );
  
  if ($Module::Install::AUTHOR) {