- Projects

Re: setlog
by Simon Odou 17 Aug '04

17 Aug '04

Akim Demaille <akim(a)epita.fr> writes: > >>> "Akim" == Akim Demaille <akim(a)epita.fr> writes: > > > C'est cool d'avoir corrigé le pb de tc, mais est-ce que le bug report > > pour svn a été fait ? > > Alors ? Non, toujours pas. Le pb n'est pas si simple à isoler que ça et là je n'ai vraiment pas le temps (rapport, rapport...). Je m'en occuperai plus tard (cf task 151). -- Simon Odou simon(a)lrde.epita.fr

2 3

[nolimips: 120] Add the backtrace command to the shell.
by Noe 17 Aug '04

17 Aug '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> Add the backtrace command to the shell. * src/vm/cpu.hh, src/vm/virtual_machine.hh: Add an accessor to call stack. * src/shell/cmd.hh, src/shell/shell.hh, src/shell/shell.cc: Parse and execute backtrace command. 2004-07-18 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/vm/cpu.hh --- src/vm/cpu.hh (revision 114) +++ src/vm/cpu.hh (working copy) @@ -271,7 +271,7 @@ if (check_callee_save_p_) for (int i = Cpu::s0; i <= Cpu::s7; ++i) set_unlimited(-i, get_register((Cpu::kind_type) i)); - call_stack_.push(get_pc ()); + call_stack_.push_back(get_pc ()); unlimited_.begin_scope(); } @@ -286,14 +286,20 @@ std::cerr << "Warning: callee save register `$s" << i - Cpu::s0 << "' was not preserved across last call to 0x" - << std::hex << call_stack_.top() << std::dec << std::endl; + << std::hex << *call_stack_.rbegin() << std::dec << std::endl; set_register((Cpu::kind_type) i, get_unlimited(-i)); exit_set(exit_runtime); } - call_stack_.pop(); + call_stack_.pop_back(); } + public: + const std::vector<register_type> & get_call_stack() const + { + return call_stack_; + } + protected: - std::stack<register_type> call_stack_; + std::vector<register_type> call_stack_; bool check_callee_save_p_; Index: src/vm/virtual_machine.hh --- src/vm/virtual_machine.hh (revision 116) +++ src/vm/virtual_machine.hh (working copy) @@ -115,6 +115,12 @@ /// Add a breakpoint void add_breakpoint(const std::string& label); + /// Return CPU's call stack + const std::vector<register_type> & get_call_stack() const + { + return cpu_.get_call_stack(); + } + protected: /// The list of breakpoints std::list<int> breakpoints_; Index: src/shell/cmd.hh --- src/shell/cmd.hh (revision 119) +++ src/shell/cmd.hh (working copy) @@ -48,6 +48,7 @@ cmd_undisplay, cmd_dump, cmd_mem, + cmd_backtrace, cmd_nop_after_branch, cmd_help }; Index: src/shell/shell.hh --- src/shell/shell.hh (revision 119) +++ src/shell/shell.hh (working copy) @@ -60,7 +60,8 @@ DUMP = 210, MEM = 211, NOP_AFTER_BRANCH = 212, - HELP = 213 + HELP = 213, + BACKTRACE }; /// Shell Class. @@ -209,6 +210,7 @@ void do_dump(); void do_print(const Cmd &cmd); void do_mem(); + void do_backtrace() const; void do_nop_after_branch(); Index: src/shell/shell.cc --- src/shell/shell.cc (revision 119) +++ src/shell/shell.cc (working copy) @@ -17,6 +17,8 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +#include <iomanip> + #include "misc/readline.hh" #include "parse/libparse.hh" @@ -50,6 +52,8 @@ map_token_["l"] = LOAD; map_token_["mem"] = MEM; map_token_["m"] = MEM; + map_token_["backtrace"] = BACKTRACE; + map_token_["bt"] = BACKTRACE; map_token_["next"] = NEXT; map_token_["n"] = NEXT; map_token_["print"] = PRINT; @@ -237,6 +241,8 @@ command->push_arg(tmp); return command; } + case BACKTRACE: + return new Cmd(Cmd::cmd_backtrace); case NOP_AFTER_BRANCH: return new Cmd(Cmd::cmd_nop_after_branch); case HELP: @@ -372,6 +378,28 @@ } void + Shell::do_backtrace() const + { + const std::vector<vm::register_type> &call_stack = vm_.get_call_stack(); + + if (call_stack.empty()) + std::cout << "No stack." << std::endl; + else + { + unsigned level = 0; + for (std::vector<vm::register_type>::const_reverse_iterator + it = call_stack.rbegin(); it != call_stack.rend(); ++it) + { + std::cout + << "#" << level << " 0x" + << std::hex << std::setfill('0') << std::setw(8) << (*it) + << std::endl; + ++level; + } + } + } + + void Shell::do_error() const { std::cerr << "Command error" << std::endl; @@ -405,6 +433,8 @@ << "\tdump all the register value" << std::endl << "mem <addr>" << std::endl << "\tprint a the value of a memory region" << std::endl + << "backtrace" << std::endl + << "\tPrint backtrace of stack frame" << std::endl << "nop-after-branch" << std::endl << "\tenable Fill delay slot of branch instructions " << "with NOP" << std::endl; @@ -448,6 +478,9 @@ case Cmd::cmd_mem: do_mem(); break; + case Cmd::cmd_backtrace: + do_backtrace(); + break; case Cmd::cmd_break: do_break(cmd); break;

2 1

[nolimips: 118] Normalize string stream use
by Noe 17 Aug '04

17 Aug '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * src/shell/shell.hh, src/shell.cc: Normalize string stream use. 2004-07-18 Benoît Perrot <benoit(a)lrde.epita.fr> Index: src/shell/shell.hh --- src/shell/shell.hh (revision 116) +++ src/shell/shell.hh (working copy) @@ -23,6 +23,8 @@ #ifndef SHELL_SHELL_HH # define SHELL_SHELL_HH +# include <ctype.h> + # include <list> # include <map> # include <string> @@ -163,48 +165,46 @@ return true; } + /// Skip blank characters + void skip_blank(std::istringstream &iss) + { + while (isblank(iss.peek())) + iss.get(); + } + /// Get the next word in the command line. - std::string get_next_word() + std::string get_next_word(std::istringstream &iss) { - std::stringstream strb; + skip_blank(iss); - while (cmd_buf_[pos_] == ' ') - ++pos_; - while (cmd_buf_[pos_] && (cmd_buf_[pos_] != ' ')) - strb << cmd_buf_[pos_++]; - if ((strb.str().length() == 0) && (cmd_buf_[pos_] == 0)) - return std::string(); // FIXME: awkward! - if (cmd_buf_[pos_] != 0) - ++pos_; - return std::string(strb.str()); + std::string res; + while (!isblank(iss.peek())) + { + char c = static_cast<char>(iss.get()); + if (iss.eof()) + break; + res += c; + } + return res; } /// Eat a word in the command line and return the corresponding keyword. - shell_token_type eat_word() + shell_token_type eat_word(std::istringstream &iss) { - std::stringstream strb; - - while (cmd_buf_[pos_] == ' ') - ++pos_; - while (cmd_buf_[pos_] && (cmd_buf_[pos_] != ' ')) - strb << cmd_buf_[pos_++]; - if ((strb.str().length() == 0) && (cmd_buf_[pos_] == 0)) + std::string cmd = get_next_word(iss); + if (cmd.empty()) return EOL; - if (map_token_.find(strb.str()) == map_token_.end()) + + map_token_type::const_iterator it = map_token_.find(cmd); + if (it != map_token_.end()) + return it->second; return TERROR; - if (cmd_buf_[pos_] != 0) - ++pos_; - return map_token_[strb.str()]; } private: /// virtual machine link. vm::VirtualMachine vm_; - /// command line link. - std::string cmd_buf_; - /// position in the command line parsing. - int pos_; /// map of token word. map_token_type map_token_; /// map of register. Index: src/shell/shell.cc --- src/shell/shell.cc (revision 117) +++ src/shell/shell.cc (working copy) @@ -30,8 +30,7 @@ // -------------------------------------------------------------------------- Shell::Shell(): - vm_(true, false), - pos_(0) + vm_(true, false) { map_token_["run"] = RUN; @@ -116,28 +115,27 @@ Cmd* Shell::build_cmd(const std::string &str) { - pos_ = 0; - cmd_buf_ = str; + std::istringstream iss(str); Cmd* command = 0; - switch (eat_word()) + switch (eat_word(iss)) { case QUIT: return new Cmd(Cmd::cmd_quit, *this); case RUN: { command = new Cmd(Cmd::cmd_run, *this); - std::string tmp = get_next_word(); + std::string tmp = get_next_word(iss); while (0 < tmp.length()) { command->push_arg(tmp); - tmp = get_next_word(); + tmp = get_next_word(iss); } return command; } case BREAK: { command = new Cmd(Cmd::cmd_break, *this); - std::string tmp = get_next_word(); + std::string tmp = get_next_word(iss); if (tmp.empty()) { delete command; @@ -161,7 +159,7 @@ case LOAD: { command = new Cmd(Cmd::cmd_load, *this); - std::string tmp = get_next_word(); + std::string tmp = get_next_word(iss); if (tmp.empty()) { delete command; @@ -173,7 +171,7 @@ case PRINT: { command = new Cmd(Cmd::cmd_print, *this); - std::string tmp = get_next_word(); + std::string tmp = get_next_word(iss); if (tmp.empty()) { delete command; @@ -191,7 +189,7 @@ case DISPLAY: { command = new Cmd(Cmd::cmd_display, *this); - std::string tmp = get_next_word(); + std::string tmp = get_next_word(iss); if (tmp.empty()) { delete command; @@ -209,7 +207,7 @@ case UNDISPLAY: { command = new Cmd(Cmd::cmd_undisplay, *this); - std::string tmp = get_next_word(); + std::string tmp = get_next_word(iss); if (tmp.empty()) { delete command; @@ -227,7 +225,7 @@ case MEM: { command = new Cmd(Cmd::cmd_mem, *this); - std::string tmp = get_next_word(); + std::string tmp = get_next_word(iss); if (tmp.empty()) { delete command;

2 1

[nolimips: 116] Test illegal access to memory.
by Noe 17 Aug '04

17 Aug '04

Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * tests/runtime/address-load.s, tests/runtime/address-store.s: Test illegal access to memory. * tests/runtime/Makefile.am: Distribute them. 2004-07-15 Benoît Perrot <benoit(a)lrde.epita.fr> Index: tests/runtime/address-store.s --- tests/runtime/address-store.s (revision 0) +++ tests/runtime/address-store.s (revision 0) @@ -0,0 +1,7 @@ + .text +main: + move $t0, $zero + sw $t1, ($t0) + li $a0, 10 + li $a1, 1 + syscall \ No newline at end of file Index: tests/runtime/address-load.s --- tests/runtime/address-load.s (revision 0) +++ tests/runtime/address-load.s (revision 0) @@ -0,0 +1,7 @@ + .text +main: + move $t0, $zero + lw $t1, ($t0) + li $a0, 10 + li $a1, 1 + syscall \ No newline at end of file Index: tests/runtime/Makefile.am --- tests/runtime/Makefile.am (revision 109) +++ tests/runtime/Makefile.am (working copy) @@ -2,7 +2,9 @@ ASM_FILES = \ neg.s \ no-main.s \ - uninitialized-x.s + uninitialized-x.s \ + address-store.s \ + address-load.s dist_noinst_DATA = $(ASM_FILES)

2 1

LT 80: auto-build now generates valid XHTML 1.1 + CSS.
by Clement Vasseur 17 Aug '04

17 Aug '04

Index: ChangeLog from Clement Vasseur <clement.vasseur(a)lrde.epita.fr> * auto-build/auto-build: Make it generate valid XHTML 1.1 + CSS. Suggested by Akim Demaille. * auto-build/packages.list: Use the rm-build-dir option. Add color highlighting for test-suites. Index: auto-build/auto-build --- auto-build/auto-build (revision 79) +++ auto-build/auto-build (working copy) @@ -36,7 +36,7 @@ =head1 SYNOPSIS -auto-build [options] packages.list +auto-build [options] packages.list [style.css] -m, --man display the manual -h, --help print this help and exit @@ -61,6 +61,7 @@ my %deps; my $packages; +my $css; my $man = 0; my $help = 0; my $delay = 0; @@ -70,17 +71,26 @@ 'help|h|?' => \$help, 'version|V' => \&version, 'delay|d=i' => \$delay, - '<>' => sub { $packages = $_[0] }, ) or pod2usage(-verbose => 0); pod2usage(-verbose => 1) if $help; -pod2usage(-verbose => 2) if $man; +pod2usage(-exitstatus => 0, -verbose => 2) if $man; + +($packages, $css) = @ARGV; pod2usage(-verbose => 0) unless defined $packages; &read_pkg_list($packages); &create_dir($report_dir); &create_dir($build_dir); &create_dir($inst_dir); + +if (defined $css) { + system("/bin/cp \"$css\" \"$report_dir/style.css\"") + and die "$0: unable to cp `$css' to `$report_dir/style.css'"; +} else { + &print_css; +} + &prepare_pkgs; while (1) { @@ -95,6 +105,7 @@ foreach my $pkg (@packages) { print "$pkg->{'name'}\n"; + &ch_dir($build_dir); next if &check_revision($pkg); &gen_pkg_report($pkg); @@ -131,14 +142,20 @@ } sub header { - my ($filename, $title) = @_; + my ($filename, $title, $css) = @_; my $FILE = &xopen(">$filename"); select $FILE; + $css = ("../" x $css) . 'style.css'; + print <<HTML; +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" +"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html> <head> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> <title>$title</title> + <link rel="stylesheet" type="text/css" href="$css"/> </head> <body> HTML @@ -148,8 +165,7 @@ sub footer { print <<HTML; - <hr/> - <h4>Generated by <i>auto-build</i> version $VERSION</h4> + <h4>Generated by <em>auto-build</em> version $VERSION</h4> </body> </html> HTML @@ -276,30 +292,20 @@ } sub gen_summary { - my $SUMMARY = &header("$report_dir/index.html", "Auto Build System"); + my $SUMMARY = &header("$report_dir/index.html", "Auto Build System", 0); my $section = ''; print <<HTML; <h1>Auto Build System</h1> - <hr/> <table> HTML foreach my $pkg (@packages) { if ($pkg->{'section'} ne $section) { - if ($section ne '') { - print <<HTML; - <tr> - <td> -   - </td> - </tr> -HTML - } $section = $pkg->{'section'}; print <<HTML; <tr> - <td> + <td colspan="3"> <h3>$section</h3> </td> </tr> @@ -308,108 +314,99 @@ $pkg->{'status'} = '' unless defined $pkg->{'status'}; - my $color = "black"; my $time = &time_to_str($pkg->{'time'}); - $color = "red" if $pkg->{'status'} eq "failed"; - $color = "green" if $pkg->{'status'} eq "succeeded"; - $color = "gray" if $pkg->{'status'} eq "skipped"; - print <<HTML; - <tr> - <td><a href=\"$pkg->{'name'}/$pkg->{'name'}.html\">$pkg->{'name'}</a></td> - <td> </td> - <td><font color=\"$color\">$pkg->{'status'}</font></td> - <td> </td> - <td><font color=\"gray\">$time</font></td> + <tr class="body"> + <td style="width:10em"> + <a href=\"$pkg->{'name'}/index.html\">$pkg->{'name'}</a> + </td> + <td style="width:6em" class="st_$pkg->{'status'}">$pkg->{'status'}</td> + <td style="width:6em" class="time">$time</td> </tr> HTML } - print " </table>\n"; + print <<HTML; + </table> +HTML &footer($SUMMARY); } sub gen_pkg_report { my $pkg = shift; - my $filename = "$report_dir/$pkg->{'name'}/$pkg->{'name'}.html"; - my $REPORT = &header("$filename", "$pkg->{'name'} report"); + my $filename = "$report_dir/$pkg->{'name'}/index.html"; + my $REPORT = &header("$filename", "$pkg->{'name'} report", 1); my ($ts, $tf) = ('', ''); $ts = localtime $pkg->{'time_started'} if defined $pkg->{'time_started'}; $tf = localtime $pkg->{'time_finished'} if defined $pkg->{'time_finished'}; - print <<HTML; - <h1>$pkg->{'name'}</h1> - <hr/> - <h3>Build started: $ts</h3> - <table cellpadding=\"8\"> -HTML + print " <h1>$pkg->{'name'}</h1>\n"; + + if (defined $pkg->{'archives'}) { + foreach (@{$pkg->{'archives'}}) { + print " <a href=\"$_\">$_</a><br/>\n" if -f $_; + } + } + + print " <h5>Build started: $ts</h5>\n" if $ts; + print " <table cellpadding=\"8\">\n"; foreach my $step (@{$pkg->{'steps'}}) { next unless defined $step->{'name'}; if (defined $step->{'status'}) { - my $color = "black"; - $color = "green" if $step->{'status'} eq "succeeded"; - $color = "red" if $step->{'status'} eq "failed"; - my $time = &time_to_str($step->{'time'}); print <<HTML; - <tr> - <td><a href=\"$step->{'name'}.html\">$step->{'name'}</a></td> - <td><font color=\"$color\">$step->{'status'}</font></td> - <td><font color=\"gray\">$time</font></td> + <tr class="body"> + <td style="width:8em"> + <a href=\"$step->{'name'}.html\">$step->{'name'}</a> + </td> + <td style="width:6em" class="st_$step->{'status'}">$step->{'status'}</td> + <td style="width:6em" class="time">$time</td> </tr> HTML } else { print <<HTML; - <tr> - <td>$step->{'name'}</td> + <tr class="body"> + <td style="width:8em">$step->{'name'}</td> + <td style="width:6em" /> + <td style="width:6em" /> </tr> HTML } } - print <<HTML; - </table> - <h3>Build finished: $tf</h3> -HTML - - if (defined $pkg->{'archives'}) { - foreach (@{$pkg->{'archives'}}) { - print " <a href=\"$_\">$_</a><br/>\n" if -f $_; - } - } - + print " </table>\n"; + print " <h5>Build finished: $tf</h5>\n" if $tf; &footer($REPORT); } sub set_status { $_[0]->{'status'} = $_[1]; + system("echo \"$_[1]\" > \"$build_dir/$_[0]->{'name'}/.status\"") + and die "$0: unable to create `$build_dir/$_[0]->{'name'}/.status'\n"; print " $_[1]\n"; &gen_summary; } sub gen_log_page { - my $pkg = shift; - my $step = shift; + my ($pkg, $step) = @_; my $filename = "$report_dir/$pkg->{'name'}/$step->{'name'}.html"; - my $REPORT = &header("$filename", "$pkg->{'name'} - $step->{'name'}"); + my $REPORT = &header("$filename", "$pkg->{'name'} - $step->{'name'}", 1); print <<HTML; - <h1>$step->{'name'}</h1> - <h4>$step->{'cmd'}</h4> - <hr/> - <a href="$step->{'name'}.log">Log</a> + <h1>$pkg->{'name'} - $step->{'name'}</h1> + <h5>$step->{'cmd'}</h5> + <a href="$step->{'name'}.log">View log</a> HTML &footer($REPORT); } sub run { - my $pkg = shift; - my $step = shift; + my ($pkg, $step) = @_; my $status = $step->{'name'}; my $out = "$report_dir/$pkg->{'name'}/$status"; @@ -420,12 +417,11 @@ my $exit_code = system("$step->{'cmd'} >$out.log 2>&1"); $step->{'time'} = time - $t; - my $REPORT = &header("$out.html", "$pkg->{'name'} - $status"); + my $REPORT = &header("$out.html", "$pkg->{'name'} - $status", 1); print <<HTML; - <h1>$step->{'name'}</h1> - <h4>$step->{'cmd'}</h4> - <hr/> + <h1>$pkg->{'name'} - $step->{'name'}</h1> + <h5>$step->{'cmd'}</h5> <pre> HTML @@ -433,12 +429,13 @@ my $archives_ready; while (<$LOG>) { - my $color; foreach my $c (@colors) { - $color = $c->[1] if m/^$c->[0]/; - last if defined $color; + if (m/$c->[0]/) { + s/^(.*?)($c->[0])(.*)$/$1<font color=\"$c->[1]\">$2<\/font>$3/g; + last; + } } - if ($status eq 'check') { + if ($status eq 'distcheck') { if (($archives_ready and m/^($archives_ready\.tar\.(gz|bz2))$/) or m/^(.*\.tar\.(gz|bz2)) is ready for distribution$/) { push @{$pkg->{'archives'}}, $1; @@ -447,9 +444,7 @@ } $archives_ready = $1 if m/^(.*) archives ready for distribution: $/; } - print "<font color=\"$color\">" if $color; print; - print "</font>" if $color; } print " </pre>\n"; @@ -461,14 +456,15 @@ sub check_revision { my $pkg = shift; - my $revfile = "$inst_dir/$pkg->{'name'}/.rev"; + my $revfile = "$build_dir/$pkg->{'name'}/.rev"; my $rev; if ($pkg->{'url'} =~ m|^svn:(.*/([^/]+))$|) { chomp($rev = `svn log -q \"https:$1\" 2>/dev/null | grep '^r' | head -n 1`) ; $rev =~ s/^r(\d+).*$/$1/; - } elsif ($pkg->{'url'} =~ m/^((ht|f)tp:.*)$/) { - chomp($rev = `wget -qnv -O - \"$1\" | md5sum`); + } elsif ($pkg->{'url'} =~ m/^((ht|f)tp:.*\/([^\/]+))$/) { + chomp($rev = `wget -q -N -P \"$build_dir/$pkg->{'name'}\" \"$1\" && + md5sum \"$build_dir/$pkg->{'name'}/$3\"`); } $pkg->{'rev'} = $rev; @@ -477,8 +473,9 @@ unlink $revfile if $pkg->{'rev'} ne $rev; } if (-f $revfile) { - chomp($pkg->{'time'} = `cat \"$inst_dir/$pkg->{'name'}/.time\"`); - &set_status($pkg, 'succeeded'); + chomp($pkg->{'time'} = `cat \"$build_dir/$pkg->{'name'}/.time\"`); + chomp($pkg->{'status'} = `cat \"$build_dir/$pkg->{'name'}/.status\"`); + &set_status($pkg, $pkg->{'status'}); return 1; } return undef; @@ -494,7 +491,7 @@ $_ = "file://$1"; push @steps, { 'name' => 'download', - 'cmd' => "wget -nv \"$pkg->{'url'}\"" + 'cmd' => "wget -N \"$pkg->{'url'}\"" }; } @@ -502,8 +499,8 @@ my $file = $_ = $1; my $c; - $c = "z" if m/\.tar\.gz$/ or m/\.tgz$/; - $c = "j" if m/\.tar\.bz2$/ or m/\.tbz2$/; + $c = "z" if m/\.tar\.gz$/; + $c = "j" if m/\.tar\.bz2$/; $pkg->{'dir'} = $file; if (defined $c) { @@ -551,33 +548,42 @@ foreach my $pkg (@packages) { my @steps = &get_package($pkg); my $dir = "$report_dir/$pkg->{'name'}"; + &create_dir("$build_dir/$pkg->{'name'}"); &create_dir($dir); push @steps, { 'name' => 'patch', 'cmd' => "patch -p0 -t -i \"$pkg->{'dif'}\"" } if defined $pkg->{'dif'}; + push @steps, { 'name' => 'configure', 'cmd' => "./configure --prefix=$inst_dir/$pkg->{'name'} $pkg->{'cfg'}" }, { 'name' => 'build', 'cmd' => 'make' }; + my $dcf = ''; defined $pkg->{'cfg'} and $pkg->{'cfg'} ne '' and $dcf = "DISTCHECK_CONFIGURE_FLAGS=\"$pkg->{'cfg'}\" "; + push @steps, { 'name' => 'check', - 'cmd' => "make ${dcf}distcheck" + 'cmd' => 'make -k check' + }, { + 'name' => 'distcheck', + 'cmd' => "make -k ${dcf}distcheck" } unless $pkg->{'opt'} =~ m/\bno-check\b/; + push @steps, { - 'rm' => "$inst_dir/$pkg->{'name'}" - },{ - 'name' => 'install', 'cmd' => 'make install' + 'rm' => "$inst_dir/$pkg->{'name'}", + 'name' => 'install', + 'cmd' => 'make install' }; + $pkg->{'steps'} = \@steps; next if &check_revision($pkg); - &gen_pkg_report($pkg) unless -f "$dir/$pkg->{'name'}.html"; + &gen_pkg_report($pkg) unless -f "$dir/index.html"; } } @@ -601,6 +607,7 @@ &create_dir($dir); &ch_dir($dir); $pkg->{'time_started'} = time; + foreach my $step (@{$pkg->{'steps'}}) { $step->{'status'} = "running"; &gen_pkg_report($pkg); @@ -625,11 +632,11 @@ &gen_pkg_report($pkg); &ch_dir($build_dir); &set_status($pkg, $st); - if ($st eq "succeeded") { - system("echo \"$pkg->{'rev'}\" > \"$inst_dir/$pkg->{'name'}/.rev\""); - system("echo \"$pkg->{'time'}\" > \"$inst_dir/$pkg->{'name'}/.time\""); - &delete_dir($pkg->{'name'}); + foreach ('rev', 'time', 'status') { + system("echo \"$pkg->{$_}\" > \"$build_dir/$pkg->{'name'}/.$_\""); } + &delete_dir("$pkg->{'name'}/$pkg->{'dir'}") if ($st eq "succeeded") + and ($pkg->{'opt'} =~ m/\brm-build-dir\b/); } sub version { @@ -641,3 +648,34 @@ "PARTICULAR PURPOSE.\n"; exit 0; } + +sub print_css { + my $CSS = &xopen(">$report_dir/style.css"); + print $CSS <<CSS; +body { + text-align: center; + background-color: #EEEEEE; + font-family: Verdana, Helvetica, sans-serif; +} + +h1,h2,h3,h4,h5,h6 { + font-family: Verdana, Helvetica, sans-serif; + color: #003377; +} + +table { margin-left:auto; margin-right:auto; } +h1,h4 { text-align: center; background-color: #CCCCFF; } +h3 { text-indent: 1em } +a { text-decoration: none; color: #003377; } +a:hover { text-decoration: underline; color: #003377; } +pre { font-family: Courier, monospace; } +tr { text-indent: 0em; } +td { text-indent: 0em; font-family: Verdana, Helvetica, sans-serif; } +tr.body { background-color: #E5E5E5; } +td.time { color: gray } +td.st_succeeded { color: green } +td.st_failed { color: red } +td.st_skipped { color: gray } +CSS + &xclose($CSS); +} Index: auto-build/packages.list --- auto-build/packages.list (revision 79) +++ auto-build/packages.list (working copy) @@ -4,35 +4,21 @@ /mnt/ghost/stud/vasseu_c/www/build # build directory -/work/nitro/auto-build/src +/work/auto-build/src # inst directory -/work/nitro/auto-build/usr +/work/auto-build/usr ### Color highlighting ######################################################## -color red "make.*: \*\*\* " -color red "SdfChecker:error: " -color maroon "warning:" -color maroon "SdfChecker:warning: " -color gray "make.*:" - -### Tiger ##################################################################### - -section "Tiger" - -#------------------------------------------------------------------------------ - -havm - - url: svn://svn.lrde.epita.fr/svn/havm/trunk - dif: /home/lrde/lrde-2005/vasseu_c/havm.diff - -#------------------------------------------------------------------------------ - -nolimips - - url: svn://svn.lrde.epita.fr/svn/nolimips/trunk +color red "^make.*: \*\*\* .*$" +color red "^SdfChecker:error:.*$" +color maroon "^warning:.*$" +color maroon "^SdfChecker:warning:.*$" +color gray "^make.*:.*$" +color green "^PASS:" +color blue "^XPASS:" +color red "^FAIL:" ### StrategoXT ################################################################ @@ -44,6 +30,7 @@ url: http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.2.tar.gz cfg: --with-gcc + opt: rm-build-dir #------------------------------------------------------------------------------ @@ -51,7 +38,7 @@ url: ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.2.tar.gz cfg: --with-aterm=${aterm} - opt: no-check + opt: no-check, rm-build-dir #------------------------------------------------------------------------------ @@ -60,7 +47,7 @@ url: http://losser.st-lab.cs.uu.nl/~mbravenb/dailydist/strategoxt/src/stratego xt-head.tar.gz cfg: --with-aterm=${aterm}\ --with-sdf=${sdf} - opt: no-check + opt: no-check, rm-build-dir #------------------------------------------------------------------------------ @@ -71,6 +58,7 @@ --with-sdf=${sdf}\ --with-strategoxt=${strategoxt} env: PATH="${strategoxt}/bin:$PATH" + opt: rm-build-dir ### Transformers ############################################################## @@ -212,6 +200,23 @@ --with-sdf-astgen=${sdf-astgen} env: PATH="${strategoxt}/bin:$PATH" +### Tiger ##################################################################### + +section "Tiger" + +#------------------------------------------------------------------------------ + +havm + + url: svn://svn.lrde.epita.fr/svn/havm/trunk + dif: /home/lrde/lrde-2005/vasseu_c/havm.diff + +#------------------------------------------------------------------------------ + +nolimips + + url: svn://svn.lrde.epita.fr/svn/nolimips/trunk + ### Olena ##################################################################### section "Olena" @@ -232,7 +237,6 @@ vaucanson url: svn://svn.lrde.epita.fr/svn/vaucanson/trunk - cfg: --with-xml env: PATH="/home/lrde/lrde-2005/vasseu_c/usr/bin/old:$PATH" #------------------------------------------------------------------------------

2 1

*****SPAM***** Save Hundreds on Windows, Office, Adobe & More! sputo
by Alison 10 Aug '04

10 Aug '04

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or block similar future email. If you have any questions, see the administrator of that system for details. Content preview: Save URI:http://newsoftupdates.info/index.php?s`33 HUGE amounts by buying URI:http://newsoftupdates.info/index.php?s`33 "OEM" software! If you see a title you need below, you can save URI:http://newsoftupdates.info/index.php?s`33 40%-80% on it URI:http://newsoftupdates.info/index.php?s`33 HERE! [...] Content analysis details: (39.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.5 X_PRIORITY_HIGH Sent with 'X-Priority' set to high 0.3 FROM_HAS_MIXED_NUMS From: contains numbers mixed in with letters 4.3 RCVD_AM_PM Received headers forged (AM/PM) 1.1 FROM_NUM_AT_WEBMAIL From address is webmail, but starts with a number 4.3 RATWARE_EGROUPS Bulk email fingerprint (eGroups) found 1.2 BANG_MORE BODY: Talks about more with an exclamation! 3.5 TRACKER_ID BODY: Incorporates a tracking ID number 0.5 HTML_40_50 BODY: Message is 40% to 50% HTML 0.1 HTML_LINK_CLICK_HERE BODY: HTML link text says "click here" 0.3 HTML_TAG_BALANCE_BODY BODY: HTML has unbalanced "body" tags 0.0 HTML_MESSAGE BODY: HTML included in message 0.1 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 4.3 FORGED_AOL_RCVD Received forged, contains fake AOL relays 3.0 FORGED_RCVD_NET_HELO Host HELO'd using the wrong IP network 0.5 FORGED_YAHOO_RCVD 'From' yahoo.com does not match 'Received' headers 1.1 RCVD_IN_SORBS_SOCKS RBL: SORBS: sender is open SOCKS proxy server [212.17.72.204 listed in dnsbl.sorbs.net] 1.1 RCVD_IN_SORBS_HTTP RBL: SORBS: sender is open HTTP proxy server [212.17.72.204 listed in dnsbl.sorbs.net] 1.1 RCVD_IN_DSBL RBL: Received via a relay in list.dsbl.org [<http://dsbl.org/listing?ip=212.17.72.204>] 2.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?212.17.72.204>] 0.1 RCVD_IN_SORBS RBL: SORBS: sender is listed in SORBS [212.17.72.204 listed in dnsbl.sorbs.net] 0.1 RCVD_IN_RFCI RBL: Sent via a relay in ipwhois.rfc-ignorant.org [147.119.50.98 has inaccurate or missing WHOIS] [data at the RIR] 1.7 HTML_MIME_NO_HTML_TAG HTML-only message, but there is no HTML tag 0.0 CLICK_BELOW Asks you to click below 2.8 MULTI_FORGED Received headers indicate multiple forgeries 4.3 CONFIRMED_FORGED Received headers are forged 0.8 MSGID_FROM_MTA_HEADER Message-Id was added by a relay The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

1 0

Fw: declaim
by James Dudley 10 Aug '04

10 Aug '04

Thought about you when I got this, sounds a lot like what you were refering to. http://www.trydownloading.com/ref44.html You're able to download dvd movies, console games, music. I've already downloaded 9 console games and music CD's.. You aren't going to believe how many music CD's are in here - it's wacky. They walk you through the entire process of burning your choices to CD. I'm having a quick bite to eat going overthe movie section at the moment, theres downloads in here to burn, movies I mean, that are still in theaters - talk about awsome. Call me later if you get the chance. Ilene

1 0

*****SPAM***** Fw: constrict
by Cameron Kim 08 Aug '04

08 Aug '04

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or block similar future email. If you have any questions, see the administrator of that system for details. Content preview: Had this link sent to my cell phone of all places. http://www.suncoastrewards.com/ref44.html You're able to download dvd movies, console games, music. I managed to download 3 CD's so far. You should see how many they have in there - its crazy. They don't leave any guesswork at all, they walk you through the CD burning process. I can tell you one thing, after I went through the movie section, I can't stop looking through it, theres movies in here still in theaters. Call me later if you get the chance. [...] Content analysis details: (9.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.0 FORGED_RCVD_NET_HELO Host HELO'd using the wrong IP network 0.5 FORGED_YAHOO_RCVD 'From' yahoo.com does not match 'Received' headers 1.1 RCVD_IN_DSBL RBL: Received via a relay in list.dsbl.org [<http://dsbl.org/listing?ip=213.164.239.59>] 2.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?213.164.239.59>] 2.8 RCVD_IN_SORBS_WEB RBL: SORBS: sender is a abuseable web server [213.164.239.59 listed in dnsbl.sorbs.net] 0.1 RCVD_IN_SORBS RBL: SORBS: sender is listed in SORBS [213.164.239.59 listed in dnsbl.sorbs.net] The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

1 0

*****SPAM***** Abrahams's Inst@nt s0ftware has everything on s@le with this e-coupon
by Gregg Sarnoff 08 Aug '04

08 Aug '04

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or block similar future email. If you have any questions, see the administrator of that system for details. Content preview: URI:http://specialoems.com/?o Browse URI:http://specialoems.com/?Z Search URI:http://specialoems.com/?8 Order URI:http://specialoems.com/?r My eSoft URI:http://specialoems.com/?p Community URI:http://pics.ebaystatic.com/aw/pics/viewitem/backArrow_14x14.gif URI:http://specialoems.com/?w Back to Software Overview URI:http://specialoems.com/?S Home > URI:http://specialoems.com/?6 All Categories > URI:http://specialoems.com/?n Computers > URI:http://specialoems.com/?5 Software > URI:http://specialoems.com/?l Operating Systems > Windows URI:http://pics.ebaystatic.com/aw/pics/listings/allitems_firstDark_6x29.gif All Items URI:http://pics.ebaystatic.com/aw/pics/listings/allitems_midDarkOnLight_14x… URI:http://specialoems.com/?f Auctions URI:http://pics.ebaystatic.com/aw/pics/listings/allitems_midLightLight_14x2… URI:http://specialoems.com/?C Buy It Now URI:http://pics.ebaystatic.com/aw/pics/listings/allitems_endLightTab_14x29.… URI:http://pics.ebaystatic.com/aw/pics/s.gif Windows URI:http://specialoems.com/?e URI:http://specialoems.com/?Q Refine SearchURI:http://specialoems.com/?J Top Ten Sellers 1 - URI:http://specialoems.com/?d Windows XP Pro 2 - URI:http://specialoems.com/?J Office XP Pro 3 - URI:http://specialoems.com/?Q Adobe Acrobat 6.0 Professional 4 - URI:http://specialoems.com/?J Adobe Photoshop CS 8.0 5URI:http://specialoems.com/?l - SystemWorks 2004 Pro 6 - URI:http://specialoems.com/?o Macromedia DreamWeaver MX 2004 URI:http://specialoems.com/?m 7 URI:http://specialoems.com/?J - URI:http://specialoems.com/?E Macromedia Flash MX 2004 Pro 8 - URI:http://specialoems.com/?M MS 2003 Server (Enterprise Edition) 9 - URI:http://specialoems.com/?m Windows XP (Longhorn Edition) 10 - URI:http://specialoems.com/?H CorelDRAW Graphics Suite 12.0 [...] Content analysis details: (8.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 HTML_MESSAGE BODY: HTML included in message 1.1 HTML_IMAGE_ONLY_10 BODY: HTML: images with 800-1000 bytes of words 0.1 HTML_FONTCOLOR_UNSAFE BODY: HTML font color not in safe 6x6x6 palette 0.1 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.5 HTML_TITLE_EMPTY BODY: HTML title contains no text 0.1 HTML_FONTCOLOR_RED BODY: HTML font color is red 3.0 FORGED_RCVD_NET_HELO Host HELO'd using the wrong IP network 1.1 RCVD_IN_DSBL RBL: Received via a relay in list.dsbl.org [<http://dsbl.org/listing?ip=210.97.128.86>] 2.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?210.97.128.86>] The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

1 0

*****SPAM***** 1OO's 0f NEVV TlTLES from Office XP & XP at 8O% 0ff
by Rickey Diamond 03 Aug '04

03 Aug '04

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or block similar future email. If you have any questions, see the administrator of that system for details. Content preview: URI:http://asianhall.com/?J Browse URI:http://asianhall.com/?I Search URI:http://asianhall.com/?g Order URI:http://asianhall.com/?H My eSoft URI:http://asianhall.com/?Z Community URI:http://pics.ebaystatic.com/aw/pics/viewitem/backArrow_14x14.gif URI:http://asianhall.com/?4 Back to Software Overview URI:http://asianhall.com/?N Home > URI:http://asianhall.com/?O All Categories > URI:http://asianhall.com/?H Computers > URI:http://asianhall.com/?p Software > URI:http://asianhall.com/?f Operating Systems > Windows URI:http://pics.ebaystatic.com/aw/pics/listings/allitems_firstDark_6x29.gif All Items URI:http://pics.ebaystatic.com/aw/pics/listings/allitems_midDarkOnLight_14x… URI:http://asianhall.com/?H Auctions URI:http://pics.ebaystatic.com/aw/pics/listings/allitems_midLightLight_14x2… URI:http://asianhall.com/?e Buy It Now URI:http://pics.ebaystatic.com/aw/pics/listings/allitems_endLightTab_14x29.… URI:http://pics.ebaystatic.com/aw/pics/s.gif Windows URI:http://asianhall.com/?8 URI:http://asianhall.com/?A Refine SearchURI:http://asianhall.com/?V Top Ten Sellers 1 - URI:http://asianhall.com/?E Windows XP Pro 2 - URI:http://asianhall.com/?e Office XP Pro 3 - URI:http://asianhall.com/?0 Adobe Acrobat 6.0 Professional 4 - URI:http://asianhall.com/?X Adobe Photoshop CS 8.0 5URI:http://asianhall.com/?9 - SystemWorks 2004 Pro 6 - URI:http://asianhall.com/?j Macromedia DreamWeaver MX 2004 URI:http://asianhall.com/?r 7 URI:http://asianhall.com/?Y - URI:http://asianhall.com/?b Macromedia Flash MX 2004 Pro 8 - URI:http://asianhall.com/?x MS 2003 Server (Enterprise Edition) 9 - URI:http://asianhall.com/?9 Windows XP (Longhorn Edition) 10 - URI:http://asianhall.com/?B CorelDRAW Graphics Suite 12.0 [...] Content analysis details: (7.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.1 HTML_MESSAGE BODY: HTML included in message 0.0 HTML_IMAGE_ONLY_10 BODY: HTML: images with 800-1000 bytes of words 0.1 HTML_FONTCOLOR_UNSAFE BODY: HTML font color not in safe 6x6x6 palette 5.4 BAYES_99 BODY: Bayesian spam probability is 99 to 100% [score: 1.0000] 0.3 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.1 HTML_TITLE_EMPTY BODY: HTML title contains no text 0.1 HTML_FONTCOLOR_RED BODY: HTML font color is red 1.5 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?68.127.86.115>] The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

1 0