X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2851c17a93adcd3931c937b698b65f81400c6dc3..88425d917174073213cea8943fa31eb0049cb84d:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 4f6b7a0146..985e9a995d 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -1,16 +1,11 @@ ### define source packages set(EXTRA_DIST - src/amok/Bandwidth/bandwidth_private.h - src/amok/amok_modinter.h - src/gras/Transport/transport_interface.h - src/gras/Virtu/virtu_interface.h - src/gras/Virtu/virtu_private.h - src/gras/Virtu/virtu_rl.h - src/gras/Virtu/virtu_sg.h + src/include/instr/instr_interface.h src/include/mc/datatypes.h src/include/mc/mc.h src/include/simgrid/platf_interface.h + src/include/simgrid/sg_config.h src/include/surf/datatypes.h src/include/surf/maxmin.h src/include/surf/random_mgr.h @@ -67,8 +62,6 @@ set(EXTRA_DIST src/xbt/backtrace_dummy.c src/xbt/backtrace_linux.c src/xbt/backtrace_windows.c - src/xbt/datadesc/ddt_parse.yy.h - src/xbt/datadesc/ddt_parse.yy.l src/xbt/dict_private.h src/xbt/ex_interface.h src/xbt/fifo_private.h @@ -92,22 +85,15 @@ set(EXTRA_DIST src/xbt/mmalloc/mmtrace.awk src/xbt/mmalloc/mrealloc.c src/xbt/setset_private.h - tools/gras/gras_stub_generator.h + src/win32/config.h + src/xbt/win32_ucontext.c + include/xbt/win32_ucontext.h tools/tesh/run_context.h tools/tesh/tesh.h ) -set(XBT_RL_SRC - src/xbt/xbt_rl_synchro.c - src/xbt/xbt_rl_time.c - ) - -set(XBT_SG_SRC - src/xbt/xbt_sg_synchro.c - src/xbt/xbt_sg_time.c - ) - set(SMPI_SRC + src/smpi/instr_smpi.c src/smpi/smpi_base.c src/smpi/smpi_bench.c src/smpi/smpi_c99.c @@ -126,35 +112,20 @@ if(SMPI_F2C) ${SMPI_SRC} src/smpi/smpi_f77.c ) -endif(SMPI_F2C) - -set(GRAS_RL_SRC - ${XBT_RL_SRC} - src/gras/Msg/rl_msg.c - src/gras/Transport/rl_transport.c - src/gras/Virtu/rl_dns.c - src/gras/Virtu/rl_emul.c - src/gras/Virtu/rl_process.c - src/gras/rl_stubs.c - src/xbt/xbt_os_thread.c +else() + set(EXTRA_DIST + ${EXTRA_DIST} + src/smpi/smpi_f77.c ) +endif() + set(XBT_SRC - src/gras_modinter.h src/xbt/RngStream.c src/xbt/automaton/automaton.c src/xbt/automaton/automatonparse_promela.c src/xbt/config.c src/xbt/cunit.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_convert.c - src/xbt/datadesc/ddt_create.c - src/xbt/datadesc/ddt_exchange.c - src/xbt/datadesc/ddt_parse.c - src/xbt/datadesc/ddt_parse.yy.c src/xbt/dict.c src/xbt/dict_cursor.c src/xbt/dict_elm.c @@ -182,13 +153,10 @@ set(XBT_SRC src/xbt/xbt_peer.c src/xbt/xbt_queue.c src/xbt/xbt_replay.c + src/xbt/xbt_sg_synchro.c src/xbt/xbt_sha.c - src/xbt/xbt_socket.c - src/xbt/xbt_socket_private.h src/xbt/xbt_str.c src/xbt/xbt_strbuff.c - src/xbt/xbt_synchro.c - src/xbt/xbt_trp_plugin_tcp.c src/xbt/xbt_virtu.c src/xbt_modinter.h ) @@ -198,7 +166,7 @@ if(HAVE_MMAP) ${XBT_SRC} src/xbt/mmalloc/mm.c ) -endif(HAVE_MMAP) +endif() set(GTNETS_SRC src/surf/gtnets/gtnets_interface.cc @@ -219,6 +187,8 @@ set(SURF_SRC src/surf/cpu_cas01.c src/surf/cpu_ti.c src/surf/fair_bottleneck.c + src/surf/instr_routing.c + src/surf/instr_surf.c src/surf/lagrange.c src/surf/maxmin.c src/surf/network.c @@ -229,7 +199,6 @@ set(SURF_SRC src/surf/storage.c src/surf/surf.c src/surf/surf_action.c - src/surf/surf_config.c src/surf/surf_model.c src/surf/surf_routing.c src/surf/surf_routing_cluster.c @@ -264,9 +233,14 @@ set(SIMIX_SRC src/simix/smx_user.c ) +set(SIMGRID_SRC + src/simgrid/sg_config.c + ) + set(MSG_SRC + src/msg/instr_msg_process.c + src/msg/instr_msg_task.c src/msg/msg_actions.c - src/msg/msg_config.c src/msg/msg_deployment.c src/msg/msg_environment.c src/msg/msg_global.c @@ -309,12 +283,6 @@ set(EXTRA_DIST ) #* ****************************************************************************************** *# -set(PLATFGEN_SRC - include/simgrid/platf_generator.h - src/surf/platf_generator.c - src/surf/platf_generator_private.h - ) - set(SIMDAG_SRC src/simdag/sd_daxloader.c src/simdag/sd_global.c @@ -326,45 +294,11 @@ if(HAVE_GRAPHVIZ) set(SIMDAG_SRC ${SIMDAG_SRC} src/simdag/sd_dotloader.c ) -else(HAVE_GRAPHVIZ) +else() set(EXTRA_DIST ${EXTRA_DIST} src/simdag/sd_dotloader.c ) -endif(HAVE_GRAPHVIZ) - -set(GRAS_COMMON_SRC - src/gras/Msg/gras_msg_exchange.c - src/gras/Msg/gras_msg_listener.c - src/gras/Msg/gras_msg_mod.c - src/gras/Msg/gras_msg_types.c - src/gras/Msg/msg_interface.h - src/gras/Msg/msg_private.h - src/gras/Msg/rpc.c - src/gras/Msg/timer.c - src/gras/Transport/transport.c - src/gras/Transport/transport_plugin_file.c - src/gras/Transport/transport_private.h - src/gras/Virtu/gras_module.c - src/gras/Virtu/process.c - src/gras/gras.c - ) - -set(GRAS_SG_SRC - ${XBT_SG_SRC} - src/gras/Msg/sg_msg.c - src/gras/Transport/sg_transport.c - src/gras/Transport/transport_plugin_sg.c - src/gras/Virtu/sg_dns.c - src/gras/Virtu/sg_emul.c - src/gras/Virtu/sg_process.c - ) - -set(AMOK_SRC - src/amok/Bandwidth/bandwidth.c - src/amok/Bandwidth/saturate.c - src/amok/PeerManagement/peermanagement.c - src/amok/amok_base.c - ) +endif() set(BINDINGS_SRC src/bindings/bindings_global.c @@ -380,7 +314,6 @@ set(LUA_SRC src/bindings/lua/lua_platf.c src/bindings/lua/lua_process.c src/bindings/lua/lua_state_cloner.c - src/bindings/lua/lua_stub_generator.c src/bindings/lua/lua_task.c src/bindings/lua/lua_utils.c src/bindings/lua/simgrid_lua.c @@ -389,8 +322,6 @@ set(LUA_SRC set(TRACING_SRC src/instr/instr_config.c src/instr/instr_interface.c - src/instr/instr_msg_process.c - src/instr/instr_msg_task.c src/instr/instr_paje_containers.c src/instr/instr_paje_trace.c src/instr/instr_paje_header.c @@ -398,9 +329,6 @@ set(TRACING_SRC src/instr/instr_paje_values.c src/instr/instr_private.h src/instr/instr_resource_utilization.c - src/instr/instr_routing.c - src/instr/instr_smpi.c - src/instr/instr_surf.c ) set(JEDULE_SRC @@ -425,20 +353,9 @@ set(MC_SRC src/mc/mc_request.c src/mc/mc_state.c src/mc/memory_map.c - src/mc/test/heap_comparison.c ) set(headers_to_install - include/amok/bandwidth.h - include/amok/peermanagement.h - include/gras.h - include/gras/emul.h - include/gras/messages.h - include/gras/module.h - include/gras/process.h - include/gras/timer.h - include/gras/transport.h - include/gras/virtu.h include/instr/instr.h include/msg/datatypes.h include/msg/msg.h @@ -461,7 +378,6 @@ set(headers_to_install include/xbt/automaton.h include/xbt/config.h include/xbt/cunit.h - include/xbt/datadesc.h include/xbt/dict.h include/xbt/dynar.h include/xbt/ex.h @@ -486,14 +402,11 @@ set(headers_to_install include/xbt/replay.h include/xbt/set.h include/xbt/setset.h - include/xbt/socket.h include/xbt/str.h include/xbt/strbuff.h include/xbt/swag.h - include/xbt/synchro.h include/xbt/synchro_core.h include/xbt/sysdep.h - include/xbt/time.h include/xbt/virtu.h include/xbt/xbt_os_thread.h ) @@ -510,69 +423,90 @@ if(${CONTEXT_THREADS}) #pthread src/simix/smx_context_thread.c src/xbt/xbt_os_thread.c ) -else(${CONTEXT_THREADS}) # NOT pthread +else() # NOT pthread set(EXTRA_DIST ${EXTRA_DIST} src/simix/smx_context_thread.c src/xbt/xbt_os_thread.c ) -endif(${CONTEXT_THREADS}) +endif() if(${CONTEXT_UCONTEXT}) #ucontext set(SURF_SRC ${SURF_SRC} src/simix/smx_context_sysv.c ) -else(${CONTEXT_UCONTEXT}) # NOT ucontext +else() # NOT ucontext set(EXTRA_DIST ${EXTRA_DIST} src/simix/smx_context_sysv.c ) -endif(${CONTEXT_UCONTEXT}) +endif() # -->HAVE_GTNETS if(HAVE_GTNETS) set(GTNETS_USED ${GTNETS_SRC} ) -else(HAVE_GTNETS) +else() set(GTNETS_USED "") set(EXTRA_DIST ${EXTRA_DIST} ${GTNETS_SRC} ) -endif(HAVE_GTNETS) +endif() ### Simgrid Lib sources set(simgrid_sources - ${AMOK_SRC} ${BINDINGS_SRC} - ${GRAS_COMMON_SRC} - ${GRAS_SG_SRC} ${GTNETS_USED} - ${JEDULE_SRC} ${MSG_SRC} ${SIMDAG_SRC} + ${SIMGRID_SRC} ${SIMIX_SRC} ${SURF_SRC} - ${PLATFGEN_SRC} + ${SMPI_SRC} ${TRACING_SRC} ${XBT_SRC} ) +if(${HAVE_JEDULE}) + set(simgrid_sources + ${simgrid_sources} + ${JEDULE_SRC} + ) +else() + set(EXTRA_DIST + ${EXTRA_DIST} + ${JEDULE_SRC} + ) +endif() + +if(${HAVE_TRACING}) + set(simgrid_sources + ${simgrid_sources} + ${TRACING_SRC} + ) +else() + set(EXTRA_DIST + ${EXTRA_DIST} + ${TRACING_SRC} + ) +endif() + if(HAVE_MC) set(simgrid_sources ${simgrid_sources} ${MC_SRC} ) -endif(HAVE_MC) +endif() if(HAVE_NS3) set(simgrid_sources ${simgrid_sources} ${NS3_SRC} ) -endif(HAVE_NS3) +endif() # WINDOWS if(WIN32) @@ -582,85 +516,96 @@ if(WIN32) src/xbt/win32_ucontext.c src/xbt/xbt_os_thread.c ) -endif(WIN32) - -### Gras Lib sources -set(gras_sources - ${AMOK_SRC} - ${GRAS_COMMON_SRC} - ${GRAS_RL_SRC} - ${XBT_SRC} - ) +endif() if(${HAVE_LUA}) set(simgrid_sources ${simgrid_sources} ${LUA_SRC} ) -else(${HAVE_LUA}) +else() set(EXTRA_DIST ${EXTRA_DIST} ${LUA_SRC} ) -endif(${HAVE_LUA}) +endif() set(DOC_SOURCES + doc/AS_hierarchy.png + doc/sg_thread_model.fig + doc/simix.fig + doc/surf_nutshell.fig doc/Doxyfile.in - doc/FAQ.doc - doc/index.doc - doc/simgrid.css + doc/Layout.xml doc/triva-graph_configuration.png doc/triva-graph_visualization.png - doc/webcruft/Paje_MSG_screenshot.jpg - doc/webcruft/Paje_MSG_screenshot_thn.jpg - doc/webcruft/awstats_logo3.png - doc/webcruft/poster_thumbnail.png - doc/webcruft/simgrid_logo_2011.png - doc/webcruft/simgrid_logo_2011_small.png - tools/doxygen/fig2dev_postprocessor.pl - tools/doxygen/index_create.pl - tools/doxygen/xbt_log_extract_hierarchy.pl - ) - -set(USER_GUIDE_SOURCES - doc/user_guide/doxygen/UserGuideDoxyfile.in - doc/user_guide/doxygen/UserGuideDoxygenLayout.xml - doc/user_guide/doxygen/bindings.doc - doc/user_guide/doxygen/deployment.doc - doc/user_guide/doxygen/examples.doc - doc/user_guide/doxygen/index.doc - doc/user_guide/doxygen/install.doc - doc/user_guide/doxygen/options.doc - doc/user_guide/doxygen/platform.doc - doc/user_guide/doxygen/pls.doc - doc/user_guide/doxygen/tracing.doc - doc/user_guide/doxygen/use.doc - ) - -set(REF_GUIDE_SOURCES - doc/ref_guide/doxygen/RefGuideDoxyfile.in - doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml - doc/ref_guide/doxygen/main.doc - doc/ref_guide/doxygen/module-amok.doc - doc/ref_guide/doxygen/module-gras.doc - doc/ref_guide/doxygen/module-msg.doc - doc/ref_guide/doxygen/module-sd.doc - doc/ref_guide/doxygen/module-simix.doc - doc/ref_guide/doxygen/module-surf.doc - doc/ref_guide/doxygen/module-trace.doc - doc/ref_guide/doxygen/module-xbt.doc - doc/ref_guide/doxygen/modules.doc - ) + doc/triva-time_interval.png + + doc/doxygen/footer.html + doc/doxygen/header.html + doc/doxygen/stylesheet.css + + doc/doxygen/index.doc + doc/doxygen/getting_started.doc + doc/doxygen/introduction.doc + doc/doxygen/use.doc + doc/doxygen/bindings.doc + doc/doxygen/deployment.doc + doc/doxygen/install.doc + doc/doxygen/options.doc + doc/doxygen/platform.doc + doc/doxygen/pls.doc + doc/doxygen/tracing.doc + doc/doxygen/FAQ.doc + doc/doxygen/advanced.doc + doc/doxygen/inside_autotests.doc + doc/doxygen/inside_cmake.doc + doc/doxygen/inside_extending.doc + doc/doxygen/inside_release.doc + doc/doxygen/contributing.doc + doc/doxygen/modules.doc + doc/doxygen/module-msg.doc + doc/doxygen/module-sd.doc + doc/doxygen/module-simix.doc + doc/doxygen/module-surf.doc + doc/doxygen/module-trace.doc + doc/doxygen/module-xbt.doc -set(SHARED_SOURCES ) set(DOC_FIGS ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig - ${CMAKE_HOME_DIRECTORY}/doc/user_guide/fig/amok_bw_sat.fig - ${CMAKE_HOME_DIRECTORY}/doc/user_guide/fig/amok_bw_test.fig - ${CMAKE_HOME_DIRECTORY}/doc/user_guide/fig/gras_comm.fig + ) + +set(DOC_TOOLS + tools/doxygen/fig2dev_postprocessor.pl + tools/doxygen/index_create.pl + tools/doxygen/xbt_log_extract_hierarchy.pl + ) + +# these files get copied automatically to the html documentation +set(DOC_IMG + ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win.bmp + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win_2011.bmp + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png ) set(bin_files @@ -668,16 +613,15 @@ set(bin_files src/smpi/smpicc.in src/smpi/smpif2c.in src/smpi/smpiff.in + src/smpi/smpif90.in src/smpi/smpirun.in ) set(txt_files - "testsuite/surf/trace_A.txt" - "testsuite/surf/trace_A_failure.txt" - "testsuite/surf/trace_B.txt" ${txt_files} AUTHORS COPYING + README ChangeLog INSTALL LICENSE-LGPL-2.1 @@ -687,20 +631,6 @@ set(txt_files ) set(EXAMPLES_CMAKEFILES_TXT - examples/amok/bandwidth/CMakeLists.txt - examples/amok/saturate/CMakeLists.txt - examples/gras/all2all/CMakeLists.txt - examples/gras/chrono/CMakeLists.txt - examples/gras/console/CMakeLists.txt - examples/gras/mmrpc/CMakeLists.txt - examples/gras/mutual_exclusion/simple_token/CMakeLists.txt - examples/gras/ping/CMakeLists.txt - examples/gras/pmm/CMakeLists.txt - examples/gras/properties/CMakeLists.txt - examples/gras/rpc/CMakeLists.txt - examples/gras/spawn/CMakeLists.txt - examples/gras/synchro/CMakeLists.txt - examples/gras/timer/CMakeLists.txt examples/lua/CMakeLists.txt examples/msg/CMakeLists.txt examples/msg/actions/CMakeLists.txt @@ -721,6 +651,7 @@ set(EXAMPLES_CMAKEFILES_TXT examples/msg/priority/CMakeLists.txt examples/msg/properties/CMakeLists.txt examples/msg/sendrecv/CMakeLists.txt + examples/msg/chainsend/CMakeLists.txt examples/msg/start_kill_time/CMakeLists.txt examples/msg/suspend/CMakeLists.txt examples/msg/token_ring/CMakeLists.txt @@ -739,11 +670,6 @@ set(EXAMPLES_CMAKEFILES_TXT set(TESHSUITE_CMAKEFILES_TXT teshsuite/CMakeLists.txt - teshsuite/gras/CMakeLists.txt - teshsuite/gras/datadesc/CMakeLists.txt - teshsuite/gras/empty_main/CMakeLists.txt - teshsuite/gras/msg_handle/CMakeLists.txt - teshsuite/gras/small_sleep/CMakeLists.txt teshsuite/msg/CMakeLists.txt teshsuite/msg/trace/CMakeLists.txt teshsuite/simdag/CMakeLists.txt @@ -754,12 +680,16 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/simdag/platforms/CMakeLists.txt teshsuite/xbt/CMakeLists.txt teshsuite/smpi/CMakeLists.txt + teshsuite/smpi/mpich-test/env/CMakeLists.txt + teshsuite/smpi/mpich-test/coll/CMakeLists.txt + teshsuite/smpi/mpich-test/context/CMakeLists.txt + teshsuite/smpi/mpich-test/profile/CMakeLists.txt + teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt ) set(TOOLS_CMAKEFILES_TXT tools/CMakeLists.txt tools/graphicator/CMakeLists.txt - tools/gras/CMakeLists.txt tools/tesh/CMakeLists.txt ) @@ -772,14 +702,13 @@ set(CMAKE_SOURCE_FILES CMakeLists.txt buildtools/Cmake/AddTests.cmake buildtools/Cmake/CTestConfig.cmake + buildtools/Cmake/CTestCustom.cmake buildtools/Cmake/CompleteInFiles.cmake buildtools/Cmake/DefinePackages.cmake buildtools/Cmake/Distrib.cmake buildtools/Cmake/Flags.cmake buildtools/Cmake/GenerateDoc.cmake buildtools/Cmake/GenerateDocWin.cmake - buildtools/Cmake/GenerateRefGuide.cmake - buildtools/Cmake/GenerateUserGuide.cmake buildtools/Cmake/MaintainerMode.cmake buildtools/Cmake/MakeExe.cmake buildtools/Cmake/MakeLib.cmake @@ -812,13 +741,10 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/Scripts/update_tesh.pl buildtools/Cmake/Supernovae.cmake buildtools/Cmake/UnitTesting.cmake - buildtools/Cmake/src/gras_config.h.in + buildtools/Cmake/src/internal_config.h.in buildtools/Cmake/src/simgrid.nsi.in buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c - buildtools/Cmake/test_prog/prog_GRAS_ARCH.c - buildtools/Cmake/test_prog/prog_GRAS_CHECK_STRUCT_COMPACTION.c buildtools/Cmake/test_prog/prog_getline.c - buildtools/Cmake/test_prog/prog_max_size.c buildtools/Cmake/test_prog/prog_mutex_timedlock.c buildtools/Cmake/test_prog/prog_printf_null.c buildtools/Cmake/test_prog/prog_sem_init.c @@ -830,6 +756,7 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/test_prog/prog_thread_storage.c buildtools/Cmake/test_prog/prog_va_copy.c buildtools/Cmake/test_prog/prog_vsnprintf.c + buildtools/Cmake/test_prog/prog_gnu_dynlinker.c ) set(PLATFORMS_EXAMPLES @@ -872,7 +799,6 @@ set(PLATFORMS_EXAMPLES ) set(generated_src_files - ${CMAKE_HOME_DIRECTORY}/src/xbt/datadesc/ddt_parse.yy.c src/xbt/automaton/automaton_lexer.yy.c src/xbt/automaton/parserPromela.tab.cacc src/xbt/automaton/parserPromela.tab.hacc