X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/debd23d022bac4392bf3847e611b81cfd4915ffc..da4bf1f243904e1d10973f5165c8581bd38e433a:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index e8726bfc49..7e96397902 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -49,6 +49,7 @@ set(EXTRA_DIST src/surf/gtnets/gtnets_simulator.h src/surf/gtnets/gtnets_topology.h src/surf/cpu_ti_private.h + src/surf/surf_routing_private.h src/include/surf/surf_resource.h src/include/surf/datatypes.h src/include/surf/maxmin.h @@ -108,6 +109,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 +141,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 @@ -165,6 +166,8 @@ set(XBT_SRC src/xbt/graphxml_parse.c src/xbt/setset.c src/xbt/parmap.c + src/xbt/xbt_replay_trace_reader.c + src/xbt/lib.c ) if(HAVE_MMAP) @@ -181,10 +184,21 @@ set(GTNETS_SRC src/surf/network_gtnets.c ) +set(NS3_SRC + src/surf/network_ns3.c + src/surf/ns3/ns3_interface.cc + src/surf/ns3/ns3_simulator.cc + ) + 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 @@ -195,6 +209,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 @@ -216,10 +231,6 @@ set(SIMIX_SRC src/simix/smx_user.c src/simix/smx_smurf.c src/simix/smx_context_raw.c - src/replay/replay.h - src/replay/replay.c - src/replay/state_machine_context.c - src/replay/replay_trace_reader.c ) set(MSG_SRC @@ -301,9 +312,11 @@ set(LUA_SRC ) set(TRACING_SRC + src/instr/instr_routing.c 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 @@ -311,17 +324,20 @@ set(TRACING_SRC 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 - 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 @@ -335,6 +351,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 @@ -367,17 +388,20 @@ 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 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 include/surf/simgrid_dtd.h + include/surf/surf_routing.h include/gras/datadesc.h include/gras/transport.h include/gras/virtu.h @@ -438,7 +462,6 @@ else(HAVE_GTNETS) ) endif(HAVE_GTNETS) - ### Simgrid Lib sources set(simgrid_sources ${XBT_SRC} @@ -451,6 +474,8 @@ set(simgrid_sources ${GRAS_COMMON_SRC} ${GRAS_SG_SRC} ${AMOK_SRC} + ${JEDULE_SRC} + ${RNGSTREAM_SRC} ) if(HAVE_MC) @@ -460,6 +485,23 @@ if(HAVE_MC) ) endif(HAVE_MC) +if(HAVE_NS3) + set(simgrid_sources + ${simgrid_sources} + ${NS3_SRC} + ) +endif(HAVE_NS3) + +# 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} @@ -480,49 +522,26 @@ 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 + doc/FAQ.doc doc/gtut-howto-design.doc doc/gtut-howto.doc doc/gtut-introduction.doc doc/gtut-main.doc + doc/gtut-tour-00-install.doc doc/gtut-tour-01-bones.doc doc/gtut-tour-02-simple.doc doc/gtut-tour-03-args.doc @@ -542,7 +561,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 @@ -596,6 +615,10 @@ set(DOC_SOURCES doc/webcruft/robots.txt doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png + doc/webcruft/fish.gif + doc/triva-graph_configuration.png + doc/triva-graph_visualization.png + doc/simgrid.css doc/Doxyfile.in doc/footer.html.in @@ -618,19 +641,9 @@ 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}) +set(DOC_bib + ${CMAKE_HOME_DIRECTORY}/doc/all.bib +) file(GLOB_RECURSE add_src_files "teshsuite/*.c" @@ -697,13 +710,8 @@ set(txt_files "testsuite/surf/trace_A.txt" "testsuite/surf/trace_B.txt" "examples/smpi/hostfile" -"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" @@ -720,50 +728,51 @@ 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/bob0_availability_file.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 @@ -785,6 +794,7 @@ file(GLOB_RECURSE README_files string(REPLACE "${CMAKE_HOME_DIRECTORY}/" "" README_files "${README_files}") file(GLOB_RECURSE CMAKE_SOURCE_FILES +"buildtools/Cmake/Makefile.default" "buildtools/Cmake/test_java.sh" "buildtools/Cmake/*.cmake" "buildtools/Cmake/*.h.in" @@ -801,8 +811,9 @@ tools/simgrid_update_xml.pl buildtools/Cmake/tesh.pl ) -# This is the complete lise of what will be added to the source archive +# This is the complete list of what will be added to the source archive set(source_to_pack + ${install_HEADERS} ${XBT_RL_SRC} ${EXTRA_DIST} ${SMPI_SRC} @@ -818,17 +829,18 @@ 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} ${tesh_files} ${txt_files} - ${EXTRA_DIST} ${CMAKE_SOURCE_FILES} ${bin_files} ${DOC_SOURCES} ${DOC_FIGS} + ${DOC_bib} ${README_files} )