X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/345516313443bfa8eab29371253c064cb31df9b8..3d27a1e82ea26521deee4ab0bab6543ab4339da9:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 009dbc97f0..4f44d6263c 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -62,8 +62,6 @@ set(EXTRA_DIST
 	src/include/xbt/xbt_os_thread.h
 	src/include/mc/datatypes.h
 	src/include/mc/mc.h
-	src/include/simix/simix.h
-	src/include/simix/datatypes.h
 	src/include/simix/context.h
 	src/msg/private.h
 	src/msg/mailbox.h
@@ -82,9 +80,13 @@ set(EXTRA_DIST
 	src/amok/Bandwidth/bandwidth_private.h
 	src/amok/amok_modinter.h
 	src/simix/private.h
-	src/simix/smx_context_private.h
+	src/simix/process_private.h
+	src/simix/host_private.h
+	src/simix/network_private.h
+	src/simix/smurf_private.h
+	src/simix/synchro_private.h
+	
 	src/smpi/private.h
-	src/smpi/smpi_coll_private.h
 	src/smpi/smpi_mpi_dt_private.h
 	src/smpi/README
 	src/mk_supernovae.pl
@@ -109,7 +111,6 @@ set(SMPI_SRC
 	src/smpi/smpi_f77.c
 	src/smpi/smpi_comm.c
 	src/smpi/smpi_group.c
-	src/smpi/smpi_util.c
 	src/smpi/smpi_coll.c
 	src/smpi/smpi_mpi_dt.c
 )
@@ -194,7 +195,6 @@ set(SURF_SRC
 	src/surf/surfxml_parse.c
 	src/surf/cpu.c
 	src/surf/network.c
-	src/surf/network_vivaldi.c
 	src/surf/network_constant.c
 	src/surf/workstation.c
 	src/surf/workstation_ptask_L07.c
@@ -215,6 +215,10 @@ set(SIMIX_SRC
 	src/simix/smx_context_base.c
 	src/simix/smx_user.c
 	src/simix/smx_smurf.c
+	src/replay/replay.h
+	src/replay/replay.c
+	src/replay/state_machine_context.c
+	src/replay/replay_trace_reader.c
 )
 
 set(MSG_SRC
@@ -297,20 +301,18 @@ set(LUA_SRC
 
 set(TRACING_SRC
 	src/instr/instr_config.c
-	src/instr/categories.c
-	src/instr/interface.c
-	src/instr/general.c
-	src/instr/paje.c
-	src/instr/msg_task_instr.c
-	src/instr/msg_process_instr.c
-	src/instr/msg_volume.c
-	src/instr/smx_instr.c
-	src/instr/surf_instr.c
-	src/instr/smpi_instr.c
-	src/instr/sd_instr.c
-	src/instr/variables_instr.c
-	src/instr/resource_utilization.c
-	src/instr/private.h
+	src/instr/instr_interface.c
+	src/instr/instr_paje.c
+	src/instr/instr_msg_task.c
+	src/instr/instr_msg_process.c
+	src/instr/instr_msg_volume.c
+	src/instr/instr_smx.c
+	src/instr/instr_surf.c
+	src/instr/instr_smpi.c
+	src/instr/instr_simdag.c
+	src/instr/instr_variables.c
+	src/instr/instr_resource_utilization.c
+	src/instr/instr_private.h
 )
 
 set(RUBY_SRC
@@ -389,41 +391,38 @@ set(install_HEADERS
 	${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h
 	include/gras.h 
 	include/xbt.h
+	include/simix/simix.h
+	include/simix/datatypes.h
+	include/simix/context.h
 )
 
 ### depend of some variables setted upper
-# -->CONTEXT_THREADS
+# -->CONTEXT_THREADS CONTEXT_UCONTEXT
 if(${CONTEXT_THREADS}) #pthread
 	set(SURF_SRC
 		${SURF_SRC}
 		src/xbt/xbt_os_thread.c
 		src/simix/smx_context_thread.c
-	)
+		)
+else(${CONTEXT_THREADS}) # NOT pthread
 	set(EXTRA_DIST
 		${EXTRA_DIST}
-		src/simix/smx_context_sysv.c
-	)
-else(${CONTEXT_THREADS}) #ucontext
+		src/xbt/xbt_os_thread.c
+		src/simix/smx_context_thread.c
+		)
+endif(${CONTEXT_THREADS})
+
+if(${CONTEXT_UCONTEXT}) #ucontext
 	set(SURF_SRC
 		${SURF_SRC}
 		src/simix/smx_context_sysv.c
 	)
-
-	if(WIN32)
-    	set(SURF_SRC
-    		${SURF_SRC}
-    		src/xbt/xbt_os_thread.c
-    		src/simix/smx_context_thread.c)
-    else(WIN32)
-    	set(EXTRA_DIST
-    		${EXTRA_DIST}
-    		src/xbt/xbt_os_thread.c
-    		src/simix/smx_context_thread.c)
-    endif(WIN32)
-endif(${CONTEXT_THREADS})
-
-
-
+else(${CONTEXT_UCONTEXT}) # NOT ucontext
+	set(EXTRA_DIST
+		${EXTRA_DIST}
+		src/simix/smx_context_sysv.c
+	)
+endif(${CONTEXT_UCONTEXT})
 
 # -->HAVE_GTNETS
 if(HAVE_GTNETS)
@@ -692,11 +691,20 @@ file(GLOB_RECURSE tesh_files
 "tools/*.tesh"
 )
 
-file(GLOB_RECURSE txt_files
-"testsuite/surf/trace*.txt"
-"testsuite/simdag/availability_tremblay.txt"
+set(txt_files
+"testsuite/surf/trace_A_failure.txt"
+"testsuite/surf/trace_A.txt"
+"testsuite/surf/trace_B.txt"
 "examples/smpi/hostfile"
-"examples/msg/*.trace"
+"examples/msg/procmig.trace"
+"examples/msg/volume.trace"
+"examples/msg/ms.trace"
+"examples/msg/trace/file.trace"
+"examples/msg/link5_state.trace"
+"examples/msg/categories.trace"
+"examples/msg/tasks.trace"
+"examples/msg/fafard_state.trace"
+"examples/msg/jupiter_state.trace"
 "examples/msg/actions/actions_allReduce.txt"
 "examples/msg/actions/actions_reduce.txt"
 "examples/msg/actions/actions.txt"
@@ -709,9 +717,7 @@ file(GLOB_RECURSE txt_files
 "examples/msg/migration/migration.deploy"
 "teshsuite/gras/datadesc/datadesc.little32_4"
 "teshsuite/gras/datadesc/datadesc.little64"
-"teshsuite/gras/datadesc/datadesc.big32_8"
 "teshsuite/gras/datadesc/datadesc.big32_8_4"
-"teshsuite/gras/datadesc/datadesc.big32_2"
 "teshsuite/gras/datadesc/mk_datadesc_structs.pl"
 "teshsuite/gras/msg_handle/test_rl"
 "teshsuite/gras/msg_handle/test_sg_32"
@@ -767,6 +773,8 @@ set(txt_files
 	LICENSE-LGPL-2.1
 	NEWS
 	TODO
+	configure
+	INSTALL
 )
 
 file(GLOB_RECURSE README_files
@@ -789,6 +797,7 @@ set(bin_files
 tools/MSG_visualization/colorize.pl
 tools/sg_unit_extractor.pl
 tools/simgrid_update_xml.pl
+buildtools/Cmake/tesh.pl
 )
 
 # This is the complete lise of what will be added to the source archive