cvs commit: ponie Configure.pl

cvsuser     03/09/11 07:10:42

  Modified:    .        Configure.pl
  Log:
  Rebuild the config.h twice, once for parrot once for perl, important they don't differ to much
  
  Revision  Changes    Path
  1.4       +26 -14    ponie/Configure.pl
  
  Index: Configure.pl
  ===================================================================
  RCS file: /cvs/public/ponie/Configure.pl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -w -r1.3 -r1.4
  --- Configure.pl	10 Sep 2003 16:49:39 -0000	1.3
  +++ Configure.pl	11 Sep 2003 14:10:42 -0000	1.4
  @@ -22,34 +22,46 @@
   }
   
   push @config_args,'-Dnoextensions=Encode';
  -
  -push @config_args,'-Dusedevel';
  -push @config_args,'-Dlocincpth=' . $FindBin::Bin . '/parrot/include';
  -push @config_args,'-Dloclibpth=' . $FindBin::Bin . '/parrot/blib/lib';
  -push @config_args,qq{-Dotherlibdirs=lib/};
  -push @config_args,qq{-A},qq{append:libswanted= parrot};
   push @config_args,'-de';
  +push @config_args,'-Dusedevel';
  +
   
   
   delete($ENV{'PERL5LIB'});
   
   unless(-e 'parrot/parrot') {
  +    do_perl_configure();
       chdir('parrot')  || die "You need to checkout parrot inside ponie";
       chdir('classes') || die;
  -    system('ln','-s','../../src/pmc/perl5lv.pmc');
  +    system('rm -f perl5lv.pmc') && die "Error";
  +    system('ln','-s','../../src/pmc/perl5lv.pmc') && die "error";
       chdir('..') || die;
  -    system($^X,'Configure.pl',"--ccflags= :add{-I$dir/perl}");
  -    system('make');
  +    system($^X,'Configure.pl',"--ccflags= :add{-I$dir/perl}") && die "error";
  +    system('make')  && die "error";
       chdir('..') || die;
   }
   
  +push @config_args,'-Dlocincpth=' . $FindBin::Bin . '/parrot/include';
  +push @config_args,'-Dloclibpth=' . $FindBin::Bin . '/parrot/blib/lib';
  +push @config_args,qq{-Dotherlibdirs=lib/};
  +push @config_args,qq{-A},qq{append:libswanted= parrot};
  +
  +
  +do_perl_configure();
  +
  +sub do_perl_configure {
  +
   chdir('perl') || die;
   my $cmd = 'sh Configure ';
   $cmd .= join(' ',@config_args);
   print "Executing '$cmd'\n";
   
   
  -
  -system('sh','Configure',@config_args);
  -
  +    system('rm -f Policy.sh');
  +    system('rm -f Policy.h');
  +    system('rm -f config.sh');
  +    system('rm -f config.h');
  +    system('sh','Configure',@config_args)  && die "error";;
  +    chdir('..');
  +}