From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sun, 19 Apr 2015 05:51:47 +0000 (+0200)
Subject: (travis) *FINALLY* remove Module::Build::Tiny front-loading
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a872a9d7670d2b9d3c213515d4c3cf625431107f;p=dbsrgits%2FDBIx-Class.git

(travis) *FINALLY* remove Module::Build::Tiny front-loading
---

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
index c4f0f62..fe64af4 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -58,7 +58,7 @@ if [[ "$CLEANTEST" = "true" ]]; then
 
   if [[ "$DEVREL_DEPS" != "true" ]] && ! CPAN_is_sane ; then
     # no configure_requires - we will need the usual suspects anyway
-    # without pre-installing these in one pass things like extract_prereqs won't work
+    # without pre-installing these in one pass things won't yet work
     installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build
   fi
 
@@ -116,20 +116,6 @@ if [[ "$CLEANTEST" = "true" ]]; then
       # various pieces we may run into
       # FIXME - need to get these off metacpan or something instead
       HARD_DEPS="ExtUtils::Depends B::Hooks::OP::Check $HARD_DEPS"
-
-      if CPAN_supports_BUILDPL ; then
-        # We will invoke a posibly MBT based BUILD-file, but we do not support
-        # configure requires. So we not only need to install MBT but its prereqs
-        # FIXME This is madness
-        HARD_DEPS="$(extract_prereqs Module::Build::Tiny) Module::Build::Tiny $HARD_DEPS"
-      else
-        # FIXME
-        # 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
-        HARD_DEPS="$(extract_prereqs Params::Validate) $HARD_DEPS"
-      fi
-
     fi
 
 ##### END TEMPORARY WORKAROUNDS