X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e9a3ff64a8ae1a5566286e3b68a5d669a1bf2949..541346e2e807f8383fa6568f4572550f353f0c01:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index f2bc31faf0..1c5b83a3db 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -16,7 +16,6 @@ set(EXTRA_DIST src/include/surf/random_mgr.h src/include/surf/surf.h src/include/surf/surfxml_parse_values.h - src/include/surf/trace_mgr.h src/include/xbt/win32_ucontext.h src/include/xbt/wine_dbghelp.h src/msg/msg_mailbox.h @@ -63,6 +62,7 @@ set(EXTRA_DIST src/surf/ns3/ns3_simulator.h src/surf/ns3/red-queue.h src/surf/platf_generator_private.h + src/surf/platform.hpp src/surf/plugins/energy.hpp src/surf/simgrid.dtd src/surf/simgrid_dtd.c @@ -82,7 +82,6 @@ set(EXTRA_DIST src/surf/surf_routing_private.hpp src/surf/surf_routing_vivaldi.hpp src/surf/surfxml_parse.c - src/surf/trace_mgr_private.h src/surf/vm_hl13.hpp src/surf/PropertyHolder.hpp src/surf/virtual_machine.hpp @@ -280,12 +279,10 @@ set(XBT_SRC src/xbt/xbt_log_layout_simple.c src/xbt/xbt_main.c src/xbt/xbt_matrix.c - src/xbt/xbt_os_time.c src/xbt/xbt_os_file.c - src/xbt/xbt_peer.c - src/xbt/xbt_queue.c + src/xbt/xbt_os_synchro.c + src/xbt/xbt_os_time.c src/xbt/xbt_replay.c - src/xbt/xbt_sg_synchro.c src/xbt/xbt_sha.c src/xbt/xbt_str.c src/xbt/xbt_strbuff.c @@ -346,7 +343,8 @@ set(SURF_SRC src/surf/surf_routing_vivaldi.cpp src/surf/surfxml_parse.c src/surf/surfxml_parseplatf.c - src/surf/trace_mgr.c + src/surf/trace_mgr.hpp + src/surf/trace_mgr.cpp src/surf/vm_hl13.cpp src/surf/virtual_machine.cpp src/surf/host_clm03.cpp @@ -436,10 +434,8 @@ set(MSG_SRC ) set(SIMDAG_SRC - src/simdag/instr_sd_task.cpp src/simdag/sd_daxloader.cpp src/simdag/sd_global.cpp - src/simdag/sd_link.cpp src/simdag/sd_task.cpp src/simdag/sd_workstation.cpp ) @@ -456,7 +452,6 @@ endif() set(BINDINGS_SRC src/bindings/bindings_global.c src/bindings/lua/lua_private.h - src/bindings/lua/lua_state_cloner.h src/bindings/lua/lua_utils.h src/bindings/lua/simgrid_lua.h ) @@ -531,13 +526,9 @@ list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC}) set(LUA_SRC src/bindings/lua/factories/host.lua - src/bindings/lua/lua_comm.c src/bindings/lua/lua_host.c src/bindings/lua/lua_platf.c - src/bindings/lua/lua_process.c - src/bindings/lua/lua_state_cloner.c - src/bindings/lua/lua_task.c - src/bindings/lua/lua_utils.c + src/bindings/lua/lua_debug.c src/bindings/lua/simgrid_lua.c ) @@ -660,6 +651,7 @@ set(headers_to_install include/simdag/simdag.h include/simdag/datatypes.h + include/simgrid/plugins/energy.h include/simgrid/instr.h include/simgrid/msg.h include/simgrid/simdag.h @@ -669,11 +661,11 @@ set(headers_to_install include/simgrid/forward.h include/simgrid/platf.h include/simgrid/platf_generator.h - include/simgrid/plugins.h include/simgrid/simix.h include/simgrid/simix.hpp include/simgrid/host.h include/simgrid/link.h + include/simgrid/s4u/forward.hpp include/simgrid/s4u/actor.hpp include/simgrid/s4u/async.hpp include/simgrid/s4u/comm.hpp @@ -683,7 +675,7 @@ set(headers_to_install include/simgrid/s4u/mailbox.hpp include/simgrid/s4u/storage.hpp include/simgrid/s4u.h - include/simgrid/Host.hpp + include/simgrid/plugins/energy.h include/smpi/mpi.h include/smpi/smpi.h include/smpi/smpi_cocci.h @@ -701,6 +693,7 @@ set(headers_to_install include/xbt/cunit.h include/xbt/dict.h include/xbt/string.hpp + include/xbt/signal.hpp include/xbt/dynar.h include/xbt/ex.h include/xbt/fifo.h @@ -720,8 +713,6 @@ set(headers_to_install include/xbt/mmalloc.h include/xbt/module.h include/xbt/parmap.h - include/xbt/peer.h - include/xbt/queue.h include/xbt/replay.h include/xbt/set.h include/xbt/str.h @@ -927,11 +918,6 @@ set(DOC_SOURCES doc/msg-tuto-src/masterworker2.c doc/msg-tuto-src/masterworker3.c doc/msg-tuto-src/masterworker4.c - doc/msg-tuto-src/platforms/cloud.xml - doc/msg-tuto-src/platforms/g5k.xml - doc/msg-tuto-src/platforms/griffon.xml - doc/msg-tuto-src/platforms/peers.xml - doc/msg-tuto-src/platforms/platform.xml CITATION.bib ) @@ -1011,8 +997,10 @@ set(EXAMPLES_CMAKEFILES_TXT examples/java/bittorrent/CMakeLists.txt examples/java/chord/CMakeLists.txt examples/java/cloud/CMakeLists.txt + examples/java/cloud/energy/CMakeLists.txt examples/java/cloud/migration/CMakeLists.txt examples/java/commTime/CMakeLists.txt + examples/java/energy/CMakeLists.txt examples/java/io/CMakeLists.txt examples/java/kademlia/CMakeLists.txt examples/java/master_slave_bypass/CMakeLists.txt @@ -1025,7 +1013,6 @@ set(EXAMPLES_CMAKEFILES_TXT examples/java/startKillTime/CMakeLists.txt examples/java/suspend/CMakeLists.txt examples/java/tracing/CMakeLists.txt - examples/lua/CMakeLists.txt examples/msg/CMakeLists.txt examples/msg/actions/CMakeLists.txt examples/msg/bittorrent/CMakeLists.txt @@ -1227,7 +1214,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/scripts/update_tesh.pl tools/cmake/UnitTesting.cmake tools/cmake/src/internal_config.h.in - tools/cmake/src/simgrid.nsi.in tools/cmake/test_prog/prog_AC_CHECK_MCSC.c tools/cmake/test_prog/prog_gnu_dynlinker.c tools/cmake/test_prog/prog_mutex_timedlock.c @@ -1266,6 +1252,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml examples/platforms/config_tracing.xml + examples/platforms/trace/linkBandwidth7.bw examples/platforms/trace/trace_A_failure.txt examples/platforms/trace/trace_A.txt examples/platforms/trace/trace_B.txt @@ -1286,6 +1273,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/routing_cluster.xml examples/platforms/routing_cluster.lua examples/platforms/routing_none.xml + examples/platforms/simulacrum_7_hosts.xml examples/platforms/storage/content/small_content.txt examples/platforms/storage/content/storage_content.txt examples/platforms/storage/content/win_storage_content.txt