X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=d23b6cd7c8122d7cb5ff2c8f9d71ab11e1c6088d;hb=37ab4b67abfeac8dd69ca9165ee001d2bda5285a;hp=056ae886dc6fb88b4abd78714faae932e72a3072;hpb=2b885e5fbf3edb4a0b3f1c7e5068dda08b11ac09;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index 056ae88..d23b6cd 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -42,15 +42,28 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # So instead we still use our stock (possibly old) CPAN, and add some
   # handholding
   if ! CPAN_is_sane ; then
-    for m in ExtUtils::MakeMaker ExtUtils::CBuilder R/RS/RSAVAGE/Tree-DAG_Node-1.13.tgz Module::Build ; do
+    for m in \
+ExtUtils::MakeMaker \
+ExtUtils::CBuilder \
+R/RS/RSAVAGE/Tree-DAG_Node-1.13.tgz \
+Module::Build \
+E/ET/ETHER/Class-Method-Modifiers-2.04.tar.gz \
+; do
       run_or_err "Pre-installing $m" "cpan $m"
+      if ! perl -e '
+
+eval ( q{require } . (
+  $ARGV[0] =~ m{ \/ .*? ([^\/]+) $ }x
+    ? do { my @p = split (/\-/, $1); pop @p; join "::", @p }
+    : $ARGV[0]
+) ) or ( print $@ and exit 1)' "$m" 2> /dev/null ; then
+
+        echo_err -e "$m installation failed\n$LASTOUT"
+        exit 1
+      fi
     done
   fi
 
-  if ! perl -MModule::Build -e 1 &> /dev/null ; then
-    echo_err -e "Module::Build installation failed\n$LASTOUT"
-    exit 1
-  fi
 
   # DBI has by far the longest test runtime - run less tests
   # FIXME horrible horrible hack, need to implement in DBI itself
@@ -74,31 +87,22 @@ else
   parallel_installdeps_notest ExtUtils::MakeMaker
   parallel_installdeps_notest File::Path
   parallel_installdeps_notest Carp
-  parallel_installdeps_notest Module::Build ExtUtils::Depends
-  parallel_installdeps_notest Module::Runtime File::Spec Data::Dumper
+  parallel_installdeps_notest Module::Build Module::Runtime
+  parallel_installdeps_notest File::Spec Data::Dumper
   parallel_installdeps_notest Test::Exception Encode::Locale Test::Fatal R/RS/RSAVAGE/Tree-DAG_Node-1.13.tgz
-  parallel_installdeps_notest Test::Warn bareword::filehandles B::Hooks::EndOfScope Test::Differences HTTP::Status
+  parallel_installdeps_notest Test::Warn B::Hooks::EndOfScope Test::Differences HTTP::Status
   parallel_installdeps_notest Test::Pod::Coverage Test::EOL Devel::GlobalDestruction Sub::Name MRO::Compat Class::XSAccessor URI::Escape HTML::Entities
   parallel_installdeps_notest YAML LWP Class::Trigger JSON::XS DBI DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
-  parallel_installdeps_notest Moose Module::Install JSON SQL::Translator
+  parallel_installdeps_notest Moose Module::Install JSON SQL::Translator File::Which
 
   if [[ -n "DBICTEST_FIREBIRD_DSN" ]] ; then
-    # pull in patched unreleased copy with restored 5.8 compat
-    run_or_err "Fetching patched DBD::Firebird" \
-      "git clone https://github.com/mariuz/perl-dbd-firebird ~/dbd-firebird"
-
     # the official version is very much outdated and does not compile on 5.14+
     # use this rather updated source tree (needs to go to PAUSE):
     # https://github.com/pilcrow/perl-dbd-interbase
     run_or_err "Fetching patched DBD::InterBase" \
       "git clone https://github.com/dbsrgits/perl-dbd-interbase ~/dbd-interbase"
 
-    # Now part of DBD::Firebird configure_requires, which are not present
-    # in the cloned repo (no META.*)
-    # FIXME - need to get this off metacpan or something instead
-    parallel_installdeps_notest File::Which
-
-    parallel_installdeps_notest ~/dbd-interbase/ ~/dbd-firebird/
+    parallel_installdeps_notest ~/dbd-interbase/
   fi
 
 fi
@@ -112,20 +116,8 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # we may need to prepend some stuff to that list
   HARD_DEPS="$(echo $(make listdeps))"
 
-
 ##### TEMPORARY WORKAROUNDS
 
-  # this is a fucked CPAN - won't understand configure_requires of
-  # various pieces we may run into
-  # FIXME - need to get these off metacpan or something instead
-  CPAN_is_sane || HARD_DEPS="ExtUtils::Depends B::Hooks::OP::Check $HARD_DEPS"
-
-  # The unicode-in-yaml bug on older cpan clients
-  # FIXME there got to be a saner way to fix this...
-  perl -M5.008008 -e 1 &> /dev/null || \
-     run_or_err "Installing multidimensional and bareword::filehandles via cpanm" \
-        "cpanm multidimensional bareword::filehandles"
-
   # work around Params::Validate not having a Makefile.PL so really old
   # toolchains can not figure out what the prereqs are ;(
   # Need to do more research before filing a bug requesting Makefile inclusion