The R Project SVN R

Rev

Rev 46832 | Rev 47149 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 46832 Rev 47147
Line 35... Line 35...
35 
use Text::Wrap;
 35 
use Text::Wrap;
36 
 
 36 
 
37 
## Don't buffer output.
 37 
## Don't buffer output.
38 
$| = 1;
 38 
$| = 1;
39 
 
 39 
 
40 
my $revision = ' $Rev: 46832 $ ';
 40 
my $revision = ' $Rev: 47147 $ ';
41 
my $version;
 41 
my $version;
42 
my $name;
 42 
my $name;
43 
$revision =~ / ([\d\.]*) /;
 43 
$revision =~ / ([\d\.]*) /;
44 
$version = $1;
 44 
$version = $1;
45 
($name = $0) =~ s|.*/||;
 45 
($name = $0) =~ s|.*/||;
Line 554... Line 554...
554 
	    ## $(RHOME)/src/gnuwin32/MkRules.
 554 
	    ## $(RHOME)/src/gnuwin32/MkRules.
555 
	    $ENV{RHOME} = $ENV{R_HOME};
 555 
	    $ENV{RHOME} = $ENV{R_HOME};
556 
	    if(-r "Makefile.win") {
 556 
	    if(-r "Makefile.win") {
557 
		R_system("${R::Vars::MAKE} -f Makefile.win clean");
 557 
		R_system("${R::Vars::MAKE} -f Makefile.win clean");
558 
	    } else {
 558 
	    } else {
- 
 
 559 
		## FIXME: there need not be a 'clean' target.
- 
 
 560 
		## FIXME: why not use 'Makevars' if Makevars.win does not exist?
559 
		if(-r "Makevars.win") {
 561 
		if(-r "Makevars.win") {
560 
		    R_system("${R::Vars::MAKE} -f Makevars.win clean");
 562 
		    R_system("${R::Vars::MAKE} -f Makevars.win clean");
561 
		}
 563 
		}
562 
		foreach my $file (<*.o $pkgname.a $pkgname.dll $pkgname.def>) {
 564 
		foreach my $file (<*.o $pkgname.a $pkgname.dll $pkgname.def>) {
563 
		    unlink($file);
 565 
		    unlink($file);
Line 572... Line 574...
572 
	    if(-r "Makefile") {
 574 
	    if(-r "Makefile") {
573 
		$makefiles .= " -f Makefile";
 575 
		$makefiles .= " -f Makefile";
574 
		R_system("${R::Vars::MAKE} $makefiles clean");
 576 
		R_system("${R::Vars::MAKE} $makefiles clean");
575 
	    } else {
 577 
	    } else {
576 
		if(-r "Makevars") {
 578 
		if(-r "Makevars") {
- 
 
 579 
		    ## ensure we do have a 'clean' target.
- 
 
 580 
		    $makefiles .= " -f " .
- 
 
 581 
			&shell_quote_file_path(&file_path(${R::Vars::R_HOME},
- 
 
 582 
							  "share", "make",
- 
 
 583 
							  "clean.mk"));
577 
		    $makefiles .= " -f Makevars";
 584 
		    $makefiles .= " -f Makevars";
578 
		    R_system("${R::Vars::MAKE} $makefiles clean");
 585 
		    R_system("${R::Vars::MAKE} $makefiles clean");
579 
		}
 586 
		}
580 
		## Also cleanup possible Windows leftovers ...
 587 
		## Also cleanup possible Windows leftovers ...
581 
		unlink((<*.o *.s[lo] *.dylib>,
 588 
		unlink((<*.o *.s[lo] *.dylib>,