X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/76d539b6d43f96ee5708dd48d84b5c3c9ad905cb..b9d8ff0f5f0819d9103795c70ed49534d695f8ba:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 62b7b4ea34..b15345e2b1 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 @@ -40,7 +39,6 @@ set(EXTRA_DIST 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 @@ -50,12 +48,13 @@ set(EXTRA_DIST 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 @@ -64,11 +63,10 @@ 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 @@ -86,6 +84,7 @@ set(EXTRA_DIST src/simix/network_private.h src/simix/smurf_private.h src/simix/synchro_private.h + src/simix/io_private.h src/smpi/private.h src/smpi/smpi_mpi_dt_private.h @@ -104,6 +103,7 @@ set(EXTRA_DIST 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 @@ -181,6 +181,7 @@ set(XBT_SRC src/xbt/parmap.c src/xbt/xbt_replay_trace_reader.c src/xbt/lib.c + src/xbt/automaton.c ) if(HAVE_MMAP) @@ -201,29 +202,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 +) -if(HAVE_RED_QUEUE_H) - set(NS3_SRC - ${NS3_SRC} - src/surf/ns3/my-point-to-point-helper.cc - ) -else(HAVE_RED_QUEUE_H) - set(EXTRA_DIST - ${EXTRA_DIST} - src/surf/ns3/my-point-to-point-helper.cc - ) -endif(HAVE_RED_QUEUE_H) - 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 @@ -232,14 +226,14 @@ 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/xbt/xbt_sg_stubs.c ) @@ -256,17 +250,18 @@ 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_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 ) @@ -332,8 +327,14 @@ 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 @@ -372,6 +373,7 @@ set(MC_SRC src/mc/mc_dpor.c src/mc/mc_request.c src/mc/private.h + src/mc/mc_liveness.c ) set(RNGSTREAM_SRC @@ -414,6 +416,9 @@ set(headers_to_install include/xbt/mmalloc.h include/xbt/replay_trace_reader.h include/xbt/parmap.h + include/xbt/automaton.h + include/xbt/automatonparse_promela.h + include/simgrid/platf.h include/mc/modelchecker.h include/msg/msg.h include/msg/datatypes.h @@ -561,23 +566,7 @@ file(GLOB_RECURSE examples_to_install_in_doc "examples/*README" ) -set(WEBSITE_SOURCES - website/contrib.doc - website/FAQ.doc - website/history.doc - website/people.doc - website/publis.doc - website/all.bib - website/Doxyfile_website.in - website/footer.html - website/index.php.in - website/download.php.in - website/documentation.php.in - - tools/doxygen/bibtex2html_table_count.pl - doc/webcruft/fish.gif - doc/webcruft/robots.txt - ) + set(DOC_SOURCES doc/installSimgrid.doc @@ -585,8 +574,7 @@ set(DOC_SOURCES doc/options.doc doc/use.doc doc/tracing.doc - doc/gtnets.doc - doc/ns3.doc + doc/pls.doc doc/gtut-howto-design.doc doc/gtut-howto.doc doc/gtut-introduction.doc @@ -713,7 +701,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 @@ -873,7 +860,6 @@ set(source_to_pack ${CMAKE_SOURCE_FILES} ${bin_files} ${DOC_SOURCES} - ${WEBSITE_SOURCES} ${DOC_FIGS} ${README_files} buildtools/Cmake/simgrid.nsi.in