Changeset 21705 for Makefile.PL

Show
Ignore:
Timestamp:
08/01/08 16:17:47 (5 months ago)
Author:
audreyt
Message:

* Makefile.PL: Solve the need-repeat-run-to-install-deps problem

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • Makefile.PL

    r21701 r21705  
    3636 
    3737my $rebuilt; 
    38 $rebuilt ||= bootstrap_with(Cabal            => qr/1\.4\./, '1.4.0'); 
    39 $rebuilt ||= bootstrap_with(parsec           => qr/2\./, '2.0'); 
    40 $rebuilt ||= bootstrap_with(network          => qr/[12]\./, '1.0'); 
    41 $rebuilt ||= bootstrap_with(HTTP             => qr/300[01]\./, '3000.0'); 
    42 $rebuilt ||= bootstrap_with(zlib             => qr/0\.(?:[4-9]|[1-9]\d)\./, '0.4'); 
    43 $rebuilt ||= bootstrap_with('cabal-install'  => qr/0\.(?:[5-9]|[1-9]\d)\./, '0.5'); 
     38$rebuilt += bootstrap_with(Cabal            => qr/1\.4\./, '1.4.0'); 
     39#$rebuilt ||= bootstrap_with(bytestring       => qr/0\.9\.[1-9]/, '0.9.1'); 
     40$rebuilt += bootstrap_with(parsec           => qr/2\./, '2.0'); 
     41$rebuilt += bootstrap_with(network          => qr/[12]\./, '1.0'); 
     42$rebuilt += bootstrap_with(HTTP             => qr/300[01]\./, '3000.0'); 
     43$rebuilt += bootstrap_with(zlib             => qr/0\.(?:[4-9]|[1-9]\d)\./, '0.4'); 
     44$rebuilt += bootstrap_with('cabal-install'  => qr/0\.(?:[5-9]|[1-9]\d)\./, '0.5'); 
    4445 
    4546if ($rebuilt) { 
    … …  
    5051 
    5152my @deps = qw( 
    52     filepath mtl stm pretty time random process containers bytestring array directory  
     53    filepath mtl stm pretty time random process containers array directory  
    5354 
    5455    utf8-string 
    … …  
    6465); 
    6566 
    66 system($cabal => 'update'); 
     67#system($cabal => 'update'); 
    6768system($cabal => 'install', '--user', @deps); 
    6869 
    … …  
    140141    # Ok, now we have Cabal-Install and all the deps.  Let's be lazy and write a simple makefile. 
    141142    postamble(<<"."); 
    142 pugs$Config{_exe} :: src/Pugs/Config.hs 
     143pugs$Config{_exe} :: src/Pugs/Config.hs src/Pugs/Prelude.hs 
    143144\t\$(RM_F) dist/build/pugs/pugs$Config{_exe} 
    144145\t\$(RM_F) Pugs.cabal 
    … …  
    167168upload-smoke : smoke.yml 
    168169        \$(PERL) util/smokeserv/smokeserv-client.pl smoke.html smoke.yml 
     170 
     171src/Pugs/Prelude.hs : src/perl6/Prelude.pm util/gen_prelude.pl 
     172        \$(PERL) util/gen_prelude.pl -v --touch --inline -i src/perl6/Prelude.pm --output src/Pugs/Prelude.hs 
    169173. 
    170174