LT 82: Improve the CSS for auto-build.

19 Jul 2004

Index: ChangeLog
from  Clement Vasseur  <clement.vasseur@lrde.epita.fr>

	* auto-build/auto-build: Improve the CSS for Mozilla/Firefox.
	Add a `cpu' config to use the -j option of make.
	* auto-build/packages.list: Adjust.


Index: auto-build/auto-build

--- auto-build/auto-build	(revision 81)
+++ auto-build/auto-build	(working copy)
@@ -231,7 +231,7 @@
       my $value = $2;
 
       my $err = 1;
-      foreach ('url', 'cfg', 'opt', 'env', 'dif') {
+      foreach ('url', 'cfg', 'opt', 'env', 'dif', 'cpu') {
         if ($field eq $_) {
           $err = 0;
           last;
@@ -318,11 +318,11 @@
 
     print <<HTML;
     <tr class="body">
-     <td style="width:10em">
+     <td class="left" 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>
+     <td style="width:7em" class="st_$pkg->{'status'}">$pkg->{'status'}</td>
+     <td style="width:7em" class="time">$time</td>
     </tr>
 HTML
   }
@@ -360,17 +360,17 @@
 
       print <<HTML;
    <tr class="body">
-    <td style="width:8em">
+    <td class="left" 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>
+    <td style="width:7em" class="st_$step->{'status'}">$step->{'status'}</td>
+    <td style="width:7em" class="time">$time</td>
    </tr>
 HTML
     } else {
       print <<HTML;
    <tr class="body">
-    <td style="width:8em">$step->{'name'}</td>
+    <td class="left" style="width:8em">$step->{'name'}</td>
     <td style="width:6em" />
     <td style="width:6em" />
    </tr>
@@ -429,9 +429,11 @@
   my $archives_ready;
 
   while (<$LOG>) {
+    s/\</\</g;
+    s/\>/\>/g;
     foreach my $c (@colors) {
       if (m/$c->[0]/) {
-	s/^(.*?)($c->[0])(.*)$/$1<font color=\"$c->[1]\">$2<\/font>$3/g;
+	s/^(.*?)($c->[0])(.*)$/$1<span style=\"color:$c->[1]\">$2<\/span>$3/g;
 	last;
       }
     }
@@ -467,6 +469,7 @@
                   md5sum \"$build_dir/$pkg->{'name'}/$3\"`);
   }
   $pkg->{'rev'} = $rev;
+  $pkg->{'rev'} = '0' unless defined $pkg->{'rev'};
 
   if (-f $revfile) {
     chomp($rev = `cat \"$revfile\"`);
@@ -564,16 +567,30 @@
     &create_dir("$build_dir/$pkg->{'name'}");
     &create_dir($dir);
 
+    if (defined $pkg->{'dif'}) {
+      my $bootstrap;
+      $bootstrap = pop @steps if $steps[-1]->{'name'} eq 'bootstrap';
     push @steps, {
       'name' => 'patch',
       'cmd' => "patch -p0 -t -i \"$pkg->{'dif'}\""
-    } if defined $pkg->{'dif'};
+      };
+      if (defined $bootstrap) {
+	if (defined $bootstrap->{'dir'}) {
+	  $steps[-1]->{'dir'} = $bootstrap->{'dir'};
+	  undef $bootstrap->{'dir'};
+	}
+	push @steps, $bootstrap;
+      }
+    }
+
+    my $cpu = '';
+    $cpu = " -j $pkg->{'cpu'}" if defined $pkg->{'cpu'};
 
     push @steps, {
       'name' => 'configure',
       'cmd' => "./configure --prefix=$inst_dir/$pkg->{'name'} $pkg->{'cfg'}"
     }, {
-      'name' => 'build', 'cmd' => 'make'
+      'name' => 'build', 'cmd' => "make$cpu"
     };
 
     my $dcf = '';
@@ -582,10 +599,10 @@
 
     push @steps, {
       'name' => 'check',
-      'cmd' => 'make -k check'
+      'cmd' => "make$cpu -k check"
     }, {
       'name' => 'distcheck',
-      'cmd' => "make -k ${dcf}distcheck"
+      'cmd' => "make$cpu -k ${dcf}distcheck"
     } unless $pkg->{'opt'} =~ m/\bno-check\b/;
 
     push @steps, {
@@ -676,13 +693,14 @@
   color: #003377;
 }
 
+.left { text-align: left; }
 table { margin-left:auto; margin-right:auto; }
 h1,h4 { text-align: center; background-color: #CCCCFF; }
-h3 { text-indent: 1em }
+h3 { text-align: left; 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; }
+pre { text-align: left; font-family: Courier, monospace; }
+tr { text-indent: 0em; text-align: center; }
 td { text-indent: 0em; font-family: Verdana, Helvetica, sans-serif; }
 tr.body { background-color: #E5E5E5; }
 td.time { color: gray }
Index: auto-build/packages.list
--- auto-build/packages.list	(revision 81)
+++ auto-build/packages.list	(working copy)
@@ -15,50 +15,35 @@
 color red    "^SdfChecker:error:.*$"
 color maroon "^warning:.*$"
 color maroon "^SdfChecker:warning:.*$"
+color maroon "^[\w\/\.]+:\d+: [Ww]arning:.*$"
+color red    "^[\w\/\.]+: In .*$"
 color gray   "^make.*:.*$"
 color green  "^PASS:"
 color blue   "^XPASS:"
 color red    "^FAIL:"
 
-### StrategoXT ################################################################
-
-section "StrategoXT"
-
-#------------------------------------------------------------------------------
-
-aterm
+### Tiger #####################################################################
 
- url: http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.2.tar.gz
- cfg: --with-gcc
- opt: rm-build-dir
+section "Tiger"
 
 #------------------------------------------------------------------------------
 
-sdf
+havm
 
- url: ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-2.2.tar.gz
- cfg: --with-aterm=${aterm}
- opt: no-check, rm-build-dir
+ url: svn://svn.lrde.epita.fr/svn/havm/trunk
+ dif: /home/lrde/lrde-2005/vasseu_c/havm.diff
 
 #------------------------------------------------------------------------------
 
-strategoxt
-
- 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, rm-build-dir
+nolimips
 
-#------------------------------------------------------------------------------
+ url: svn://svn.lrde.epita.fr/svn/nolimips/trunk
 
-stratego-shell
+### StrategoXT ################################################################
 
- url: svn://svn.cs.uu.nl:12443/repos/StrategoXT/trunk/experimental/stratego-she
ll
- cfg: --with-aterm=${aterm}\
-      --with-sdf=${sdf}\
-      --with-strategoxt=${strategoxt}
- env: PATH="${strategoxt}/bin:$PATH"
- opt: rm-build-dir
+aterm       = /home/lrde/lrde/usr/Aterm
+sdf         = /home/lrde/lrde/usr/Sdf
+strategoxt  = /home/lrde/lrde/usr/StrategoXT
 
 ### Transformers ##############################################################
 
@@ -120,7 +105,7 @@
 
 sdf-attribute
 
- url: svn://svn.lrde.epita.fr/svn/transformers/experimental/sdf-attribute
+ url: svn://svn.lrde.epita.fr/svn/transformers/trunk/sdf-attribute
  cfg: --with-aterm=${aterm}\
       --with-sdf=${sdf}\
       --with-strategoxt=${strategoxt}\
@@ -132,7 +117,7 @@
 
 c-grammar
 
- url: svn://svn.lrde.epita.fr/svn/transformers/branches/c-grammar
+ url: svn://svn.lrde.epita.fr/svn/transformers/trunk/c-grammar
  cfg: --with-aterm=${aterm}\
       --with-sdf=${sdf}\
       --with-strategoxt=${strategoxt}\
@@ -142,7 +127,7 @@
       --with-sdf-astgen=${sdf-astgen}\
       --with-sdf-attribute=${sdf-attribute}\
       --with-esdf=${esdf}
- env: PATH="${sdf-detgen}/bin:${stratego-shell}/bin:${strategoxt}/bin:$PATH"
+ env: PATH="/mnt/daily/usr/stratego-shell/bin:${strategoxt}/bin:$PATH"
 
 #------------------------------------------------------------------------------
 
@@ -172,20 +157,6 @@
 
 #------------------------------------------------------------------------------
 
-cxx-typecheck
-
- url: svn://svn.lrde.epita.fr/svn/transformers/trunk/cxx-typecheck
- cfg: --with-aterm=${aterm}\
-      --with-sdf=${sdf}\
-      --with-strategoxt=${strategoxt}\
-      --with-boxedsdf=${boxedsdf}\
-      --with-sdf-option=${sdf-option}\
-      --with-cxx-grammar=${cxx-grammar}\
-      --with-esdf=${esdf}
- env: PATH="${strategoxt}/bin:$PATH"
-
-#------------------------------------------------------------------------------
-
 specs-grammar
 
  url: svn://svn.lrde.epita.fr/svn/transformers/trunk/specs-grammar
@@ -200,23 +171,6 @@
       --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"
@@ -226,7 +180,9 @@
 olena
 
  url: prcs://oln
- env: PRCS_REPOSITORY="/home/lrde/admin/prcs/repository"
+ cpu: 2
+ env: PRCS_REPOSITORY="/home/lrde/admin/prcs/repository",\
+      CXX="g++-3.4"
 
 ### Vaucanson #################################################################
 
@@ -237,6 +193,8 @@
 vaucanson
 
  url: svn://svn.lrde.epita.fr/svn/vaucanson/trunk
- env: PATH="/home/lrde/lrde-2005/vasseu_c/usr/bin/old:$PATH"
+ cpu: 2
+ env: PATH="/home/lrde/lrde-2005/vasseu_c/usr/bin/old:$PATH",\
+      CXX="g++-3.3"
 
 #------------------------------------------------------------------------------

    

Clement Vasseur

tags

participants (1)