From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 15 Apr 2011 10:02:16 +0000 (+0200)
Subject: Add some missing files to the distributed archive
X-Git-Tag: v3.6_beta2~38
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f667b231f734dfd699f012056c33aa88711b0ba5

Add some missing files to the distributed archive
---

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
 	)