X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5dc8aedf8d80b2eba1577a7b6087b219709e5f6b..91bcc38f9c9fc26bc0a52d28dbd3e65f65fa0749:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e8a4abd547..6abafa3d5e 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -10,6 +10,7 @@ set(EXTRA_DIST
   src/mc/mc_record.h
   src/include/simgrid/sg_config.h
   src/include/smpi/smpi_interface.h
+  src/include/smpi/smpi_utils.hpp
   src/include/surf/datatypes.h
   src/include/surf/maxmin.h
   src/include/surf/surf.h
@@ -17,7 +18,7 @@ set(EXTRA_DIST
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
   src/simdag/dax_dtd.h
-  src/simdag/simdag_private.h
+  src/simdag/simdag_private.hpp
   src/simix/simcalls.in
   src/simix/simcalls.py
   src/simix/popping_private.h
@@ -29,15 +30,14 @@ set(EXTRA_DIST
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
   src/simix/smx_private.h
-  src/simix/smx_process_private.h
+  src/simix/ActorImpl.hpp
   src/simix/smx_synchro_private.h
-  src/simix/Synchro.h
-  src/simix/SynchroComm.hpp
-  src/simix/SynchroExec.hpp
-  src/simix/SynchroIo.hpp
-  src/simix/SynchroSleep.hpp
-  src/simix/SynchroRaw.hpp
-  src/smpi/README
+  src/kernel/activity/ActivityImpl.hpp
+  src/kernel/activity/SynchroComm.hpp
+  src/kernel/activity/SynchroExec.hpp
+  src/kernel/activity/SynchroIo.hpp
+  src/kernel/activity/SynchroSleep.hpp
+  src/kernel/activity/SynchroRaw.hpp
   src/smpi/colls/coll_tuned_topo.h
   src/smpi/colls/colls.h
   src/smpi/colls/colls_private.h
@@ -63,24 +63,23 @@ set(EXTRA_DIST
   src/surf/xml/simgrid_dtd.c
   src/surf/xml/surfxml_sax_cb.cpp
 
-  src/surf/AsImpl.hpp
-  src/surf/AsCluster.hpp
-  src/surf/AsClusterFatTree.hpp
-  src/surf/AsClusterTorus.hpp
-  src/surf/AsClusterDragonfly.hpp
-  src/surf/AsDijkstra.hpp
-  src/surf/AsFloyd.hpp
-  src/surf/AsFull.hpp
-  src/surf/AsRoutedGraph.hpp
-  src/surf/AsNone.hpp
-  src/surf/AsVivaldi.hpp
+  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/vm_hl13.hpp
   src/surf/PropertyHolder.hpp
   src/surf/virtual_machine.hpp
   src/surf/host_clm03.hpp
@@ -116,6 +115,9 @@ set(EXTRA_DIST
   teshsuite/lua/lua_platforms.tesh
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
+  
+  examples/java/.classpath
+  examples/java/.project
   )
 
 set(SMPI_SRC
@@ -238,6 +240,7 @@ set(SMPI_SRC
   src/smpi/smpi_replay.cpp
   src/smpi/smpi_rma.cpp
   src/smpi/smpi_topo.cpp
+  src/smpi/smpi_utils.cpp
   src/smpi/smpi_f77.cpp
   )
 
@@ -269,7 +272,7 @@ set(XBT_SRC
   src/xbt/xbt_log_appender_file.c
   src/xbt/xbt_log_layout_format.c
   src/xbt/xbt_log_layout_simple.c
-  src/xbt/xbt_main.c
+  src/xbt/xbt_main.cpp
   src/xbt/xbt_matrix.c
   src/xbt/xbt_os_file.c
   src/xbt/xbt_os_synchro.c
@@ -289,17 +292,17 @@ set(NS3_SRC  src/surf/network_ns3.cpp
              src/surf/ns3/ns3_simulator.cc )
 
 set(SURF_SRC
-  src/surf/AsImpl.cpp
-  src/surf/AsCluster.cpp
-  src/surf/AsClusterFatTree.cpp
-  src/surf/AsClusterTorus.cpp
-  src/surf/AsClusterDragonfly.cpp
-  src/surf/AsDijkstra.cpp
-  src/surf/AsFloyd.cpp
-  src/surf/AsFull.cpp
-  src/surf/AsRoutedGraph.cpp
-  src/surf/AsNone.cpp
-  src/surf/AsVivaldi.cpp
+  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/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
@@ -328,7 +331,6 @@ set(SURF_SRC
   src/surf/xml/surfxml_parseplatf.cpp
   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
   src/surf/HostImpl.cpp
@@ -337,26 +339,28 @@ set(SURF_SRC
 
 set(SIMIX_GENERATED_SRC   src/simix/popping_generated.cpp  )
 set(SIMIX_SRC
+  src/kernel/future.cpp
   src/simix/libsmx.cpp
   src/simix/smx_context.cpp
-  src/simix/Context.cpp
-  src/simix/ContextRaw.cpp
+  src/kernel/context/Context.cpp
+  src/kernel/context/Context.hpp
+  src/kernel/context/ContextRaw.cpp
   src/simix/smx_deployment.cpp
   src/simix/smx_environment.cpp
   src/simix/smx_global.cpp
   src/simix/smx_host.cpp
   src/simix/smx_io.cpp
   src/simix/smx_network.cpp
-  src/simix/smx_process.cpp
+  src/simix/ActorImpl.cpp
   src/simix/smx_synchro.cpp
   src/simix/smx_vm.cpp
   src/simix/popping.cpp
-  src/simix/Synchro.cpp
-  src/simix/SynchroComm.cpp
-  src/simix/SynchroExec.cpp
-  src/simix/SynchroSleep.cpp
-  src/simix/SynchroRaw.cpp
-  src/simix/SynchroIo.cpp
+  src/kernel/activity/ActivityImpl.cpp
+  src/kernel/activity/SynchroComm.cpp
+  src/kernel/activity/SynchroExec.cpp
+  src/kernel/activity/SynchroSleep.cpp
+  src/kernel/activity/SynchroRaw.cpp
+  src/kernel/activity/SynchroIo.cpp
   
   ${SIMIX_GENERATED_SRC}
   )
@@ -365,13 +369,13 @@ set(SIMIX_SRC
 if (HAVE_BOOST_CONTEXTS)
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/ContextBoost.hpp
-      src/simix/ContextBoost.cpp)
+      src/kernel/context/ContextBoost.hpp
+      src/kernel/context/ContextBoost.cpp)
 else()
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/ContextBoost.hpp
-      src/simix/ContextBoost.cpp)
+      src/kernel/context/ContextBoost.hpp
+      src/kernel/context/ContextBoost.cpp)
 endif()
 
 set(S4U_SRC
@@ -626,12 +630,11 @@ set(headers_to_install
   include/msg/datatypes.h
   include/simdag/simdag.h
   include/simdag/datatypes.h
-  
+  include/simgrid/chrono.hpp
   include/simgrid/plugins/energy.h
   include/simgrid/instr.h
   include/simgrid/msg.h
   include/simgrid/simdag.h
-  include/simgrid.h
   include/simgrid/datatypes.h
   include/simgrid/modelchecker.h
   include/simgrid/forward.h
@@ -642,18 +645,18 @@ set(headers_to_install
   include/simgrid/host.h
   include/simgrid/link.h
   include/simgrid/s4u/forward.hpp
-  include/simgrid/s4u/actor.hpp
-  include/simgrid/s4u/As.hpp
   include/simgrid/s4u/Activity.hpp
+  include/simgrid/s4u/Actor.hpp
+  include/simgrid/s4u/As.hpp
   include/simgrid/s4u/comm.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/Mailbox.hpp
+  include/simgrid/s4u/Mutex.hpp
   include/simgrid/s4u/conditionVariable.hpp
   include/simgrid/s4u/storage.hpp  
-  include/simgrid/s4u.h
+  include/simgrid/s4u.hpp
   include/simgrid/plugins/energy.h
   include/smpi/mpi.h
   include/smpi/smpi.h
@@ -676,6 +679,7 @@ set(headers_to_install
   include/xbt/dynar.h
   include/xbt/dynar.hpp
   include/xbt/ex.h
+  include/xbt/ex.hpp
   include/xbt/exception.hpp
   include/xbt/backtrace.h
   include/xbt/backtrace.hpp
@@ -717,11 +721,11 @@ set(source_of_generated_headers
 ### depend of some variables setted upper
 # -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
 if(${HAVE_THREAD_CONTEXTS}) #pthread
-  set(SURF_SRC   ${SURF_SRC}   src/simix/ContextThread.cpp
-                               src/simix/ContextThread.hpp )
+  set(SURF_SRC   ${SURF_SRC}   src/kernel/context/ContextThread.cpp
+                               src/kernel/context/ContextThread.hpp )
 else() # NOT pthread
-  set(EXTRA_DIST ${EXTRA_DIST} src/simix/ContextThread.cpp
-                               src/simix/ContextThread.hpp )
+  set(EXTRA_DIST ${EXTRA_DIST} src/kernel/context/ContextThread.cpp
+                               src/kernel/context/ContextThread.hpp )
 endif()
 
 if(${HAVE_THREAD_CONTEXTS}) #pthread
@@ -732,9 +736,9 @@ else() # NOT pthread
 endif()
 
 if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
-  set(SURF_SRC    ${SURF_SRC}   src/simix/ContextUnix.cpp)
+  set(SURF_SRC    ${SURF_SRC}   src/kernel/context/ContextUnix.cpp)
 else() # NOT ucontext
-  set(EXTRA_DIST  ${EXTRA_DIST} src/simix/ContextUnix.cpp)
+  set(EXTRA_DIST  ${EXTRA_DIST} src/kernel/context/ContextUnix.cpp)
 endif()
 
 ### Simgrid Lib sources
@@ -773,8 +777,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/ContextThread.cpp
-    src/simix/ContextThread.hpp
+    src/kernel/context/ContextThread.cpp
+    src/kernel/context/ContextThread.hpp
     src/xbt/xbt_os_thread.c
     )
 endif()
@@ -805,14 +809,12 @@ set(DOC_SOURCES
   doc/doxygen/FAQ.doc
   doc/doxygen/application.doc
   doc/doxygen/community.doc
-  doc/doxygen/community_contact.doc
-  doc/doxygen/community_extend.doc
-  doc/doxygen/community_giveback.doc
   doc/doxygen/deployment.doc
   doc/doxygen/examples.doc
   doc/doxygen/footer.html
   doc/doxygen/getting_started.doc
   doc/doxygen/header.html
+  doc/doxygen/howtos.doc
   doc/doxygen/index.doc
   doc/doxygen/inside.doc
   doc/doxygen/inside_tests.doc
@@ -845,12 +847,14 @@ set(DOC_SOURCES
   doc/doxygen/scenario.doc
   doc/doxygen/stylesheet.css
   doc/doxygen/uhood.doc
+  doc/doxygen/uhood_switch.doc
 
   doc/manpage/smpicc.1
   doc/manpage/smpicxx.1
   doc/manpage/smpif90.1
   doc/manpage/smpiff.1
   doc/manpage/smpirun.1
+  doc/manpage/tesh.pod
 
   doc/msg-tuto-src/deployment0.xml
   doc/msg-tuto-src/deployment1.xml
@@ -914,8 +918,6 @@ set(txt_files
   AUTHORS
   COPYING
   README
-  README.java
-  README.lua
   ChangeLog
   INSTALL
   LICENSE-LGPL-2.1