From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 15 Apr 2011 10:02:56 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into gforge
X-Git-Tag: v3.6_beta2~36
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/96920215fe6b67ec41f9e9dee856b5157a67f6d2?hp=427c2305c41475b1da9491800dd9a075a015d365

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into gforge
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae43da2853..9a5404b8fd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,10 @@ project(simgrid CXX C)
 set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_CXX_FLAGS "" CACHE TYPE INTERNAL FORCE)
 set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
-### Version 3.5.99, aka 3.6 svn
+### Version 3.5.91, aka 3.6 alpha2
 set(SIMGRID_VERSION_MAJOR "3")
 set(SIMGRID_VERSION_MINOR "5")
-set(SIMGRID_VERSION_PATCH "99")
+set(SIMGRID_VERSION_PATCH "91")
 set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
 set(libsimgrid_version "${release_version}")
 set(libgras_version "${release_version}")
diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 8378442652..89b8c96352 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -49,6 +49,7 @@ set(EXTRA_DIST
 	src/surf/gtnets/gtnets_simulator.h
 	src/surf/gtnets/gtnets_topology.h
 	src/surf/cpu_ti_private.h
+	src/surf/surf_routing_private.h
 	src/include/surf/surf_resource.h
 	src/include/surf/datatypes.h
 	src/include/surf/maxmin.h
@@ -521,7 +522,7 @@ file(GLOB_RECURSE examples_to_install_in_doc
 
 set(DOC_SOURCES
 	doc/contrib.doc
-    doc/FAQ.doc
+	doc/FAQ.doc
 	doc/gtut-howto-design.doc
 	doc/gtut-howto.doc
 	doc/gtut-introduction.doc
@@ -599,6 +600,9 @@ set(DOC_SOURCES
 	doc/webcruft/robots.txt
 	doc/webcruft/simgrid_logo.png
 	doc/webcruft/simgrid_logo_small.png
+	doc/triva-graph_configuration.png
+	doc/triva-graph_visualization.png
+	doc/simgrid.css
 	
 	doc/Doxyfile.in
 	doc/footer.html.in
@@ -621,6 +625,10 @@ set(DOC_FIGS
 	${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig
 )
 
+set(DOC_bib
+	${CMAKE_HOME_DIRECTORY}/doc/all.bib
+)
+
 file(GLOB_RECURSE add_src_files
 "teshsuite/*.c"
 "teshsuite/*.cxx"
@@ -774,6 +782,7 @@ file(GLOB_RECURSE README_files
 string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" README_files "${README_files}")
 
 file(GLOB_RECURSE CMAKE_SOURCE_FILES
+"buildtools/Cmake/Makefile.default"
 "buildtools/Cmake/test_java.sh"
 "buildtools/Cmake/*.cmake"
 "buildtools/Cmake/*.h.in"
@@ -815,10 +824,10 @@ set(source_to_pack
 	${xml_files}
 	${tesh_files}
 	${txt_files}
-	${EXTRA_DIST}
 	${CMAKE_SOURCE_FILES}
 	${bin_files}
 	${DOC_SOURCES}
 	${DOC_FIGS}
+	${DOC_bib}
 	${README_files}
 )
diff --git a/buildtools/Cmake/GenerateDoc.cmake b/buildtools/Cmake/GenerateDoc.cmake
index 83e683bdcc..28090831df 100644
--- a/buildtools/Cmake/GenerateDoc.cmake
+++ b/buildtools/Cmake/GenerateDoc.cmake
@@ -45,7 +45,7 @@ if(DOXYGEN_PATH AND FIG2DEV_PATH AND BIBTOOL_PATH AND BIBTEX2HTML_PATH AND ICONV
 	
 	ADD_CUSTOM_TARGET(simgrid_documentation
 		COMMENT "Generating the SimGrid documentation..."
-		DEPENDS ${DOC_SOURCES} ${DOC_FIGS} ${source_doxygen}
+		DEPENDS ${DOC_SOURCES} ${DOC_FIGS} ${source_doxygen} ${DOC_bib}
 		COMMAND ${FIG2DEV_PATH}/fig2dev -Lmap ${CMAKE_HOME_DIRECTORY}/doc/fig/simgrid_modules.fig | perl -pe 's/imagemap/simgrid_modules/g'| perl -pe 's/<IMG/<IMG style=border:0px/g' | ${CMAKE_HOME_DIRECTORY}/tools/doxygen/fig2dev_postprocessor.pl > ${CMAKE_HOME_DIRECTORY}/doc/simgrid_modules.map
 		WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc
 	)