X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4610b103f5b664648c716031782165da1e6fbd41..edde8f7fbc1b74a81551bf9eb7bac1935b999296:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index d363791d69..e2e3abb671 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -8,7 +8,6 @@ set(EXTRA_DIST
 	src/xbt/fifo_private.h
 	src/xbt/graph_private.h
 	src/xbt/graphxml_parse.c
-	src/xbt/graphxml.l
 	src/xbt/graphxml.c
 	src/xbt/graphxml.dtd
 	src/xbt/log_private.h
@@ -18,6 +17,7 @@ set(EXTRA_DIST
 	src/xbt/backtrace_dummy.c
 	src/xbt/setset_private.h
 	src/xbt/parmap_private.h
+	src/xbt/automatonparse_promela.c
 	src/xbt/mmalloc/attach.c
 	src/xbt/mmalloc/detach.c	
 	src/xbt/mmalloc/keys.c
@@ -40,7 +40,6 @@ set(EXTRA_DIST
 	src/surf/trace_mgr_private.h
 	src/surf/surf_private.h
 	src/surf/surfxml_parse.c
-	src/surf/simgrid_dtd.l
 	src/surf/simgrid_dtd.c
 	src/surf/simgrid.dtd
 	src/surf/network_private.h
@@ -50,12 +49,13 @@ set(EXTRA_DIST
 	src/surf/gtnets/gtnets_topology.h
 	src/surf/cpu_ti_private.h
 	src/surf/surf_routing_private.h
+	src/include/simgrid/platf_interface.h
 	src/include/surf/surf_resource.h
 	src/include/surf/datatypes.h
 	src/include/surf/maxmin.h
 	src/include/surf/trace_mgr.h
 	src/include/surf/surf.h
-	src/include/surf/surfxml_parse_private.h
+	src/include/surf/surfxml_parse_values.h
 	src/include/surf/random_mgr.h
 	src/include/surf/surf_resource_lmm.h
 	src/include/xbt/wine_dbghelp.h
@@ -64,11 +64,10 @@ set(EXTRA_DIST
 	src/include/mc/datatypes.h
 	src/include/mc/mc.h
 	src/include/simix/context.h
-	src/msg/private.h
-	src/msg/mailbox.h
+	src/msg/msg_private.h
+	src/msg/msg_mailbox.h
 	src/simdag/private.h
 	src/simdag/dax.dtd
-	src/simdag/dax_dtd.l
 	src/simdag/dax_dtd.h
 	src/simdag/dax_dtd.c
 	src/gras/DataDesc/ddt_parse.yy.l
@@ -104,6 +103,7 @@ set(EXTRA_DIST
 	src/surf/ns3/ns3_interface.h
 	src/surf/ns3/ns3_simulator.h
 	src/surf/ns3/my-point-to-point-helper.h
+	src/surf/ns3/red-queue.h
 )
 
 set(XBT_RL_SRC 
@@ -181,6 +181,7 @@ set(XBT_SRC
 	src/xbt/parmap.c
 	src/xbt/xbt_replay_trace_reader.c
 	src/xbt/lib.c
+	src/xbt/automaton.c
 )
 
 if(HAVE_MMAP)
@@ -201,29 +202,22 @@ set(NS3_SRC
 	src/surf/network_ns3.c
 	src/surf/ns3/ns3_interface.cc
 	src/surf/ns3/ns3_simulator.cc
-	)
+	src/surf/ns3/red-queue.cc
+	src/surf/ns3/my-point-to-point-helper.cc
+)
 	
-if(HAVE_RED_QUEUE_H)
-    set(NS3_SRC
-        ${NS3_SRC}
-        src/surf/ns3/my-point-to-point-helper.cc
-        )
-else(HAVE_RED_QUEUE_H)
-	set(EXTRA_DIST
-	    ${EXTRA_DIST}
-	    src/surf/ns3/my-point-to-point-helper.cc
-	)
-endif(HAVE_RED_QUEUE_H)
-
 set(SURF_SRC 
 	src/surf/surf_model.c
 	src/surf/surf_action.c
 	src/surf/surf_routing.c
+	src/surf/surf_routing_none.c
+	src/surf/surf_routing_generic.c
 	src/surf/surf_routing_full.c
 	src/surf/surf_routing_floyd.c
 	src/surf/surf_routing_rulebased.c
 	src/surf/surf_routing_dijkstra.c
-	src/surf/surf_routing_none.c
+	src/surf/surf_routing_cluster.c
+	src/surf/surf_routing_vivaldi.c
 	src/surf/surf_config.c
 	src/surf/maxmin.c
 	src/surf/fair_bottleneck.c
@@ -232,6 +226,7 @@ set(SURF_SRC
 	src/surf/random_mgr.c
 	src/surf/surf.c
 	src/surf/surfxml_parse.c
+	src/surf/surfxml_parseplatf.c
 	src/surf/cpu.c
 	src/surf/network.c
 	src/surf/network_im.c
@@ -240,6 +235,7 @@ set(SURF_SRC
 	src/surf/workstation_ptask_L07.c
 	src/surf/cpu_ti.c
 	src/surf/cpu_im.c
+	src/surf/sg_platf.c
 	src/xbt/xbt_sg_stubs.c
 )
 
@@ -260,13 +256,13 @@ set(SIMIX_SRC
 
 set(MSG_SRC
 	src/msg/msg_config.c
-	src/msg/task.c
-	src/msg/host.c
-	src/msg/m_process.c
-	src/msg/gos.c
-	src/msg/global.c
-	src/msg/environment.c
-	src/msg/deployment.c
+	src/msg/msg_task.c
+	src/msg/msg_host.c
+	src/msg/msg_process.c
+	src/msg/msg_gos.c
+	src/msg/msg_global.c
+	src/msg/msg_environment.c
+	src/msg/msg_deployment.c
 	src/msg/msg_mailbox.c
 	src/msg/msg_actions.c
 )
@@ -374,6 +370,7 @@ set(MC_SRC
 	src/mc/mc_dpor.c
 	src/mc/mc_request.c
 	src/mc/private.h
+	src/mc/mc_liveness.c
 )
 
 set(RNGSTREAM_SRC
@@ -416,6 +413,9 @@ set(headers_to_install
 	include/xbt/mmalloc.h
 	include/xbt/replay_trace_reader.h
 	include/xbt/parmap.h
+	include/xbt/automaton.h
+	include/xbt/automatonparse_promela.h
+	include/simgrid/platf.h
 	include/mc/modelchecker.h
 	include/msg/msg.h
 	include/msg/datatypes.h
@@ -563,23 +563,7 @@ file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*README"
 )
 
-set(WEBSITE_SOURCES
-    website/contrib.doc
-    website/FAQ.doc
-    website/history.doc
-	website/people.doc	
-	website/publis.doc  
-	website/all.bib
-	website/Doxyfile_website.in
-	website/footer.html
-	website/index.php.in
-	website/download.php.in
-	website/documentation.php.in
-    
-    tools/doxygen/bibtex2html_table_count.pl
-	doc/webcruft/fish.gif
-	doc/webcruft/robots.txt
-	)
+
     
 set(DOC_SOURCES
 	doc/installSimgrid.doc
@@ -874,7 +858,6 @@ set(source_to_pack
 	${CMAKE_SOURCE_FILES}
 	${bin_files}
 	${DOC_SOURCES}
-	${WEBSITE_SOURCES}
 	${DOC_FIGS}
 	${README_files}
 	buildtools/Cmake/simgrid.nsi.in