X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a22eb0ac7d22d5beaa6e33adf8f85c28dac59024..11667312f9c0886b8e7b6ca908266d33d2282b13:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e2f7c19df8..e90c9eff37 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
@@ -67,7 +66,6 @@ set(EXTRA_DIST
   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,8 +294,8 @@ set(SURF_SRC
   src/kernel/routing/FloydZone.hpp
   src/kernel/routing/FullZone.cpp
   src/kernel/routing/FullZone.hpp
-  src/kernel/routing/NetCard.cpp
-  src/kernel/routing/NetCard.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
@@ -363,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
@@ -391,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
 )
 
@@ -431,7 +432,6 @@ set(SIMDAG_SRC
   src/simdag/sd_dotloader.cpp
   src/simdag/sd_global.cpp
   src/simdag/sd_task.cpp
-  src/simdag/sd_workstation.cpp
   )
 
 set(BINDINGS_SRC
@@ -481,7 +481,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
@@ -550,17 +549,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
@@ -569,8 +575,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
@@ -603,10 +607,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
@@ -619,8 +621,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
@@ -629,7 +629,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
@@ -653,14 +653,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
@@ -833,7 +834,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
@@ -870,6 +872,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