X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/455435b8a7cc8d84037aa66104a73d4760d9666f..1bf8ac043266839571c3a5fa789557fff825db5a:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 7d5b8d431e..28f94ddbce 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -30,7 +30,6 @@ set(EXTRA_DIST src/simix/smx_io_private.h src/simix/smx_network_private.h src/simix/smx_private.h - src/simix/ActorImpl.hpp src/simix/smx_synchro_private.h src/kernel/activity/ActivityImpl.hpp src/kernel/activity/SynchroComm.hpp @@ -63,25 +62,10 @@ set(EXTRA_DIST src/surf/xml/simgrid_dtd.c src/surf/xml/surfxml_sax_cb.cpp - src/kernel/routing/AsImpl.hpp - src/kernel/routing/AsCluster.hpp - src/kernel/routing/AsClusterFatTree.hpp - src/kernel/routing/AsClusterTorus.hpp - src/kernel/routing/AsClusterDragonfly.hpp - src/kernel/routing/AsDijkstra.hpp - src/kernel/routing/AsFloyd.hpp - src/kernel/routing/AsFull.hpp - src/kernel/routing/AsRoutedGraph.hpp - src/kernel/routing/AsNone.hpp - src/kernel/routing/AsVivaldi.hpp - src/kernel/routing/BypassRoute.hpp - src/kernel/routing/NetCard.hpp - src/surf/storage_interface.hpp src/surf/storage_n11.hpp src/surf/surf_interface.hpp src/surf/surf_private.h - src/surf/surf_routing.hpp src/surf/PropertyHolder.hpp src/surf/host_clm03.hpp src/surf/HostImpl.hpp @@ -296,18 +280,31 @@ set(NS3_SRC src/surf/network_ns3.cpp src/surf/ns3/ns3_simulator.cc ) set(SURF_SRC - src/kernel/routing/AsImpl.cpp - src/kernel/routing/AsCluster.cpp - src/kernel/routing/AsClusterFatTree.cpp - src/kernel/routing/AsClusterTorus.cpp - src/kernel/routing/AsClusterDragonfly.cpp - src/kernel/routing/AsDijkstra.cpp - src/kernel/routing/AsFloyd.cpp - src/kernel/routing/AsFull.cpp - src/kernel/routing/AsRoutedGraph.cpp - src/kernel/routing/AsNone.cpp - src/kernel/routing/AsVivaldi.cpp - + src/kernel/routing/ClusterZone.cpp + src/kernel/routing/ClusterZone.hpp + src/kernel/routing/DijkstraZone.cpp + src/kernel/routing/DijkstraZone.hpp + src/kernel/routing/DragonflyZone.cpp + src/kernel/routing/DragonflyZone.hpp + src/kernel/routing/EmptyZone.cpp + src/kernel/routing/EmptyZone.hpp + src/kernel/routing/FatTreeZone.cpp + src/kernel/routing/FatTreeZone.hpp + src/kernel/routing/FloydZone.cpp + src/kernel/routing/FloydZone.hpp + src/kernel/routing/FullZone.cpp + src/kernel/routing/FullZone.hpp + src/kernel/routing/NetPoint.cpp + src/kernel/routing/NetPoint.hpp + src/kernel/routing/NetZoneImpl.cpp + src/kernel/routing/NetZoneImpl.hpp + src/kernel/routing/RoutedZone.cpp + src/kernel/routing/RoutedZone.hpp + src/kernel/routing/TorusZone.cpp + src/kernel/routing/TorusZone.hpp + src/kernel/routing/VivaldiZone.cpp + src/kernel/routing/VivaldiZone.hpp + src/kernel/EngineImpl.cpp src/kernel/EngineImpl.hpp @@ -364,10 +361,12 @@ set(SIMIX_SRC src/simix/smx_io.cpp src/simix/smx_network.cpp src/simix/ActorImpl.cpp + src/simix/ActorImpl.hpp src/simix/smx_synchro.cpp - src/simix/smx_vm.cpp src/simix/popping.cpp src/kernel/activity/ActivityImpl.cpp + src/kernel/activity/MailboxImpl.cpp + src/kernel/activity/MailboxImpl.hpp src/kernel/activity/SynchroComm.cpp src/kernel/activity/SynchroExec.cpp src/kernel/activity/SynchroSleep.cpp @@ -392,15 +391,16 @@ endif() set(S4U_SRC src/s4u/s4u_actor.cpp - src/s4u/s4u_as.cpp src/s4u/s4u_activity.cpp + src/s4u/s4u_conditionVariable.cpp src/s4u/s4u_comm.cpp src/s4u/s4u_engine.cpp src/s4u/s4u_file.cpp src/s4u/s4u_host.cpp + src/s4u/s4u_link.cpp src/s4u/s4u_mailbox.cpp src/s4u/s4u_mutex.cpp - src/s4u/s4u_conditionVariable.cpp + src/s4u/s4u_netzone.cpp src/s4u/s4u_storage.cpp ) @@ -482,7 +482,6 @@ set(JMSG_JAVA_SRC src/bindings/java/org/simgrid/msg/Msg.java src/bindings/java/org/simgrid/msg/MsgException.java src/bindings/java/org/simgrid/msg/Mutex.java - src/bindings/java/org/simgrid/msg/NativeException.java src/bindings/java/org/simgrid/msg/Process.java src/bindings/java/org/simgrid/msg/ProcessKilledError.java src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java @@ -551,17 +550,24 @@ set(MC_SRC_BASE ) set(MC_SRC - src/mc/RemotePtr.hpp + src/mc/checker/Checker.cpp + src/mc/checker/Checker.hpp + src/mc/checker/CommunicationDeterminismChecker.cpp + src/mc/checker/CommunicationDeterminismChecker.hpp + src/mc/checker/SafetyChecker.cpp + src/mc/checker/SafetyChecker.hpp + src/mc/checker/LivenessChecker.cpp + src/mc/checker/LivenessChecker.hpp + src/mc/remote/Channel.cpp + src/mc/remote/Channel.hpp + src/mc/remote/Client.cpp + src/mc/remote/Client.hpp + src/mc/remote/RemotePtr.hpp + src/mc/remote/mc_protocol.h + src/mc/remote/mc_protocol.cpp + src/mc/AddressSpace.hpp src/mc/AddressSpace.cpp - src/mc/Channel.cpp - src/mc/Channel.hpp - src/mc/Checker.cpp - src/mc/Checker.hpp - src/mc/Client.cpp - src/mc/Client.hpp - src/mc/CommunicationDeterminismChecker.cpp - src/mc/CommunicationDeterminismChecker.hpp src/mc/Frame.hpp src/mc/Frame.cpp src/mc/ModelChecker.hpp @@ -570,8 +576,6 @@ set(MC_SRC src/mc/ObjectInformation.cpp src/mc/PageStore.hpp src/mc/PageStore.cpp - src/mc/SafetyChecker.cpp - src/mc/SafetyChecker.hpp src/mc/ChunkedData.hpp src/mc/ChunkedData.cpp src/mc/RegionSnapshot.cpp @@ -604,10 +608,8 @@ set(MC_SRC src/mc/mc_hash.cpp src/mc/mc_ignore.h src/mc/mc_mmalloc.h - src/mc/LivenessChecker.hpp src/mc/LocationList.hpp src/mc/LocationList.cpp - src/mc/LivenessChecker.cpp src/mc/mc_record.cpp src/mc/mc_member.cpp src/mc/mc_memory.cpp @@ -620,8 +622,6 @@ set(MC_SRC src/mc/VisitedState.cpp src/mc/VisitedState.hpp src/mc/mc_client_api.cpp - src/mc/mc_protocol.h - src/mc/mc_protocol.cpp src/mc/mc_smx.h src/mc/mc_smx.cpp src/mc/mc_xbt.hpp @@ -630,7 +630,7 @@ set(MC_SRC src/mc/Transition.hpp ) -set(MC_SIMGRID_MC_SRC src/mc/simgrid_mc.cpp) +set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install include/msg/msg.h @@ -654,14 +654,15 @@ set(headers_to_install include/simgrid/s4u/forward.hpp include/simgrid/s4u/Activity.hpp include/simgrid/s4u/Actor.hpp - include/simgrid/s4u/As.hpp include/simgrid/s4u/comm.hpp + include/simgrid/s4u/conditionVariable.hpp include/simgrid/s4u/engine.hpp include/simgrid/s4u/file.hpp include/simgrid/s4u/host.hpp + include/simgrid/s4u/Link.hpp include/simgrid/s4u/Mailbox.hpp include/simgrid/s4u/Mutex.hpp - include/simgrid/s4u/conditionVariable.hpp + include/simgrid/s4u/NetZone.hpp include/simgrid/s4u/storage.hpp include/simgrid/s4u/VirtualMachine.hpp include/simgrid/s4u.hpp @@ -834,7 +835,8 @@ set(DOC_SOURCES doc/doxygen/install.doc doc/doxygen/install_yours.doc doc/doxygen/java.doc - doc/doxygen/tutorial.doc + doc/doxygen/tutorial_msg.doc + doc/doxygen/tutorial_smpi.doc doc/doxygen/models.doc doc/doxygen/module-msg.doc doc/doxygen/module-s4u.doc @@ -871,6 +873,7 @@ set(DOC_SOURCES doc/msg-tuto-src/deployment2.xml doc/msg-tuto-src/deployment3.xml doc/msg-tuto-src/deployment_general.xml + doc/msg-tuto-src/Makefile doc/msg-tuto-src/masterworker0.c doc/msg-tuto-src/masterworker1.c doc/msg-tuto-src/masterworker2.c @@ -998,6 +1001,7 @@ set(CMAKEFILES_TXT set(CMAKE_SOURCE_FILES CMakeLists.txt + FindSimGrid.cmake tools/cmake/Tests.cmake tools/cmake/CTestConfig.cmake tools/cmake/CTestCustom.cmake @@ -1017,7 +1021,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/Modules/FindNS3.cmake tools/cmake/Modules/FindPAPI.cmake tools/cmake/Modules/FindRngStream.cmake - tools/cmake/Modules/FindSimGrid.cmake tools/cmake/Modules/FindValgrind.cmake tools/cmake/Option.cmake tools/cmake/scripts/my_valgrind.pl