Applied patch from Larry Doolittle to fix problem where multibuild.pl would

build the wrong files. Made the same changes to multifeat.pl.
This commit is contained in:
Mark Whitley 2001-03-15 22:14:26 +00:00
parent 0d5051def0
commit 056960d8dc
2 changed files with 10 additions and 6 deletions

View File

@ -53,14 +53,16 @@ for $a (@apps) {
print O "#define BB_$a\n", $trailer; print O "#define BB_$a\n", $trailer;
close O; close O;
system("echo -e '\n***\n$a\n***' >>$logfile"); system("echo -e '\n***\n$a\n***' >>$logfile");
# todo: figure out why the "rm -f *.o" is needed # With a fast computer and 1-second resolution on file timestamps, this
$result{$a} = system("rm -f *.o; make $make_opt busybox >>$logfile 2>&1"); # process pushes beyond the limits of what unix make can understand.
# That's why need to weed out obsolete files before restarting make.
$result{$a} = system("rm -f *.o applet_source_list; make $make_opt busybox >>$logfile 2>&1");
$flag = $result{$a} ? "FAILED!!!" : "ok"; $flag = $result{$a} ? "FAILED!!!" : "ok";
printf("Applet %-20s: %s\n", $a, $flag); printf("Applet %-20s: %s\n", $a, $flag);
$total_tests++; $total_tests++;
$failed_tests++ if $flag eq "FAILED!!!"; $failed_tests++ if $flag eq "FAILED!!!";
# pause long enough to let user stop us with a ^C # pause long enough to let user stop us with a ^C
select(undef, undef, undef, 0.05); select(undef, undef, undef, 0.03);
} }
# Clean up our mess # Clean up our mess

View File

@ -63,14 +63,16 @@ for $f (@features) {
print O $header, "#define BB_FEATURE_$f\n", $trailer; print O $header, "#define BB_FEATURE_$f\n", $trailer;
close O; close O;
system("echo -e '\n***\n$f\n***' >>$logfile"); system("echo -e '\n***\n$f\n***' >>$logfile");
# todo: figure out why the "rm -f *.o" is needed # With a fast computer and 1-second resolution on file timestamps, this
$result{$f} = system("rm -f *.o; make $make_opt busybox >>$logfile 2>&1"); # process pushes beyond the limits of what unix make can understand.
# That's why need to weed out obsolete files before restarting make.
$result{$f} = system("rm -f *.o applet_source_list; make $make_opt busybox >>$logfile 2>&1");
$flag = $result{$f} ? "FAILED!!!" : "ok"; $flag = $result{$f} ? "FAILED!!!" : "ok";
printf("Feature %-20s: %s\n", $f, $flag); printf("Feature %-20s: %s\n", $f, $flag);
$total_tests++; $total_tests++;
$failed_tests++ if $flag eq "FAILED!!!"; $failed_tests++ if $flag eq "FAILED!!!";
# pause long enough to let user stop us with a ^C # pause long enough to let user stop us with a ^C
select(undef, undef, undef, 0.05); select(undef, undef, undef, 0.03);
} }
# Clean up our mess # Clean up our mess