X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b81f83ec10740ad899c44f4c0db30029f0fb48b..501c0b31c5309954008bdcd29144516b62ddbee6:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 7ef9b693ab..bb7865239d 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -51,8 +51,6 @@ set(EXTRA_DIST src/surf/xml/surfxml_sax_cb.cpp src/surf/disk_s19.hpp - src/surf/StorageImpl.hpp - src/surf/storage_n11.hpp src/surf/surf_interface.hpp src/surf/surf_private.hpp src/surf/host_clm03.hpp @@ -78,14 +76,10 @@ set(EXTRA_DIST src/xbt/mmalloc/mrealloc.c src/xbt/mmalloc/swag.c src/xbt/mmalloc/swag.h - tools/tesh/generate_tesh tools/lualib.patch teshsuite/lua/lua_platforms.tesh examples/smpi/mc/only_send_deterministic.tesh examples/smpi/mc/non_deterministic.tesh - - examples/deprecated/java/.classpath - examples/deprecated/java/.project ) set(SMPI_SRC @@ -355,8 +349,6 @@ set(SURF_SRC src/surf/network_interface.cpp src/surf/network_wifi.cpp src/surf/sg_platf.cpp - src/surf/StorageImpl.cpp - src/surf/storage_n11.cpp src/surf/surf_c_bindings.cpp src/surf/surf_interface.cpp src/surf/xml/platf.hpp @@ -458,7 +450,6 @@ set(S4U_SRC src/s4u/s4u_Mutex.cpp src/s4u/s4u_Netzone.cpp src/s4u/s4u_Semaphore.cpp - src/s4u/s4u_Storage.cpp ) set(SIMGRID_SRC @@ -496,8 +487,6 @@ set(JMSG_C_SRC src/bindings/java/jmsg_as.hpp src/bindings/java/jmsg_comm.cpp src/bindings/java/jmsg_comm.h - src/bindings/java/jmsg_file.cpp - src/bindings/java/jmsg_file.h src/bindings/java/jmsg_host.cpp src/bindings/java/jmsg_host.h src/bindings/java/jmsg_process.cpp @@ -512,15 +501,12 @@ set(JMSG_C_SRC src/bindings/java/jxbt_utilities.hpp src/bindings/java/JavaContext.cpp src/bindings/java/JavaContext.hpp - src/bindings/java/jmsg_storage.cpp - src/bindings/java/jmsg_storage.h ) set(JMSG_JAVA_SRC src/bindings/java/org/simgrid/NativeLib.java src/bindings/java/org/simgrid/msg/As.java src/bindings/java/org/simgrid/msg/Comm.java - src/bindings/java/org/simgrid/msg/File.java src/bindings/java/org/simgrid/msg/Host.java src/bindings/java/org/simgrid/msg/HostFailureException.java src/bindings/java/org/simgrid/msg/HostNotFoundException.java @@ -532,8 +518,6 @@ set(JMSG_JAVA_SRC src/bindings/java/org/simgrid/msg/ProcessKilledError.java src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java src/bindings/java/org/simgrid/msg/Semaphore.java - src/bindings/java/org/simgrid/msg/Storage.java - src/bindings/java/org/simgrid/msg/StorageNotFoundException.java src/bindings/java/org/simgrid/msg/Task.java src/bindings/java/org/simgrid/msg/TaskCancelledException.java src/bindings/java/org/simgrid/msg/TimeoutException.java @@ -596,6 +580,8 @@ set(MC_SRC_BASE src/mc/mc_config.cpp src/mc/mc_config.hpp src/mc/mc_global.cpp + src/mc/checker/SimcallInspector.cpp + src/mc/checker/SimcallInspector.hpp ) set(MC_SRC @@ -604,9 +590,10 @@ set(MC_SRC src/mc/checker/CommunicationDeterminismChecker.hpp src/mc/checker/SafetyChecker.cpp src/mc/checker/SafetyChecker.hpp - src/mc/checker/SimcallInspector.hpp src/mc/checker/LivenessChecker.cpp src/mc/checker/LivenessChecker.hpp + src/mc/checker/UdporChecker.cpp + src/mc/checker/UdporChecker.hpp src/mc/inspect/DwarfExpression.hpp src/mc/inspect/DwarfExpression.cpp @@ -637,7 +624,6 @@ set(MC_SRC src/mc/remote/RemoteSimulation.cpp src/mc/remote/RemotePtr.hpp src/mc/remote/mc_protocol.h - src/mc/remote/mc_protocol.cpp src/mc/sosp/PageStore.hpp src/mc/sosp/PageStore.cpp @@ -657,8 +643,8 @@ set(MC_SRC src/mc/mc_comm_pattern.hpp src/mc/mc_pattern.hpp src/mc/compare.cpp - src/mc/mc_api.cpp - src/mc/mc_api.hpp + src/mc/api.cpp + src/mc/api.hpp src/mc/mc_hash.hpp src/mc/mc_hash.cpp src/mc/mc_ignore.hpp @@ -676,6 +662,8 @@ set(MC_SRC src/mc/mc_smx.cpp src/mc/mc_exit.hpp src/mc/Transition.hpp + src/mc/udpor_global.cpp + src/mc/udpor_global.hpp ) set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) @@ -693,7 +681,7 @@ set(headers_to_install include/simgrid/plugins/file_system.h include/simgrid/plugins/live_migration.h include/simgrid/plugins/load.h - include/simgrid/smpi/replay.hpp + include/simgrid/smpi/smpi_replay.hpp include/simgrid/instr.h include/simgrid/mailbox.h include/simgrid/simdag.h @@ -709,7 +697,6 @@ set(headers_to_install include/simgrid/cond.h include/simgrid/mutex.h include/simgrid/semaphore.h - include/simgrid/storage.h include/simgrid/vm.h include/simgrid/zone.h include/simgrid/s4u/Activity.hpp @@ -727,7 +714,6 @@ set(headers_to_install include/simgrid/s4u/Mutex.hpp include/simgrid/s4u/NetZone.hpp include/simgrid/s4u/Semaphore.hpp - include/simgrid/s4u/Storage.hpp include/simgrid/s4u/VirtualMachine.hpp include/simgrid/s4u.hpp @@ -773,7 +759,6 @@ set(headers_to_install include/xbt/file.hpp include/xbt/functional.hpp include/xbt/function_types.h - include/xbt/future.hpp include/xbt/graph.h include/xbt/log.h include/xbt/log.hpp @@ -783,6 +768,7 @@ set(headers_to_install include/xbt/PropertyHolder.hpp include/xbt/parmap.h include/xbt/parse_units.hpp + include/xbt/promise.hpp include/xbt/range.hpp include/xbt/random.hpp include/xbt/replay.hpp @@ -872,7 +858,6 @@ set(DOC_SOURCES doc/doxygen/module-trace.doc doc/doxygen/module-xbt.doc doc/doxygen/module-index.doc - doc/doxygen/outcomes_logs.doc doc/doxygen/outcomes_vizu.doc doc/doxygen/platform.doc doc/doxygen/platform_lua.doc @@ -890,12 +875,12 @@ set(DOC_SOURCES docs/manpages/tesh.pod docs/Build.sh + docs/bin/extract_logs_hierarchy.pl docs/requirements.txt docs/source/conf.py docs/source/Doxyfile docs/find-missing.ignore docs/find-missing.py - docs/source/_ext/autodoxy.py docs/source/_ext/showfile.css docs/source/_ext/showfile.js docs/source/_ext/showfile.py @@ -929,6 +914,7 @@ set(DOC_SOURCES docs/source/app_msg.rst docs/source/app_s4u.rst docs/source/app_smpi.rst + docs/source/The_XBT_toolbox.rst docs/source/community.rst docs/source/Configuring_SimGrid.rst docs/source/Deploying_your_Application.rst @@ -974,14 +960,7 @@ set(DOC_SOURCES CITATION.bib ) -set(DOC_FIGS - ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig - ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig - ) - set(DOC_TOOLS - tools/doxygen/fig2dev_postprocessor.pl - tools/doxygen/xbt_log_extract_hierarchy.pl tools/doxygen/list_routing_models_examples.sh ) @@ -990,13 +969,7 @@ set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/webcruft/eclipseScreenShot.png ${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/storage_sample_scenario.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 @@ -1026,7 +999,7 @@ set(txt_files # Add your CMakeLists file here to see your subdir built. set(CMAKEFILES_TXT examples/c/CMakeLists.txt - examples/s4u/CMakeLists.txt + examples/cpp/CMakeLists.txt examples/smpi/CMakeLists.txt examples/smpi/NAS/CMakeLists.txt examples/smpi/smpi_s4u_masterworker/CMakeLists.txt @@ -1041,11 +1014,11 @@ set(CMAKEFILES_TXT teshsuite/kernel/CMakeLists.txt teshsuite/lua/CMakeLists.txt teshsuite/mc/CMakeLists.txt + teshsuite/models/CMakeLists.txt teshsuite/msg/CMakeLists.txt teshsuite/python/CMakeLists.txt teshsuite/s4u/CMakeLists.txt teshsuite/simdag/CMakeLists.txt - teshsuite/simix/CMakeLists.txt teshsuite/smpi/CMakeLists.txt teshsuite/surf/CMakeLists.txt teshsuite/xbt/CMakeLists.txt @@ -1184,6 +1157,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/multicore_machine.xml examples/platforms/ns3-big-cluster.xml examples/platforms/onelink.xml + examples/platforms/ptask_L07.xml examples/platforms/prop.xml examples/platforms/routing_cluster.xml examples/platforms/routing_cluster.lua @@ -1191,7 +1165,6 @@ set(PLATFORMS_EXAMPLES examples/platforms/simulacrum_7_hosts.xml examples/platforms/storage/content/small_content.txt examples/platforms/storage/content/storage_content.txt - examples/platforms/storage/storage.xml examples/platforms/small_platform.xml examples/platforms/small_platform.lua examples/platforms/small_platform_constant.xml @@ -1212,6 +1185,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/two_peers.xml examples/platforms/vivaldi.xml examples/platforms/wifi_energy.xml + examples/platforms/wifi_ns3.xml examples/platforms/wifi.xml )