Split surf_routing.c

[simgrid.git] / buildtools / Cmake / DefinePackages.cmake

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index b8331bc..8378442 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -166,6 +166,7 @@ set(XBT_SRC
        src/xbt/setset.c
        src/xbt/parmap.c
        src/xbt/xbt_replay_trace_reader.c
+       src/xbt/lib.c
 )
 
 if(HAVE_MMAP)
@@ -186,6 +187,11 @@ set(SURF_SRC
        src/surf/surf_model.c
        src/surf/surf_action.c
        src/surf/surf_routing.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_config.c
        src/surf/maxmin.c
        src/surf/fair_bottleneck.c
@@ -327,14 +333,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 +345,7 @@ set(MC_SRC
 )
 
 set(RNGSTREAM_SRC
+       src/rngstreams/RngStream.h
        src/rngstreams/RngStream.c
 )
 
@@ -455,7 +454,6 @@ else(HAVE_GTNETS)
        )
 endif(HAVE_GTNETS)
 
-
 ### Simgrid Lib sources
 set(simgrid_sources
        ${XBT_SRC}
@@ -479,6 +477,16 @@ if(HAVE_MC)
                )
 endif(HAVE_MC)
 
+# WINDOWS
+if(WIN32)
+       set(simgrid_sources
+               ${simgrid_sources}
+               src/xbt/win32_ucontext.c
+               src/xbt/xbt_os_thread.c
+               src/simix/smx_context_thread.c
+               )
+endif(WIN32)
+
 ### Gras Lib sources
 set(gras_sources
        ${XBT_SRC}
@@ -499,21 +507,6 @@ 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"
@@ -552,7 +545,7 @@ set(DOC_SOURCES
        doc/gtut-tour.doc
        doc/gtut-tour-recap-messages.doc
        doc/history.doc
-       doc/index-API.doc
+       #doc/index-API.doc
        doc/index.doc
        doc/module-amok.doc
        doc/module-gras.doc
@@ -716,50 +709,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
@@ -814,8 +807,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}