Vestigial dqlib reference forgotten in f4a8b21ef

[dbsrgits/DBIx-Class.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 95d1d5e..27bb2f2 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,30 +8,35 @@ use inc::Module::Install 1.06;
 ## TEMPORARY (and non-portable)
 ## Get the dq stuff
 ##
-if ($Module::Install::AUTHOR) {
-  `rm -rf lib/DBIx/Class/Bundled`;
-  `mkdir lib/DBIx/Class/Bundled`;
-  for (
-    [ 'Data-Query' => 'master' ],
-    [ 'SQL-Abstract' => 'dq' ],
-  ) {
-    my $tdir = '/tmp/dqlib_tmp_clone';
-  
-    `rm -rf $tdir`;
-  
-    `GIT_SSH=maint/careless_ssh.bash git clone --quiet git://git.shadowcat.co.uk/dbsrgits/$_->[0] $tdir`;
-    printf "\nIncluding %s git rev %s\n",
-      $_->[0],
-      scalar `GIT_DIR=$tdir/.git git rev-parse origin/$_->[1]`,
-    ;
-    `git archive --format=tar --remote=file://$tdir origin/$_->[1] lib/ | tar --strip-components=1 -xC lib/DBIx/Class/Bundled`;
-  
-    `rm -rf $tdir`;
+my $target_libdir;
+BEGIN {
+  $target_libdir = 'lib/DBIx/Class/_TempExtlib';
+
+  if ($Module::Install::AUTHOR) {
+
+    `rm -rf $target_libdir`;
+    `mkdir $target_libdir`;
+    for (
+      [ 'Data-Query' => 'master' ],
+      [ 'SQL-Abstract' => 'dq' ],
+    ) {
+      my $tdir = "/tmp/dqlib/$_->[0]/";
+
+      `rm -rf $tdir`;
+
+      `GIT_SSH=maint/careless_ssh.bash git clone --bare --quiet --branch=$_->[1] --depth=1 git://git.shadowcat.co.uk/dbsrgits/$_->[0] $tdir`;
+      printf "\nIncluding %s git rev %s\n",
+        $_->[0],
+        scalar `GIT_DIR=$tdir git rev-parse $_->[1]`,
+      ;
+      `git archive --format=tar --remote=file://$tdir $_->[1] lib/ | tar --strip-components=1 -xC $target_libdir`;
+
+      #`rm -rf $tdir`;
+    }
   }
-  `cpanm SQL::ReservedWords 2>&1`;
 }
-use lib 'lib/DBIx/Class/Bundled';
 
+use lib $target_libdir;
 
 ##
 ## DO NOT USE THIS HACK IN YOUR DISTS!!! (it makes #toolchain sad)