Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ae37c9..ae43da2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,12 +215,7 @@ endif(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeExe.cmake)
 
 ### Make tests
-if(NOT WIN32)
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/AddTests.cmake)
-else(NOT WIN32)
-
-endif(NOT WIN32)
-
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/CTestConfig.cmake)
 
 ### Setup the distrib

diff --git a/buildtools/pipol/Experimental.sh b/buildtools/pipol/Experimental.sh
index afdde6b..1ec059b 100644 (file)
--- a/buildtools/pipol/Experimental.sh
+++ b/buildtools/pipol/Experimental.sh
@@ -10,10 +10,10 @@ else
 fi
 cd ./pipol/$PIPOL_HOST
 
-svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk --quiet
-cd simgrid-trunk
+git clone git://scm.gforge.inria.fr/simgrid/simgrid.git simgrid --quiet
+cd simgrid
 
-if [ x$PIPOL_IMAGE == "xamd64-windows-server-2008-64bits-navarro-2011-03-15-122256.dd.gz" ] ; then
+if [ x$PIPOL_IMAGE == "xamd64-windows-server-2008-64bits.dd.gz" ] ; then
        cmake \
        -G"Unix Makefiles" \
        -Denable_lua=off \

diff --git a/buildtools/pipol/Experimental_bindings.sh b/buildtools/pipol/Experimental_bindings.sh
index 348895d..f3bec0f 100644 (file)
--- a/buildtools/pipol/Experimental_bindings.sh
+++ b/buildtools/pipol/Experimental_bindings.sh
@@ -10,8 +10,8 @@ else
 fi
 cd ./pipol/$PIPOL_HOST
 
-svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk --quiet
-cd simgrid-trunk
+git clone git://scm.gforge.inria.fr/simgrid/simgrid.git simgrid --quiet
+cd simgrid
 
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl

diff --git a/buildtools/pipol/MemCheck.sh b/buildtools/pipol/MemCheck.sh
index d198341..f6909a3 100644 (file)
--- a/buildtools/pipol/MemCheck.sh
+++ b/buildtools/pipol/MemCheck.sh
@@ -10,8 +10,8 @@ else
 fi
 cd ./pipol/$PIPOL_HOST
 
-svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk --quiet
-cd simgrid-trunk
+git clone git://scm.gforge.inria.fr/simgrid/simgrid.git simgrid --quiet
+cd simgrid
 
 perl ./buildtools/pipol/cmake.pl
 perl ./buildtools/pipol/ruby.pl

diff --git a/buildtools/pipol/Nightly_simgrid.sh b/buildtools/pipol/Nightly_simgrid.sh
index a16b9d7..7e7c75b 100644 (file)
--- a/buildtools/pipol/Nightly_simgrid.sh
+++ b/buildtools/pipol/Nightly_simgrid.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#PRE-PIPOL /home/mescal/navarro/pre-simgrid.sh
-
 #PIPOL esn i386-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent
 #PIPOL esn amd64-linux-ubuntu-karmic.dd.gz none 02:00 --user --silent
 #PIPOL esn i386-linux-ubuntu-lucid.dd.gz none 02:00 --user --silent
@@ -18,7 +16,7 @@
 #PIPOL esn i386_kvm-linux-debian-testing none 02:00 --user --silent
 #PIPOL esn amd64_kvm-linux-debian-testing none 02:00 --user --silent
 
-#PIPOL esn amd64-windows-server-2008-64bits-navarro-2011-03-15-122256.dd.gz none 02:00 --root
+#PIPOL esn amd64-windows-server-2008-64bits.dd.gz none 02:00 --root
 
 if [ -e ./pipol ] ; then
        rm -rf ./pipol/$PIPOL_HOST
@@ -30,11 +28,11 @@ else
 fi
 cd ./pipol/$PIPOL_HOST
 
-svn checkout svn://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk simgrid-trunk --quiet
-cd simgrid-trunk
+git clone git://scm.gforge.inria.fr/simgrid/simgrid.git simgrid --quiet
+cd simgrid
 
 
-if [ x$PIPOL_IMAGE == "xamd64-windows-server-2008-64bits-navarro-2011-03-15-122256.dd.gz" ] ; then
+if [ x$PIPOL_IMAGE == "xamd64-windows-server-2008-64bits.dd.gz" ] ; then
        cmake \
        -G"Unix Makefiles" \
        -Denable_lua=off \

diff --git a/doc/FAQ.doc b/doc/FAQ.doc
index 2953a56..4b028bd 100644 (file)
--- a/doc/FAQ.doc
+++ b/doc/FAQ.doc
@@ -112,7 +112,7 @@ For Unix and MacOS:
   \li cmake <a href="http://www.cmake.org/cmake/resources/software.html">(download page)</a>
 
 For Windows :
-  \li cmake 2.8.3 <a href="http://www.cmake.org/files/v2.8/cmake-2.8.3-win32-x86.exe">(download page)</a>
+  \li cmake 2.8 <a href="http://www.cmake.org/cmake/resources/software.html">(download page)</a>
   \li perl strawberry <a href="http://www.strawberryperl.com/download/5.12.2.0/strawberry-perl-5.12.2.0.msi">(download page)</a>
   \li pcre-7.0 <a href="http://sourceforge.net/projects/gnuwin32/files/pcre/7.0/pcre-7.0.exe/download">(download page)</a>
 
@@ -120,11 +120,9 @@ For Windows :
 
 \verbatim
 "cmake -D[name]=[value] ... ./"
- 
+
 [name]         enable_gtnets           [value] ON/OFF or TRUE/FALSE or 1/0
-       enable_java                     ON/OFF or TRUE/FALSE or 1/0
        enable_lua                      ON/OFF or TRUE/FALSE or 1/0
-       enable_ruby                     ON/OFF or TRUE/FALSE or 1/0
        enable_compile_optimizations    ON/OFF or TRUE/FALSE or 1/0
        enable_compile_warnings         ON/OFF or TRUE/FALSE or 1/0
        enable_smpi                     ON/OFF or TRUE/FALSE or 1/0
@@ -132,23 +130,25 @@ For Windows :
        enable_supernovae               ON/OFF or TRUE/FALSE or 1/0
        enable_tracing                  ON/OFF or TRUE/FALSE or 1/0
        enable_coverage                 ON/OFF or TRUE/FALSE or 1/0
-       enable_memcheck                 ON/OFF or TRUE/FALSE or 1/0 
+       enable_memcheck                 ON/OFF or TRUE/FALSE or 1/0
        enable_model-checking           ON/OFF or TRUE/FALSE or 1/0
+       enable_debug                    ON/OFF or TRUE/FALSE or 1/0
+       enable_jedule                   ON/OFF or TRUE/FALSE or 1/0
+       enable_latency_bound_tracking   ON/OFF or TRUE/FALSE or 1/0
+       enable_lib_static               ON/OFF or TRUE/FALSE or 1/0
+       enable_pcre                     ON/OFF or TRUE/FALSE or 1/0
+       custom_flags                    <flags>
        gtnets_path                     <path_to_gtnets_directory>
        CMAKE_INSTALL_PREFIX            <path_to_install_directory>
-       pipol_user                      <pipol_username>         
+       pipol_user                      <pipol_username>
 \endverbatim
                                                                                                                                                           
 \subsubsection faq_cmakeoption2 Options explaination
 
   \li enable_gtnets : set to true implie that user wants to use gtnets.
 
-  \li enable_java : set to true implie that user wants to add java langage into simgrid compilation.
-
   \li enable_lua : set to true implie that user wants to add lua langage into simgrid compilation.
 
-  \li enable_ruby : set to true implie that user wants to add ruby langage into simgrid compilation.
-
   \li enable_compile_optimizations : add flags "-O3 -finline-functions -funroll-loops -fno-strict-aliasing"
 
   \li enable_compile_warnings : add flags "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror"
@@ -159,7 +159,7 @@ For Windows :
 
   \li enable_supernovae : set to true make one file for each lib and compile with those generated files.
 
-  \li enable_tracing : To enable the generation of simulation traces for visualization
+  \li enable_tracing : To enable the generation of simulation traces for visualization.
 
   \li enable_coverage : When set to true this option enable code coverage by setting -fprofile-arcs -ftest-coverage flags.
 
@@ -167,6 +167,18 @@ For Windows :
 
   \li enable_model-checking : Enable the model checking when set to true.
 
+  \li enable_debug : If enable_debug is set to 'off' Simgrid compil flag has '-DNDEBUG' option.
+  
+  \li enable_jedule : To enable jedule mode, which creates visualizations of task schedules with Simdag. 
+  
+  \li enable_latency_bound_tracking : Set to on if you want to be warned when communications are limited by round trip time.
+  
+  \li enable_lib_static : Enable generated Simgrid and smpi static libraries.
+  
+  \li enable_pcre : Use or not the pcre lib for memory optimization.   
+  
+  \li custom_flags : If user wants to use a specific flag during compilation, give here.
+
   \li gtnets_path : Path to gtnets install directory (ex /usr)
 
   \li CMAKE_INSTALL_PREFIX : Path where are installed lib/ doc/ and include/ directories (ex /usr/local)
@@ -180,18 +192,22 @@ Those options are initialized the first time you launch "cmake ." whithout speci
 \verbatim
 enable_gtnets                  on
 enable_lua                     on
-enable_ruby                    on
-enable_java                    on
 enable_smpi                    on
 enable_supernovae              on
 enable_tracing                 on
 enable_compile_optimizations   on
+enable_debug                   on
+enable_pcre                    on
 enable_compile_warnings                off
 enable_maintainer_mode         off
 enable_coverage                off
 enable_memcheck                off
 enable_model-checking          off
+enable_jedule                  off
+enable_latency_bound_tracking  off 
+enable_lib_static              off
 CMAKE_INSTALL_PREFIX           /usr/local
+custom_flags                   null
 gtnets_path                    null
 pipol_user                     null
 \endverbatim
@@ -298,8 +314,8 @@ For Windows:
 
 \verbatim
 cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=C:\simgrid_install ./
-make
-make install
+gmake
+gmake install
 \endverbatim
 
 \subsubsection faq_cmakeinstall2 From a distrib

diff --git a/tools/doxygen/doxygen_postprocesser.pl b/tools/doxygen/doxygen_postprocesser.pl
index 515cf5e..ff05f06 100755 (executable)
--- a/tools/doxygen/doxygen_postprocesser.pl
+++ b/tools/doxygen/doxygen_postprocesser.pl
@@ -359,14 +359,18 @@ foreach my $file (@allfiles) {
                  if($file =~ /^html\/index\..*/){
                        $_ =~ s/<li class="current">/<li>/g;
                        $_ =~ s/<li><a href="index.html">/<li class="current"><a href="index.html">/g;
-                 }
-                 
+                 }               
                  $_ =~ s/<li class="current"><a href="pages.html">/<li><a href="pages.html">/g;
                  
                  if($file =~ /^html\/pages\..*/){
                        $_ =~ s/<li><a href="pages.html">/<li class="current"><a href="pages.html">/g;
                  }
          }
+         
+         if($file =~ /^html\/publis.*/){
+                       $_ =~ s/<div class="header">/<div>/g;
+                       $_ =~ s/<div class="headertitle">/<div>/g;
+        }
        
          # Add the FAQ PUBLIS PEOPLE HISTORY and CONTRIB to the top navbar.
       if( $_ =~ /<div.*class="tabs">/){