X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc490dc65abd88dc1b946f27a8f87be449c621be..0a6a4bd48476ef1840bdd773ac0683c4452bf416:/buildtools/Cmake/DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index b66ec4c037..286d9b2231 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -17,7 +17,7 @@ set(EXTRA_DIST
 	src/xbt/backtrace_windows.c
 	src/xbt/backtrace_dummy.c
 	src/xbt/setset_private.h
-	src/xbt/threadpool_private.h
+	src/xbt/parmap_private.h
 	src/xbt/mmalloc/attach.c
 	src/xbt/mmalloc/detach.c	
 	src/xbt/mmalloc/keys.c
@@ -87,7 +87,6 @@ set(EXTRA_DIST
 	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
@@ -112,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
 )
@@ -166,7 +164,8 @@ set(XBT_SRC
 	src/xbt/cunit.c
 	src/xbt/graphxml_parse.c
 	src/xbt/setset.c
-	src/xbt/threadpool.c
+	src/xbt/parmap.c
+	src/xbt/xbt_replay_trace_reader.c
 )
 
 if(HAVE_MMAP)
@@ -197,6 +196,7 @@ set(SURF_SRC
 	src/surf/surfxml_parse.c
 	src/surf/cpu.c
 	src/surf/network.c
+	src/surf/network_im.c
 	src/surf/network_constant.c
 	src/surf/workstation.c
 	src/surf/workstation_ptask_L07.c
@@ -217,6 +217,7 @@ set(SIMIX_SRC
 	src/simix/smx_context_base.c
 	src/simix/smx_user.c
 	src/simix/smx_smurf.c
+	src/simix/smx_context_raw.c
 )
 
 set(MSG_SRC
@@ -298,21 +299,20 @@ set(LUA_SRC
 )
 
 set(TRACING_SRC
+	src/instr/instr_routing.c
 	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_paje_trace.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_resource_utilization.c
+	src/instr/instr_private.h
 )
 
 set(RUBY_SRC
@@ -366,6 +366,8 @@ set(install_HEADERS
 	include/xbt/queue.h
 	include/xbt/setset.h
 	include/xbt/mmalloc.h
+	include/xbt/replay_trace_reader.h
+	include/xbt/parmap.h
 	include/mc/modelchecker.h
 	include/msg/msg.h
 	include/msg/datatypes.h
@@ -397,38 +399,32 @@ set(install_HEADERS
 )
 
 ### 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)
@@ -779,6 +775,8 @@ set(txt_files
 	LICENSE-LGPL-2.1
 	NEWS
 	TODO
+	configure
+	INSTALL
 )
 
 file(GLOB_RECURSE README_files
@@ -801,6 +799,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