X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2cc20f1526f80e1c731e986a50c5b77fa7e223d8..4320715baf3e10ac7316fa920fb7659f7748185b:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 544ddcebca..8d22b462f1 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,62 +16,56 @@ 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/mmalloc/attach.c - src/xbt/mmalloc/detach.c - src/xbt/mmalloc/keys.c - src/xbt/mmalloc/mcalloc.c + src/xbt/automatonparse_promela.c src/xbt/mmalloc/mfree.c - src/xbt/mmalloc/mm_legacy.c - src/xbt/mmalloc/mm.c src/xbt/mmalloc/mmalloc.c - src/xbt/mmalloc/mmap-sup.c - src/xbt/mmalloc/mmcheck.c - src/xbt/mmalloc/mmemalign.c - src/xbt/mmalloc/mmprivate.h - src/xbt/mmalloc/mmstats.c - src/xbt/mmalloc/mmtrace.c - src/xbt/mmalloc/mrealloc.c - src/xbt/mmalloc/mvalloc.c - src/xbt/mmalloc/sbrk-sup.c + src/xbt/mmalloc/mmalloc.info + src/xbt/mmalloc/mmalloc.texi + src/xbt/mmalloc/mm.c + src/xbt/mmalloc/mm_diff.c + src/xbt/mmalloc/mm_legacy.c + src/xbt/mmalloc/mm_module.c + src/xbt/mmalloc/mmorecore.c + src/xbt/mmalloc/mmprivate.h + src/xbt/mmalloc/mmtrace.awk + src/xbt/mmalloc/mrealloc.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 + src/surf/storage_private.h src/surf/network_gtnets_private.h src/surf/gtnets/gtnets_interface.h 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 src/include/xbt/xbt_os_time.h - src/include/xbt/xbt_os_thread.h 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 @@ -80,12 +73,13 @@ 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 @@ -95,6 +89,17 @@ set(EXTRA_DIST examples/gras/ping/ping.h examples/gras/console/ping.h examples/gras/mmrpc/mmrpc.h + + examples/msg/mc/parserPromela.yacc + examples/msg/mc/parserPromela.lex + examples/msg/mc/automaton.h + examples/msg/mc/bugged1_liveness.h + examples/msg/mc/centralized_liveness.h + examples/msg/mc/automatonparse_promela.h + examples/msg/mc/bugged2_liveness.h + examples/msg/mc/y.tab.h + + examples/platforms/content/storage_content.txt tools/gras/gras_stub_generator.h tools/tesh/run_context.h @@ -103,6 +108,8 @@ set(EXTRA_DIST 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 @@ -134,8 +141,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 @@ -180,6 +185,19 @@ set(XBT_SRC 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) @@ -200,17 +218,22 @@ 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_none.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 @@ -219,14 +242,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 ) @@ -243,17 +267,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 ) @@ -279,6 +305,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 @@ -289,15 +316,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 @@ -317,23 +335,34 @@ set(AMOK_SRC src/amok/PeerManagement/peermanagement.c ) +set(BINDINGS_SRC + src/bindings/bindings_global.c +) + 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_surf.c src/instr/instr_smpi.c - src/instr/instr_simdag.c src/instr/instr_resource_utilization.c src/instr/instr_private.h ) @@ -358,7 +387,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 @@ -401,7 +431,15 @@ set(headers_to_install 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/xbt/socket.h + include/xbt/file_stat.h + include/xbt/xbt_os_thread.h + include/simgrid/platf.h + include/simgrid/modelchecker.h + include/simgrid/simix.h include/msg/msg.h include/msg/datatypes.h include/simdag/simdag.h @@ -413,7 +451,6 @@ set(headers_to_install 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 include/gras/emul.h @@ -426,9 +463,6 @@ set(headers_to_install include/instr/instr.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 @@ -488,6 +522,7 @@ set(simgrid_sources ${GRAS_COMMON_SRC} ${GRAS_SG_SRC} ${AMOK_SRC} + ${BINDINGS_SRC} ${JEDULE_SRC} ${RNGSTREAM_SRC} ) @@ -539,6 +574,8 @@ endif(${HAVE_LUA}) file(GLOB_RECURSE examples_to_install_in_doc "examples/*.c" "examples/*.h" +"examples/*yacc" +"examples/*lex" "examples/*.cxx" "examples/*.hpp" "examples/*.rb" @@ -547,16 +584,14 @@ file(GLOB_RECURSE examples_to_install_in_doc "examples/*.xml" "examples/*README" ) - + set(DOC_SOURCES - doc/contrib.doc - doc/FAQ.doc - doc/installSimgrid.doc + doc/install.doc doc/bindings.doc doc/options.doc doc/use.doc - doc/gtnets.doc - doc/ns3.doc + doc/tracing.doc + doc/pls.doc doc/gtut-howto-design.doc doc/gtut-howto.doc doc/gtut-introduction.doc @@ -580,9 +615,10 @@ 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.doc + ${CMAKE_HOME_DIRECTORY}/doc/logcategories.doc doc/module-amok.doc doc/module-gras.doc doc/module-msg.doc @@ -590,8 +626,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 @@ -632,10 +666,8 @@ 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_2011.png doc/webcruft/simgrid_logo_small.png - doc/webcruft/fish.gif doc/triva-graph_configuration.png doc/triva-graph_visualization.png doc/simgrid.css @@ -643,13 +675,11 @@ set(DOC_SOURCES 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 ) @@ -661,10 +691,6 @@ set(DOC_FIGS ${CMAKE_HOME_DIRECTORY}/doc/fig/gras_comm.fig ) -set(DOC_bib - ${CMAKE_HOME_DIRECTORY}/doc/all.bib -) - file(GLOB_RECURSE add_src_files "teshsuite/*.c" "teshsuite/*.cxx" @@ -693,7 +719,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 xml_files @@ -719,7 +744,6 @@ set(txt_files "testsuite/surf/trace_A.txt" "testsuite/surf/trace_B.txt" "examples/smpi/hostfile" -"examples/msg/trace/file.trace" "examples/msg/link5_state.trace" "examples/msg/fafard_state.trace" "examples/msg/jupiter_state.trace" @@ -744,6 +768,7 @@ set(txt_files "teshsuite/gras/empty_main/test_sg.tesh" "teshsuite/gras/small_sleep/test_sg_32.tesh" "teshsuite/gras/small_sleep/test_sg_64.tesh" +"teshsuite/msg/trace/file.trace" "teshsuite/simdag/platforms/bob.fail" "teshsuite/simdag/platforms/bob.trace" "teshsuite/simdag/platforms/bob0_availability_file.trace" @@ -854,7 +879,6 @@ set(source_to_pack ${bin_files} ${DOC_SOURCES} ${DOC_FIGS} - ${DOC_bib} ${README_files} buildtools/Cmake/simgrid.nsi.in )