From: Pierre-Nicolas Clauss <pini@tuxfamily.org>
Date: Tue, 29 Mar 2011 14:17:19 +0000 (+0200)
Subject: Merge branch 'mention-debian-package-for-bibtex2html' of git://github.com/ln/simgrid
X-Git-Tag: exp_20120216~559^2^2~2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/72c585c90b3e439c57fcb3758609910d12ca4750?hp=4fbd648cb903222b1d0d13faee7b162d968b91ca

Merge branch 'mention-debian-package-for-bibtex2html' of git://github.com/ln/simgrid
---

diff --git a/ChangeLog b/ChangeLog
index 71d3a60fba..d4608fca38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,8 @@ SimGrid (3.6) unstable; urgency=low
    processes in parallel only when their number is greater than or equal to P.
 
  XBT
+ * New command line option: if you pass --cfg=verbose-exit:0, SimGrid
+   won't output the state of processes when interrupted with Ctrl-C
  * Add a new function xbt_dynar_to_array that transforms a dynar into a
    NULL-terminated array. This may solve backward compatibility issues
    due to the change to return type of SD_Simulate. See also:
diff --git a/src/xbt/log.c b/src/xbt/log.c
index f9cd22fc89..fac60e04ce 100644
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -1043,6 +1043,7 @@ void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t app)
 
 void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay)
 {
+#define _xbt_log_cat_init(a, b) (0)
   if (!cat->appender) {
     XBT_VERB
         ("No appender to category %s. Setting the file appender as default",
@@ -1057,6 +1058,7 @@ void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay)
   }
   cat->layout = lay;
   xbt_log_additivity_set(cat, 0);
+#undef _xbt_log_cat_init
 }
 
 void xbt_log_additivity_set(xbt_log_category_t cat, int additivity)
diff --git a/tools/doxygen/doxygen_postprocesser.pl b/tools/doxygen/doxygen_postprocesser.pl
index 7403f89ac9..da9a38cabf 100755
--- a/tools/doxygen/doxygen_postprocesser.pl
+++ b/tools/doxygen/doxygen_postprocesser.pl
@@ -5,7 +5,7 @@ use strict;
 # Add here the pages of the documentation generated by a @page doxygen macro
 my @extra_files = qw(html/index.html html/faq.html html/history.html html/contrib.html html/people.html
                      html/publis.html html/publis_core.html html/publis_extern.html html/publis_intra.html
-                     html/pages.html html/modules.html  index.php 
+                     html/pages.html html/modules.html  html/annotated.html index.php 
                      html/GRAS_tut.html);
 
 # GRAS tutorial
@@ -301,6 +301,8 @@ handle_page($top,-2);# skip roots (we have 2 roots) in level counting
 map {push @allfiles,$_} @extra_files;
 print "All files: ".(join(", ",@allfiles))."\n" if $debug{'parse'};
 
+my $tabs;
+
 foreach my $file (@allfiles) {
     $file =~ s/.html/.handlepage.html/ if $debug{'rename'}; # Take right name if debugging
 	
@@ -327,6 +329,23 @@ foreach my $file (@allfiles) {
 	        next;
 	      }
       }
+      if($file =~ "^html/faq.*"){
+		if ($_ =~ /[\ ]*<li class="current">.*/) {
+	      	$_ =~ s/ class="current"//g;
+	        print TO $_;
+	        next;
+	      }
+      }
+      if( $_ =~ /<div.*class="tabs">/){$tabs = 1;}
+      if( $_ =~ /<\/div>/){$tabs = 0;}
+      if( $_ =~ /<\/ul>/ && $tabs){
+      		if($file =~ "^html/faq.*"){
+      		print TO '      <li class="current"><a href="faq.html"><span>FAQ&#160;Page</span></a></li>'."\n";}
+      		else{
+      	  	print TO '      <li><a href="faq.html"><span>FAQ&#160;Page</span></a></li>'."\n";}
+      	  	print TO $_;
+      	  	next;
+      }
 #      if (m,<li><a href="(doc/)?annotated.html"><span>Data\&nbsp;Structures</span></a></li>,) {
 #        print TO '    <li'.($file =~ m,(doc/)?publis(_[^.]*)?.html, ? " class='current'" :"").'><a href="'.$1.'publis.html"><span>Publications</span></a></li>'."\n";
 #        print TO '    <li'.($file =~ m,(doc/)?people.html, ? " class='current'" :"").'><a href="'.$1.'people.html"><span>People</span></a></li>'."\n";