X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0da6595ee68093903e46a1c46d30a792f0dd6ed3..98c0dbd4424a6a8177167b573791d25dd01b447d:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index c485b48317..73dd6acb88 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -8,7 +8,6 @@ set(EXTRA_DIST src/xbt/fifo_private.h src/xbt/graph_private.h src/xbt/graphxml_parse.c - src/xbt/graphxml.l src/xbt/graphxml.c src/xbt/graphxml.dtd src/xbt/log_private.h @@ -17,7 +16,7 @@ set(EXTRA_DIST src/xbt/backtrace_windows.c src/xbt/backtrace_dummy.c src/xbt/setset_private.h - src/xbt/parmap_private.h + src/xbt/automatonparse_promela.c src/xbt/mmalloc/attach.c src/xbt/mmalloc/detach.c src/xbt/mmalloc/keys.c @@ -36,11 +35,12 @@ set(EXTRA_DIST src/xbt/mmalloc/mvalloc.c src/xbt/mmalloc/sbrk-sup.c src/xbt/mmalloc/test/mmalloc_test.c + src/xbt/datadesc/ddt_parse.yy.l + src/xbt/datadesc/ddt_parse.yy.h src/surf/maxmin_private.h src/surf/trace_mgr_private.h src/surf/surf_private.h src/surf/surfxml_parse.c - src/surf/simgrid_dtd.l src/surf/simgrid_dtd.c src/surf/simgrid.dtd src/surf/network_private.h @@ -49,12 +49,14 @@ 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/simgrid/platf_interface.h src/include/surf/surf_resource.h src/include/surf/datatypes.h src/include/surf/maxmin.h src/include/surf/trace_mgr.h src/include/surf/surf.h - src/include/surf/surfxml_parse_private.h + src/include/surf/surfxml_parse_values.h src/include/surf/random_mgr.h src/include/surf/surf_resource_lmm.h src/include/xbt/wine_dbghelp.h @@ -63,15 +65,12 @@ set(EXTRA_DIST src/include/mc/datatypes.h src/include/mc/mc.h src/include/simix/context.h - src/msg/private.h - src/msg/mailbox.h + src/msg/msg_private.h + src/msg/msg_mailbox.h src/simdag/private.h src/simdag/dax.dtd - src/simdag/dax_dtd.l src/simdag/dax_dtd.h src/simdag/dax_dtd.c - src/gras/DataDesc/ddt_parse.yy.l - src/gras/DataDesc/ddt_parse.yy.h src/gras/Virtu/virtu_rl.h src/gras/Virtu/virtu_sg.h src/gras/Virtu/virtu_interface.h @@ -79,17 +78,32 @@ set(EXTRA_DIST src/gras/Transport/transport_interface.h src/amok/Bandwidth/bandwidth_private.h src/amok/amok_modinter.h - src/simix/private.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/simix/smx_private.h + src/simix/smx_process_private.h + src/simix/smx_host_private.h + src/simix/smx_network_private.h + src/simix/smx_smurf_private.h + src/simix/smx_synchro_private.h + src/simix/smx_io_private.h src/smpi/private.h src/smpi/smpi_mpi_dt_private.h src/smpi/README src/mk_supernovae.pl + + examples/gras/ping/ping.h + examples/gras/console/ping.h + examples/gras/mmrpc/mmrpc.h + + tools/gras/gras_stub_generator.h + tools/tesh/run_context.h + tools/tesh/tesh.h + + src/surf/network_ns3_private.h + src/surf/ns3/ns3_interface.h + src/surf/ns3/ns3_simulator.h + src/surf/ns3/my-point-to-point-helper.h + src/surf/ns3/red-queue.h ) set(XBT_RL_SRC @@ -121,8 +135,6 @@ set(GRAS_RL_SRC src/gras/rl_stubs.c src/xbt/xbt_os_thread.c src/gras/Transport/rl_transport.c - src/gras/Transport/transport_plugin_file.c - src/gras/Transport/transport_plugin_tcp.c src/gras/Virtu/rl_emul.c src/gras/Virtu/rl_process.c src/gras/Virtu/rl_dns.c @@ -166,6 +178,20 @@ set(XBT_SRC src/xbt/setset.c src/xbt/parmap.c src/xbt/xbt_replay_trace_reader.c + src/xbt/lib.c + src/xbt/automaton.c + src/xbt/datadesc/ddt_create.c + src/xbt/datadesc/ddt_convert.c + src/xbt/datadesc/ddt_exchange.c + src/xbt/datadesc/cbps.c + src/xbt/datadesc/datadesc.c + src/xbt/datadesc/datadesc_interface.h + src/xbt/datadesc/datadesc_private.h + src/xbt/datadesc/ddt_parse.c + src/xbt/datadesc/ddt_parse.yy.c + src/xbt/xbt_socket.c + src/xbt/xbt_socket_private.h + src/xbt/xbt_trp_plugin_tcp.c ) if(HAVE_MMAP) @@ -182,10 +208,26 @@ 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 + src/surf/ns3/red-queue.cc + src/surf/ns3/my-point-to-point-helper.cc +) + set(SURF_SRC src/surf/surf_model.c src/surf/surf_action.c src/surf/surf_routing.c + src/surf/surf_routing_none.c + src/surf/surf_routing_generic.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_cluster.c + src/surf/surf_routing_vivaldi.c src/surf/surf_config.c src/surf/maxmin.c src/surf/fair_bottleneck.c @@ -194,14 +236,15 @@ set(SURF_SRC src/surf/random_mgr.c src/surf/surf.c src/surf/surfxml_parse.c - src/surf/cpu.c + src/surf/surfxml_parseplatf.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 src/surf/cpu_ti.c - src/surf/cpu_im.c + src/surf/cpu_cas01.c + src/surf/sg_platf.c + src/surf/storage.c src/xbt/xbt_sg_stubs.c ) @@ -218,17 +261,19 @@ set(SIMIX_SRC src/simix/smx_user.c src/simix/smx_smurf.c src/simix/smx_context_raw.c + src/simix/smx_io.c ) set(MSG_SRC src/msg/msg_config.c - src/msg/task.c - src/msg/host.c - src/msg/m_process.c - src/msg/gos.c - src/msg/global.c - src/msg/environment.c - src/msg/deployment.c + src/msg/msg_task.c + src/msg/msg_host.c + src/msg/msg_io.c + src/msg/msg_process.c + src/msg/msg_gos.c + src/msg/msg_global.c + src/msg/msg_environment.c + src/msg/msg_deployment.c src/msg/msg_mailbox.c src/msg/msg_actions.c ) @@ -254,6 +299,7 @@ set(GRAS_COMMON_SRC src/gras/gras.c src/gras/Transport/transport.c src/gras/Transport/transport_private.h + src/gras/Transport/transport_plugin_file.c src/gras/Msg/gras_msg_mod.c src/gras/Msg/gras_msg_types.c src/gras/Msg/gras_msg_exchange.c @@ -264,15 +310,6 @@ set(GRAS_COMMON_SRC src/gras/Msg/msg_private.h src/gras/Virtu/process.c src/gras/Virtu/gras_module.c - src/gras/DataDesc/ddt_create.c - src/gras/DataDesc/ddt_convert.c - src/gras/DataDesc/ddt_exchange.c - src/gras/DataDesc/cbps.c - src/gras/DataDesc/datadesc.c - src/gras/DataDesc/datadesc_interface.h - src/gras/DataDesc/datadesc_private.h - src/gras/DataDesc/ddt_parse.c - src/gras/DataDesc/ddt_parse.yy.c ) set(GRAS_SG_SRC @@ -294,20 +331,26 @@ set(AMOK_SRC set(LUA_SRC src/bindings/lua/simgrid_lua.c + src/bindings/lua/lua_task.c + src/bindings/lua/lua_comm.c + src/bindings/lua/lua_host.c + src/bindings/lua/lua_process.c + src/bindings/lua/lua_platf.c + src/bindings/lua/lua_utils.c + src/bindings/lua/lua_state_cloner.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 src/instr/instr_interface.c - src/instr/instr_paje.c src/instr/instr_paje_trace.c + src/instr/instr_paje_types.c + src/instr/instr_paje_values.c + src/instr/instr_paje_containers.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 @@ -335,7 +378,8 @@ set(MC_SRC src/mc/mc_global.c src/mc/mc_dpor.c src/mc/mc_request.c - src/mc/private.h + src/mc/mc_private.h + src/mc/mc_liveness.c ) set(RNGSTREAM_SRC @@ -343,7 +387,7 @@ set(RNGSTREAM_SRC src/rngstreams/RngStream.c ) -set(install_HEADERS +set(headers_to_install include/xbt/misc.h include/xbt/sysdep.h include/xbt/virtu.h @@ -363,6 +407,7 @@ set(install_HEADERS include/xbt/graph.h include/xbt/fifo.h include/xbt/swag.h + include/xbt/lib.h include/xbt/matrix.h include/xbt/peer.h include/xbt/config.h @@ -377,18 +422,22 @@ set(install_HEADERS include/xbt/mmalloc.h include/xbt/replay_trace_reader.h include/xbt/parmap.h - include/mc/modelchecker.h + include/xbt/automaton.h + include/xbt/automatonparse_promela.h + include/xbt/datadesc.h + include/simgrid/platf.h + include/simgrid/modelchecker.h include/msg/msg.h include/msg/datatypes.h include/simdag/simdag.h include/simdag/datatypes.h include/smpi/smpi.h - ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h include/smpi/mpi.h include/smpi/mpif.h + include/smpi/smpi_cocci.h include/surf/surfxml_parse.h include/surf/simgrid_dtd.h - include/gras/datadesc.h + include/surf/surf_routing.h include/gras/transport.h include/gras/virtu.h include/gras/emul.h @@ -399,13 +448,16 @@ set(install_HEADERS include/amok/peermanagement.h include/amok/bandwidth.h include/instr/instr.h - ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h include/gras.h include/xbt.h include/simix/simix.h include/simix/datatypes.h include/simix/context.h ) +set(source_of_generated_headers + include/simgrid_config.h.in + include/smpi/smpif.h.in + src/context_sysv_config.h.in) ### depend of some variables setted upper # -->CONTEXT_THREADS CONTEXT_UCONTEXT @@ -448,7 +500,6 @@ else(HAVE_GTNETS) ) endif(HAVE_GTNETS) - ### Simgrid Lib sources set(simgrid_sources ${XBT_SRC} @@ -472,6 +523,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} @@ -504,13 +572,20 @@ file(GLOB_RECURSE examples_to_install_in_doc "examples/*README" ) + + set(DOC_SOURCES - doc/contrib.doc - doc/FAQ.doc + doc/install.doc + doc/bindings.doc + doc/options.doc + doc/use.doc + doc/tracing.doc + doc/pls.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 @@ -529,8 +604,8 @@ set(DOC_SOURCES doc/gtut-tour-16-exchangecb.doc 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 @@ -539,8 +614,6 @@ set(DOC_SOURCES doc/modules.doc doc/module-surf.doc doc/module-xbt.doc - doc/people.doc - doc/publis.doc doc/gtut-files/01-bones.c doc/gtut-files/01-bones.output @@ -581,20 +654,20 @@ set(DOC_SOURCES doc/webcruft/Paje_MSG_screenshot.jpg doc/webcruft/Paje_MSG_screenshot_thn.jpg doc/webcruft/poster_thumbnail.png - doc/webcruft/robots.txt doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png + doc/triva-graph_configuration.png + doc/triva-graph_visualization.png + doc/simgrid.css doc/Doxyfile.in doc/footer.html.in - tools/doxygen/bibtex2html_table_count.pl tools/doxygen/doxygen_postprocesser.pl tools/doxygen/index_create.pl tools/doxygen/toc_create.pl tools/doxygen/bibtex2html_wrapper.pl tools/doxygen/fig2dev_postprocessor.pl - tools/doxygen/index_php.pl tools/doxygen/xbt_log_extract_hierarchy.pl ) @@ -634,18 +707,6 @@ set(add_src_files src/smpi/smpif2c.in src/smpi/smpiff.in src/smpi/smpirun.in - src/simix/smx_context_sysv_private.h -) - -file(GLOB_RECURSE include_files -"include/*.h" -"teshsuite/*.h" -"testsuite/*.h" -"tools/*.h" -"examples/*.h" -"examples/*.hpp" -"src/*.h.in" -"include/*.h.in" ) file(GLOB_RECURSE xml_files @@ -671,13 +732,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" @@ -703,6 +759,10 @@ set(txt_files "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/bob0_state_file.trace" +"teshsuite/simdag/platforms/bob2_availability_file.trace" +"teshsuite/simdag/platforms/bob2_state_file.trace" "teshsuite/simdag/platforms/link1.bw" "teshsuite/simdag/platforms/link1.fail" "teshsuite/simdag/platforms/link1.lat" @@ -759,6 +819,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" @@ -775,14 +836,17 @@ 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 + ${headers_to_install} + ${source_of_generated_headers} ${XBT_RL_SRC} ${EXTRA_DIST} ${SMPI_SRC} ${GRAS_RL_SRC} ${XBT_SRC} ${GTNETS_SRC} + ${NS3_SRC} ${SURF_SRC} ${SIMIX_SRC} ${TRACING_SRC} @@ -796,14 +860,13 @@ set(source_to_pack ${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} ${README_files} + buildtools/Cmake/simgrid.nsi.in )