Changeset 21689 for Makefile.PL

Timestamp:

08/01/08 14:59:56 (4 months ago)

Author:

audreyt

Message:

* Allow for bootstrapping cabal.

Files:

• Makefile.PL (modified) (4 diffs)

Makefile.PL

@@ -19 +19 @@
 my $setup_exe  = File::Spec->catfile('.', "Setup$Config{_exe}");
 
-unlink $_ for qw(Setup.hi Setup.o);
-unlink $setup_exe;
-system($ghc, qw(--make -O0), -o => $setup_exe, 'Setup.lhs');
+rebuild_setup();
 my $app_dir = `$setup_exe -d`;
 chomp $app_dir;
@@ -37 +35 @@
 print "[Automatic Installation]\n";
 
-bootstrap_with(Cabal            => qr/1\.4\./, '1.4.0');
-bootstrap_with(HTTP             => qr/300[01]\./, '3000.0');
-bootstrap_with(zlib             => qr/0\.(?:[4-9]|[1-9]\d)\./, '0.4');
-bootstrap_with('cabal-install'  => qr/0\.(?:[5-9]|[1-9]\d)\./, '0.5');
+my $rebuilt;
+$rebuilt ||= bootstrap_with(Cabal            => qr/1\.4\./, '1.4.0');
+$rebuilt ||= bootstrap_with(HTTP             => qr/300[01]\./, '3000.0');
+$rebuilt ||= bootstrap_with(zlib             => qr/0\.(?:[4-9]|[1-9]\d)\./, '0.4');
+$rebuilt ||= bootstrap_with('cabal-install'  => qr/0\.(?:[5-9]|[1-9]\d)\./, '0.5');
+
+if ($rebuilt) {
+    rebuild_setup();
+}
 
 print "[Pugs Dependencies]\n";
@@ -196 +199 @@
 
     chdir $FindBin::RealBin;
+    return 1;
 }
 
@@ -214 +218 @@
     return join("\n", @cmds);
 }
+
+sub rebuild_setup {
+    unlink $_ for qw(Setup.hi Setup.o);
+    unlink $setup_exe;
+    system($ghc, qw(--make -O0), -o => $setup_exe, 'Setup.lhs');
+}