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

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index a32ed9d356..be8b4dbad6 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -140,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
@@ -293,12 +292,6 @@ set(AMOK_SRC
 	src/amok/PeerManagement/peermanagement.c
 )
 
-set(LUA_SRC
-	src/bindings/lua/simgrid_lua.c
-	src/bindings/lua/lua_stub_generator.c
-	src/bindings/lua/lua_console.c
-)
-
 set(TRACING_SRC
 	src/instr/instr_routing.c
 	src/instr/instr_config.c
@@ -328,14 +321,6 @@ set(JEDULE_SRC
 	src/instr/jedule/jedule_sd_binding.c
 )
 
-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(MC_SRC
 	src/mc/mc_memory.c
 	src/mc/mc_checkpoint.c
@@ -347,6 +332,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
@@ -411,33 +401,6 @@ set(install_HEADERS
 	include/simix/context.h
 )
 
-if(enable_java)
-set(install_HEADERS
-	${install_HEADERS}
-	#Those src files are necessary for binding java 
-	src/portable.h
-	src/msg/private.h
-	src/simix/private.h
-	src/msg/mailbox.h
-	src/include/surf/surf.h
-	src/instr/instr_private.h
-	src/include/surf/datatypes.h
-	src/include/surf/surf_resource_lmm.h
-	src/include/surf/surf_resource.h
-	src/simdag/private.h
-	src/xbt/ex_interface.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/include/surf/trace_mgr.h
-	src/include/xbt/xbt_os_thread.h
-	src/include/surf/maxmin.h
-	include/xbt/swag.h
-	${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h)
-endif(enable_java)
-
 ### depend of some variables setted upper
 # -->CONTEXT_THREADS CONTEXT_UCONTEXT
 if(${CONTEXT_THREADS}) #pthread
@@ -493,6 +456,7 @@ set(simgrid_sources
 	${GRAS_SG_SRC}
 	${AMOK_SRC}
 	${JEDULE_SRC}
+	${RNGSTREAM_SRC}
 )
 
 if(HAVE_MC)
@@ -510,41 +474,11 @@ set(gras_sources
 	${AMOK_SRC}
 )
 
-if(${HAVE_LUA})
-  	set(simgrid_sources
-		${simgrid_sources}
-		${LUA_SRC}
-	)
-elseif(${HAVE_LUA})
-  	set(EXTRA_DIST
-		${EXTRA_DIST}
-		${LUA_SRC}
-	)
-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/*.rb"
-"examples/*.lua"
-"examples/*.java"
 "examples/*.xml"
 "examples/*README"
 )
@@ -663,11 +597,7 @@ file(GLOB_RECURSE add_src_files
 "tools/*CMakeLists.txt"
 "examples/*.c"
 "examples/*.cxx"
-"examples/*.lua"
-"examples/*.rb"
 "examples/*CMakeLists.txt"
-"src/bindings/*.lua"
-"src/bindings/*.rb"
 "src/bindings/*.c"
 "src/bindings/*.h"
 "src/bindings/*CMakeLists.txt"
@@ -739,50 +669,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
@@ -836,9 +766,9 @@ set(source_to_pack
 	${GRAS_COMMON_SRC}
 	${GRAS_SG_SRC}
 	${AMOK_SRC}
-	${LUA_SRC}
-	${RUBY_SRC}
 	${MC_SRC}
+	${JEDULE_SRC}
+	${RNGSTREAM_SRC}
 	${add_src_files}
 	${include_files}
 	${xml_files}