X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e4ee823e63a90fd91cbec6f2312c896ca4cabe0..561cb30f87c531af6b562249ddf90fac2a44aa92:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index a6c6363c4f..1e3d6be6b5 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -63,25 +63,11 @@ 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/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/virtual_machine.hpp
   src/surf/host_clm03.hpp
   src/surf/HostImpl.hpp
   src/surf/ptask_L07.hpp
@@ -295,18 +281,34 @@ 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/NetCard.cpp
+  src/kernel/routing/NetCard.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
+
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
@@ -332,12 +334,19 @@ set(SURF_SRC
   src/surf/xml/surfxml_parseplatf.cpp
   src/surf/trace_mgr.hpp
   src/surf/trace_mgr.cpp
-  src/surf/virtual_machine.cpp
   src/surf/host_clm03.cpp
   src/surf/HostImpl.cpp
   src/surf/ptask_L07.cpp
   )
 
+set(PLUGINS_SRC
+  src/plugins/vm/s4u_VirtualMachine.cpp
+  src/plugins/vm/VirtualMachineImpl.hpp
+  src/plugins/vm/VirtualMachineImpl.cpp
+  src/plugins/vm/VmHostExt.hpp
+  src/plugins/vm/VmHostExt.cpp
+  )
+  
 set(SIMIX_GENERATED_SRC   src/simix/popping_generated.cpp  )
 set(SIMIX_SRC
   src/kernel/future.cpp
@@ -354,7 +363,6 @@ set(SIMIX_SRC
   src/simix/smx_network.cpp
   src/simix/ActorImpl.cpp
   src/simix/smx_synchro.cpp
-  src/simix/smx_vm.cpp
   src/simix/popping.cpp
   src/kernel/activity/ActivityImpl.cpp
   src/kernel/activity/SynchroComm.cpp
@@ -381,15 +389,15 @@ 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_mailbox.cpp
   src/s4u/s4u_mutex.cpp
-  src/s4u/s4u_conditionVariable.cpp
+  src/s4u/s4u_netzone.cpp
   src/s4u/s4u_storage.cpp
 )
 
@@ -402,7 +410,6 @@ set(SIMGRID_SRC
 set(MSG_SRC
   src/msg/instr_msg_process.cpp
   src/msg/instr_msg_task.cpp
-  src/msg/instr_msg_vm.cpp
   src/msg/msg_actions.cpp
   src/msg/msg_deployment.cpp
   src/msg/msg_environment.cpp
@@ -419,15 +426,11 @@ set(MSG_SRC
 
 set(SIMDAG_SRC
   src/simdag/sd_daxloader.cpp
+  src/simdag/sd_dotloader.cpp
   src/simdag/sd_global.cpp
   src/simdag/sd_task.cpp
   src/simdag/sd_workstation.cpp
   )
-if(HAVE_GRAPHVIZ)
-  set(SIMDAG_SRC    ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp)
-else()
-  set(EXTRA_DIST    ${EXTRA_DIST} src/simdag/sd_dotloader.cpp)
-endif()
 
 set(BINDINGS_SRC
   src/bindings/lua/lua_private.h
@@ -525,11 +528,11 @@ set(TRACING_SRC
 
 set(JEDULE_SRC
   include/simgrid/jedule/jedule_events.hpp
-  include/simgrid/jedule/jedule_output.hpp
+  include/simgrid/jedule/jedule.hpp
   include/simgrid/jedule/jedule_platform.hpp
   include/simgrid/jedule/jedule_sd_binding.h
   src/instr/jedule/jedule_events.cpp
-  src/instr/jedule/jedule_output.cpp
+  src/instr/jedule/jedule.cpp
   src/instr/jedule/jedule_platform.cpp
   src/instr/jedule/jedule_sd_binding.cpp
   )
@@ -648,15 +651,16 @@ 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/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
   include/simgrid/plugins/energy.h
   include/smpi/mpi.h
@@ -707,7 +711,7 @@ set(headers_to_install
   include/xbt/str.h
   include/xbt/strbuff.h
   include/xbt/swag.h
-  include/xbt/synchro_core.h
+  include/xbt/synchro.h
   include/xbt/sysdep.h
   include/xbt/system_error.hpp
   include/xbt/utility.hpp
@@ -744,6 +748,7 @@ endif()
 
 ### Simgrid Lib sources
 set(simgrid_sources
+  ${PLUGINS_SRC}
   ${BINDINGS_SRC}
   ${MC_SRC_BASE}
   ${MSG_SRC}
@@ -849,6 +854,7 @@ set(DOC_SOURCES
   doc/doxygen/stylesheet.css
   doc/doxygen/uhood.doc
   doc/doxygen/uhood_switch.doc
+  doc/doxygen/uhood_arch.doc
 
   doc/manpage/smpicc.1
   doc/manpage/smpicxx.1
@@ -989,6 +995,7 @@ set(CMAKEFILES_TXT
 
 set(CMAKE_SOURCE_FILES
   CMakeLists.txt
+  FindSimGrid.cmake
   tools/cmake/Tests.cmake
   tools/cmake/CTestConfig.cmake
   tools/cmake/CTestCustom.cmake
@@ -1000,15 +1007,14 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Java.cmake
   tools/cmake/MakeLib.cmake
   tools/cmake/MakeLibWin.cmake
-  tools/cmake/Modules/FindGFortran.cmake
   tools/cmake/Modules/FindGraphviz.cmake
   tools/cmake/Modules/FindLibdw.cmake
   tools/cmake/Modules/FindLibunwind.cmake
+  tools/cmake/Modules/FindLibevent.cmake
   tools/cmake/Modules/FindLuaSimgrid.cmake
   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