X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/697fcc0bf4916da98fbb143aa776622da8ba7426..0da6595ee68093903e46a1c46d30a792f0dd6ed3:/buildtools/Cmake/DefinePackages.cmake?ds=sidebyside

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 2b5095981e..c485b48317 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -108,6 +108,7 @@ set(SMPI_SRC
 	src/smpi/smpi_global.c
 	src/smpi/smpi_mpi.c
 	src/smpi/smpi_pmpi.c
+	src/smpi/smpi_c99.c
 	src/smpi/smpi_f77.c
 	src/smpi/smpi_comm.c
 	src/smpi/smpi_group.c
@@ -139,7 +140,6 @@ set(XBT_SRC
 	src/gras_modinter.h
 	src/xbt/xbt_virtu.c
 	src/xbt/xbt_os_time.c
-	src/xbt/asserts.c
 	src/xbt/log.c
 	src/xbt/xbt_log_appender_file.c
 	src/xbt/xbt_log_layout_simple.c
@@ -303,6 +303,7 @@ set(TRACING_SRC
 	src/instr/instr_config.c
 	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
@@ -314,12 +315,16 @@ set(TRACING_SRC
 	src/instr/instr_private.h
 )
 
-set(RUBY_SRC
-	src/simix/smx_context_ruby.c
-	src/bindings/ruby/rb_msg_process.c
-	src/bindings/ruby/rb_msg_host.c
-	src/bindings/ruby/rb_msg_task.c
-	src/bindings/ruby/rb_application_handler.c
+
+set(JEDULE_SRC
+	include/instr/jedule/jedule_events.h
+	include/instr/jedule/jedule_output.h
+	include/instr/jedule/jedule_platform.h
+	include/instr/jedule/jedule_sd_binding.h
+	src/instr/jedule/jedule_events.c
+	src/instr/jedule/jedule_output.c
+	src/instr/jedule/jedule_platform.c
+	src/instr/jedule/jedule_sd_binding.c
 )
 
 set(MC_SRC
@@ -333,6 +338,11 @@ set(MC_SRC
 	src/mc/private.h
 )
 
+set(RNGSTREAM_SRC
+	src/rngstreams/RngStream.h
+	src/rngstreams/RngStream.c
+)
+
 set(install_HEADERS
 	include/xbt/misc.h
 	include/xbt/sysdep.h
@@ -373,7 +383,7 @@ set(install_HEADERS
 	include/simdag/simdag.h
 	include/simdag/datatypes.h
 	include/smpi/smpi.h
-	include/smpi/smpif.h
+	${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h
 	include/smpi/mpi.h
 	include/smpi/mpif.h
 	include/surf/surfxml_parse.h
@@ -451,6 +461,8 @@ set(simgrid_sources
 	${GRAS_COMMON_SRC}
 	${GRAS_SG_SRC}
 	${AMOK_SRC}
+	${JEDULE_SRC}
+	${RNGSTREAM_SRC}
 )
 
 if(HAVE_MC)
@@ -480,42 +492,18 @@ elseif(${HAVE_LUA})
 	)
 endif(${HAVE_LUA})
 
-
-if(${HAVE_RUBY})
-	set(simgrid_sources
-		${simgrid_sources}
-		${RUBY_SRC}
-		src/bindings/ruby/simgrid_ruby.c
-	)
-else(${HAVE_RUBY})
-	set(EXTRA_DIST
-		${EXTRA_DIST}
-		${RUBY_SRC}
-		src/bindings/ruby/simgrid_ruby.c
-	)
-endif(${HAVE_RUBY})
-
 file(GLOB_RECURSE examples_to_install_in_doc
 "examples/*.c"
 "examples/*.h"
 "examples/*.cxx"
 "examples/*.hpp"
-"examples/*.c"
 "examples/*.rb"
 "examples/*.lua"
 "examples/*.java"
 "examples/*.xml"
-)
-
-file(GLOB_RECURSE README_examples_files
 "examples/*README"
 )
 
-set(examples_to_install_in_doc
-${examples_to_install_in_doc}
-${README_examples_files}
-)
-
 set(DOC_SOURCES
 	doc/contrib.doc
     doc/FAQ.doc
@@ -618,20 +606,6 @@ set(DOC_FIGS
 	${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig
 )
 
-foreach(file ${examples_to_install_in_doc})
-	string(REGEX REPLACE "/[^/]*$" "" file "${file}")
-	set(new_examples_to_install_in_doc "${new_examples_to_install_in_doc}${file};")
-endforeach(file ${examples_to_install_in_doc})
-
-set(directory_to_create "")
-
-foreach(file ${new_examples_to_install_in_doc})
-	string(REGEX MATCH "${file};" OPERATION "${directory_to_create}")
-	if(NOT OPERATION)
-		set(directory_to_create "${directory_to_create}${file};")
-	endif(NOT OPERATION)
-endforeach(file ${new_examples_to_install_in_doc})
-
 file(GLOB_RECURSE add_src_files
 "teshsuite/*.c"
 "teshsuite/*.cxx"
@@ -720,50 +694,50 @@ set(txt_files
 "teshsuite/gras/datadesc/datadesc.little64"
 "teshsuite/gras/datadesc/datadesc.big32_8_4"
 "teshsuite/gras/datadesc/mk_datadesc_structs.pl"
-"teshsuite/gras/msg_handle/test_rl"
-"teshsuite/gras/msg_handle/test_sg_32"
-"teshsuite/gras/msg_handle/test_sg_64"
-"teshsuite/gras/empty_main/test_rl"
-"teshsuite/gras/empty_main/test_sg"
-"teshsuite/gras/small_sleep/test_sg_32"
-"teshsuite/gras/small_sleep/test_sg_64"
+"teshsuite/gras/msg_handle/test_rl.tesh"
+"teshsuite/gras/msg_handle/test_sg_32.tesh"
+"teshsuite/gras/msg_handle/test_sg_64.tesh"
+"teshsuite/gras/empty_main/test_rl.tesh"
+"teshsuite/gras/empty_main/test_sg.tesh"
+"teshsuite/gras/small_sleep/test_sg_32.tesh"
+"teshsuite/gras/small_sleep/test_sg_64.tesh"
 "teshsuite/simdag/platforms/bob.fail"
 "teshsuite/simdag/platforms/bob.trace"
 "teshsuite/simdag/platforms/link1.bw"
 "teshsuite/simdag/platforms/link1.fail"
 "teshsuite/simdag/platforms/link1.lat"
-"examples/gras/ping/test_rl"
-"examples/gras/rpc/test_rl"
-"examples/gras/spawn/test_rl"
-"examples/gras/timer/test_rl"
-"examples/gras/chrono/test_rl"
-"examples/gras/mutual_exclusion/simple_token/test_rl"
-"examples/gras/mmrpc/test_rl"
-"examples/gras/all2all/test_rl"
-"examples/gras/pmm/test_rl"
-"examples/gras/synchro/test_rl"
-"examples/gras/properties/test_rl"
-"examples/gras/ping/test_sg_32"
-"examples/gras/rpc/test_sg_32"
-"examples/gras/spawn/test_sg_32"
-"examples/gras/timer/test_sg_32"
-"examples/gras/chrono/test_sg_32"
-"examples/gras/mutual_exclusion/simple_token/test_sg_32"
-"examples/gras/mmrpc/test_sg_32"
-"examples/gras/all2all/test_sg_32"
-"examples/gras/pmm/test_sg_32"
-"examples/gras/synchro/test_sg_32"
-"examples/gras/ping/test_sg_64"
-"examples/gras/rpc/test_sg_64"
-"examples/gras/spawn/test_sg_64"
-"examples/gras/timer/test_sg_64"
-"examples/gras/chrono/test_sg_64"
-"examples/gras/mutual_exclusion/simple_token/test_sg_64"
-"examples/gras/mmrpc/test_sg_64"
-"examples/gras/all2all/test_sg_64"
-"examples/gras/pmm/test_sg_64"
-"examples/gras/synchro/test_sg_64"
-"examples/gras/properties/test_sg"
+"examples/gras/ping/test_rl.tesh"
+"examples/gras/rpc/test_rl.tesh"
+"examples/gras/spawn/test_rl.tesh"
+"examples/gras/timer/test_rl.tesh"
+"examples/gras/chrono/test_rl.tesh"
+"examples/gras/mutual_exclusion/simple_token/test_rl.tesh"
+"examples/gras/mmrpc/test_rl.tesh"
+"examples/gras/all2all/test_rl.tesh"
+"examples/gras/pmm/test_rl.tesh"
+"examples/gras/synchro/test_rl.tesh"
+"examples/gras/properties/test_rl.tesh"
+"examples/gras/ping/test_sg_32.tesh"
+"examples/gras/rpc/test_sg_32.tesh"
+"examples/gras/spawn/test_sg_32.tesh"
+"examples/gras/timer/test_sg_32.tesh"
+"examples/gras/chrono/test_sg_32.tesh"
+"examples/gras/mutual_exclusion/simple_token/test_sg_32.tesh"
+"examples/gras/mmrpc/test_sg_32.tesh"
+"examples/gras/all2all/test_sg_32.tesh"
+"examples/gras/pmm/test_sg_32.tesh"
+"examples/gras/synchro/test_sg_32.tesh"
+"examples/gras/ping/test_sg_64.tesh"
+"examples/gras/rpc/test_sg_64.tesh"
+"examples/gras/spawn/test_sg_64.tesh"
+"examples/gras/timer/test_sg_64.tesh"
+"examples/gras/chrono/test_sg_64.tesh"
+"examples/gras/mutual_exclusion/simple_token/test_sg_64.tesh"
+"examples/gras/mmrpc/test_sg_64.tesh"
+"examples/gras/all2all/test_sg_64.tesh"
+"examples/gras/pmm/test_sg_64.tesh"
+"examples/gras/synchro/test_sg_64.tesh"
+"examples/gras/properties/test_sg.tesh"
 )
 
 set(txt_files
@@ -818,8 +792,9 @@ set(source_to_pack
 	${GRAS_SG_SRC}
 	${AMOK_SRC}
 	${LUA_SRC}
-	${RUBY_SRC}
 	${MC_SRC}
+	${JEDULE_SRC}
+	${RNGSTREAM_SRC}
 	${add_src_files}
 	${include_files}
 	${xml_files}