X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3122a0e1bb6f981700bda4cd058f4d858c61b1cc..201615197616f659cc2ed820ed1bf411a4ed40ba:/tools/cmake/DefinePackages.cmake

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e0bcf1f8db..d49e39ffa9 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1,7 +1,7 @@
 ### define source packages
 
 set(EXTRA_DIST
-  src/bindings/java/MANIFEST.MF.in
+  src/bindings/java/MANIFEST.in
   src/include/instr/instr_interface.h
   src/include/mc/datatypes.h
   src/include/mc/mc.h
@@ -13,10 +13,8 @@ set(EXTRA_DIST
   src/include/smpi/smpi_interface.h
   src/include/surf/datatypes.h
   src/include/surf/maxmin.h
-  src/include/surf/random_mgr.h
   src/include/surf/surf.h
   src/include/surf/surfxml_parse_values.h
-  src/include/surf/trace_mgr.h
   src/include/xbt/win32_ucontext.h
   src/include/xbt/wine_dbghelp.h
   src/msg/msg_mailbox.h
@@ -26,18 +24,19 @@ set(EXTRA_DIST
   src/simdag/dax.dtd
   src/simdag/dax_dtd.c
   src/simdag/dax_dtd.h
-  src/simdag/private.h
+  src/simdag/simdag_private.h
   src/simix/simcalls.in
   src/simix/simcalls.py
   src/simix/popping_private.h
-  src/simix/popping_bodies.c
-  src/simix/popping_generated.c
+  src/simix/popping_bodies.cpp
+  src/simix/popping_generated.cpp
   src/simix/popping_enum.h
   src/simix/popping_accessors.h
   src/simix/smx_host_private.h
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
   src/simix/smx_private.h
+  src/simix/smx_private.hpp
   src/simix/smx_process_private.h
   src/simix/smx_synchro_private.h
   src/smpi/README
@@ -61,7 +60,7 @@ set(EXTRA_DIST
   src/surf/ns3/ns3_interface.h
   src/surf/ns3/ns3_simulator.h
   src/surf/ns3/red-queue.h
-  src/surf/platf_generator_private.h
+  src/surf/platform.hpp
   src/surf/plugins/energy.hpp
   src/surf/simgrid.dtd
   src/surf/simgrid_dtd.c
@@ -80,13 +79,13 @@ set(EXTRA_DIST
   src/surf/surf_routing_none.hpp
   src/surf/surf_routing_private.hpp
   src/surf/surf_routing_vivaldi.hpp
-  src/surf/surfxml_parse.c
-  src/surf/trace_mgr_private.h
+  src/surf/surfxml_parse.cpp
   src/surf/vm_hl13.hpp
+  src/surf/PropertyHolder.hpp
   src/surf/virtual_machine.hpp
   src/surf/host_clm03.hpp
   src/surf/host_interface.hpp
-  src/surf/host_ptask_L07.hpp
+  src/surf/ptask_L07.hpp
   src/xbt/automaton/automaton_lexer.yy.c
   src/xbt/automaton/parserPromela.lex
   src/xbt/automaton/parserPromela.tab.cacc
@@ -115,11 +114,11 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mmalloc.texi
   src/xbt/mmalloc/mmorecore.c
   src/xbt/mmalloc/mmprivate.h
-  src/xbt/mmalloc/mmtrace.awk
   src/xbt/mmalloc/mrealloc.c
   src/xbt/probes.h
   src/xbt/win32_ucontext.c
   tools/tesh/generate_tesh
+  tools/lualib.patch
   examples/smpi/mc/only_send_deterministic.tesh
   examples/smpi/mc/non_deterministic.tesh
   )
@@ -227,24 +226,24 @@ set(SMPI_SRC
   src/smpi/colls/smpi_intel_mpi_selector.c
   src/smpi/colls/smpi_openmpi_selector.c
   src/smpi/colls/smpi_mvapich2_selector.c
-  src/smpi/instr_smpi.c
-  src/smpi/smpi_base.c
-  src/smpi/smpi_bench.c
+  src/smpi/instr_smpi.cpp
+  src/smpi/smpi_base.cpp
+  src/smpi/smpi_bench.cpp
   src/smpi/smpi_memory.cpp
-  src/smpi/smpi_c99.c
-  src/smpi/smpi_coll.c
-  src/smpi/smpi_comm.c
-  src/smpi/smpi_deployment.c
-  src/smpi/smpi_dvfs.c
-  src/smpi/smpi_global.c
-  src/smpi/smpi_group.c
-  src/smpi/smpi_mpi.c
-  src/smpi/smpi_mpi_dt.c
-  src/smpi/smpi_pmpi.c
-  src/smpi/smpi_replay.c
-  src/smpi/smpi_rma.c
-  src/smpi/smpi_topo.c
-  src/smpi/smpi_f77.c
+  src/smpi/smpi_c99.cpp
+  src/smpi/smpi_coll.cpp
+  src/smpi/smpi_comm.cpp
+  src/smpi/smpi_deployment.cpp
+  src/smpi/smpi_dvfs.cpp
+  src/smpi/smpi_global.cpp
+  src/smpi/smpi_group.cpp
+  src/smpi/smpi_mpi.cpp
+  src/smpi/smpi_mpi_dt.cpp
+  src/smpi/smpi_pmpi.cpp
+  src/smpi/smpi_replay.cpp
+  src/smpi/smpi_rma.cpp
+  src/smpi/smpi_topo.cpp
+  src/smpi/smpi_f77.cpp
   )
 
 set(XBT_SRC
@@ -269,20 +268,18 @@ set(XBT_SRC
   src/xbt/memory_map.cpp
   src/xbt/memory_map.hpp
   src/xbt/parmap.cpp
-  src/xbt/set.c
   src/xbt/snprintf.c
+  src/xbt/string.cpp
   src/xbt/swag.c
   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_matrix.c
-  src/xbt/xbt_os_time.c
   src/xbt/xbt_os_file.c
-  src/xbt/xbt_peer.c
-  src/xbt/xbt_queue.c
+  src/xbt/xbt_os_synchro.c
+  src/xbt/xbt_os_time.c
   src/xbt/xbt_replay.c
-  src/xbt/xbt_sg_synchro.c
   src/xbt/xbt_sha.c
   src/xbt/xbt_str.c
   src/xbt/xbt_strbuff.c
@@ -307,12 +304,14 @@ set(NS3_SRC
   )
 
 set(SURF_SRC
+  src/surf/callbacks.h
+  src/surf/callbacks.cpp
   src/surf/cpu_cas01.cpp
   src/surf/cpu_interface.cpp
   src/surf/cpu_ti.cpp
   src/surf/fair_bottleneck.cpp
-  src/surf/instr_routing.c
-  src/surf/instr_surf.c
+  src/surf/instr_routing.cpp
+  src/surf/instr_surf.cpp
   src/surf/lagrange.cpp
   src/surf/maxmin.cpp
   src/surf/network_cm02.cpp
@@ -320,10 +319,9 @@ set(SURF_SRC
   src/surf/network_interface.cpp
   src/surf/network_smpi.cpp
   src/surf/network_ib.cpp
-  src/surf/platf_generator.c
   src/surf/plugins/energy.cpp
-  src/surf/random_mgr.c
-  src/surf/sg_platf.c
+  src/surf/PropertyHolder.cpp
+  src/surf/sg_platf.cpp
   src/surf/storage_interface.cpp
   src/surf/storage_n11.cpp
   src/surf/surf_c_bindings.cpp
@@ -338,34 +336,35 @@ set(SURF_SRC
   src/surf/surf_routing_generic.cpp
   src/surf/surf_routing_none.cpp
   src/surf/surf_routing_vivaldi.cpp
-  src/surf/surfxml_parse.c
-  src/surf/surfxml_parseplatf.c
-  src/surf/trace_mgr.c
+  src/surf/surfxml_parse.cpp
+  src/surf/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/host_interface.cpp
-  src/surf/host_ptask_L07.cpp
+  src/surf/ptask_L07.cpp
   src/xbt/xbt_sg_stubs.c
   )
 
 set(SIMIX_GENERATED_SRC
-  src/simix/popping_generated.c
+  src/simix/popping_generated.cpp
   )
 set(SIMIX_SRC
-  src/simix/libsmx.c
-  src/simix/smx_context.c
-  src/simix/smx_context_base.c
-  src/simix/smx_deployment.c
-  src/simix/smx_environment.c
-  src/simix/smx_global.c
-  src/simix/smx_host.c
-  src/simix/smx_io.c
-  src/simix/smx_network.c
-  src/simix/smx_process.c
-  src/simix/smx_synchro.c
-  src/simix/smx_vm.c
-  src/simix/popping.c
+  src/simix/libsmx.cpp
+  src/simix/smx_context.cpp
+  src/simix/Context.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/smx_synchro.cpp
+  src/simix/smx_vm.cpp
+  src/simix/popping.cpp
 
   ${SIMIX_GENERATED_SRC}
   )
@@ -374,22 +373,24 @@ set(SIMIX_SRC
 if (MSVC)
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/smx_context_raw.c)
+      src/simix/RawContext.cpp)
 else()
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/smx_context_raw.c)
+      src/simix/RawContext.cpp)
 endif()
 
 # Boost context may not be available
-if (HAVE_BOOST_CONTEXT)
+if (HAVE_BOOST_CONTEXTS)
   set(SIMIX_SRC
       ${SIMIX_SRC}
-      src/simix/smx_context_boost.cpp)
+      src/simix/BoostContext.hpp
+      src/simix/BoostContext.cpp)
 else()
   set(EXTRA_DIST
       ${EXTRA_DIST}
-      src/simix/smx_context_boost.cpp)
+      src/simix/BoostContext.hpp
+      src/simix/BoostContext.cpp)
 endif()
 
 set(S4U_SRC
@@ -410,122 +411,75 @@ set(SIMGRID_SRC
   )
 
 set(MSG_SRC
-  src/msg/instr_msg_process.c
-  src/msg/instr_msg_task.c
-  src/msg/instr_msg_vm.c
-  src/msg/msg_actions.c
-  src/msg/msg_deployment.c
-  src/msg/msg_environment.c
-  src/msg/msg_global.c
-  src/msg/msg_gos.c
-  src/msg/msg_host.c
-  src/msg/msg_io.c
-  src/msg/msg_mailbox.c
-  src/msg/msg_process.c
-  src/msg/msg_synchro.c
-  src/msg/msg_task.c
-  src/msg/msg_vm.c
+  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
+  src/msg/msg_global.cpp
+  src/msg/msg_gos.cpp
+  src/msg/msg_host.cpp
+  src/msg/msg_io.cpp
+  src/msg/msg_mailbox.cpp
+  src/msg/msg_process.cpp
+  src/msg/msg_synchro.cpp
+  src/msg/msg_task.cpp
+  src/msg/msg_vm.cpp
   )
 
 set(SIMDAG_SRC
-  src/simdag/instr_sd_task.c
-  src/simdag/sd_daxloader.c
-  src/simdag/sd_global.c
-  src/simdag/sd_link.c
-  src/simdag/sd_task.c
-  src/simdag/sd_workstation.c
+  src/simdag/sd_daxloader.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.c
+    ${SIMDAG_SRC} src/simdag/sd_dotloader.cpp
     )
 else()
   set(EXTRA_DIST
-    ${EXTRA_DIST} src/simdag/sd_dotloader.c
+    ${EXTRA_DIST} src/simdag/sd_dotloader.cpp
     )
 endif()
 
 set(BINDINGS_SRC
   src/bindings/bindings_global.c
   src/bindings/lua/lua_private.h
-  src/bindings/lua/lua_state_cloner.h
   src/bindings/lua/lua_utils.h
   src/bindings/lua/simgrid_lua.h
   )
 
-set(JSURF_SWIG_SRC
-  src/bindings/java/surf.i
-)
-
-set(JSURF_SWIG_SRC_EXTRA
-  src/bindings/java/surfdoc.i
-)
-
-set(JSURF_JAVA_C_SRC
-  src/bindings/java/surf_swig.cpp
-  src/bindings/java/surf_swig.hpp
-)
-
-set(JSURF_JAVA_GENERATED_SRC
-  src/bindings/java/org/simgrid/surf/Action.java
-  src/bindings/java/org/simgrid/surf/ActionList.java
-  src/bindings/java/org/simgrid/surf/ActionState.java
-  src/bindings/java/org/simgrid/surf/Cpu.java
-  src/bindings/java/org/simgrid/surf/CpuAction.java
-  src/bindings/java/org/simgrid/surf/CpuModel.java
-  src/bindings/java/org/simgrid/surf/LmmConstraint.java
-  src/bindings/java/org/simgrid/surf/LmmVariable.java
-  src/bindings/java/org/simgrid/surf/Model.java
-  src/bindings/java/org/simgrid/surf/NetworkAction.java
-  src/bindings/java/org/simgrid/surf/Link.java
-  src/bindings/java/org/simgrid/surf/Plugin.java
-  src/bindings/java/org/simgrid/surf/Resource.java
-  src/bindings/java/org/simgrid/surf/ResourceState.java
-  src/bindings/java/org/simgrid/surf/RoutingEdge.java
-  src/bindings/java/org/simgrid/surf/Surf.java
-  src/bindings/java/org/simgrid/surf/SurfJNI.java
-  src/bindings/java/org/simgrid/surf/TmgrTrace.java
-  src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java
-  src/bindings/java/org/simgrid/surf/XbtDict.java
-)
-
 set(JMSG_C_SRC
-  src/bindings/java/jmsg.c
+  src/bindings/java/jmsg.cpp
   src/bindings/java/jmsg.h
-  src/bindings/java/jmsg_as.c
+  src/bindings/java/jmsg_as.cpp
   src/bindings/java/jmsg_as.h
-  src/bindings/java/jmsg_comm.c
+  src/bindings/java/jmsg_comm.cpp
   src/bindings/java/jmsg_comm.h
-  src/bindings/java/jmsg_file.c
+  src/bindings/java/jmsg_file.cpp
   src/bindings/java/jmsg_file.h
-  src/bindings/java/jmsg_host.c
+  src/bindings/java/jmsg_host.cpp
   src/bindings/java/jmsg_host.h
-  src/bindings/java/jmsg_process.c
+  src/bindings/java/jmsg_process.cpp
   src/bindings/java/jmsg_process.h
-  src/bindings/java/jmsg_rngstream.c
+  src/bindings/java/jmsg_rngstream.cpp
   src/bindings/java/jmsg_rngstream.h
-  src/bindings/java/jmsg_synchro.c
+  src/bindings/java/jmsg_synchro.cpp
   src/bindings/java/jmsg_synchro.h
-  src/bindings/java/jmsg_task.c
+  src/bindings/java/jmsg_task.cpp
   src/bindings/java/jmsg_task.h
-  src/bindings/java/jmsg_vm.c
+  src/bindings/java/jmsg_vm.cpp
   src/bindings/java/jmsg_vm.h
-  src/bindings/java/jxbt_utilities.c
+  src/bindings/java/jxbt_utilities.cpp
   src/bindings/java/jxbt_utilities.h
-  src/bindings/java/smx_context_cojava.c
-  src/bindings/java/smx_context_cojava.h
-  src/bindings/java/smx_context_java.c
-  src/bindings/java/smx_context_java.h
-  src/bindings/java/jmsg_storage.c
+  src/bindings/java/JavaContext.cpp
+  src/bindings/java/JavaContext.hpp
+  src/bindings/java/jmsg_storage.cpp
   src/bindings/java/jmsg_storage.h
 )
 
-set(JSURF_C_SRC
-  src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
-  src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h
-  ${JSURF_JAVA_C_SRC}
-)
-
 set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/NativeLib.java
   src/bindings/java/org/simgrid/msg/As.java
@@ -551,11 +505,10 @@ set(JMSG_JAVA_SRC
   src/bindings/java/org/simgrid/msg/TimeoutException.java
   src/bindings/java/org/simgrid/msg/TransferFailureException.java
   src/bindings/java/org/simgrid/msg/VM.java
-  ${JSURF_JAVA_GENERATED_SRC}
 )
 
 set(JTRACE_C_SRC
-  src/bindings/java/jtrace.c
+  src/bindings/java/jtrace.cpp
   src/bindings/java/jtrace.h
 )
 
@@ -567,29 +520,24 @@ list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
 list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
 
 set(LUA_SRC
-  src/bindings/lua/factories/host.lua
-  src/bindings/lua/lua_comm.c
-  src/bindings/lua/lua_host.c
-  src/bindings/lua/lua_platf.c
-  src/bindings/lua/lua_process.c
-  src/bindings/lua/lua_state_cloner.c
-  src/bindings/lua/lua_task.c
-  src/bindings/lua/lua_utils.c
-  src/bindings/lua/simgrid_lua.c
+  src/bindings/lua/lua_host.cpp
+  src/bindings/lua/lua_platf.cpp
+  src/bindings/lua/lua_debug.cpp
+  src/bindings/lua/simgrid_lua.cpp
   )
 
 set(TRACING_SRC
-  src/instr/instr_TI_trace.c
-  src/instr/instr_config.c
-  src/instr/instr_interface.c
-  src/instr/instr_paje_containers.c
-  src/instr/instr_paje_header.c
-  src/instr/instr_paje_trace.c
-  src/instr/instr_paje_types.c
-  src/instr/instr_paje_values.c
+  src/instr/instr_TI_trace.cpp
+  src/instr/instr_config.cpp
+  src/instr/instr_interface.cpp
+  src/instr/instr_paje_containers.cpp
+  src/instr/instr_paje_header.cpp
+  src/instr/instr_paje_trace.cpp
+  src/instr/instr_paje_types.cpp
+  src/instr/instr_paje_values.cpp
   src/instr/instr_private.h
-  src/instr/instr_resource_utilization.c
-  src/instr/instr_trace.c
+  src/instr/instr_resource_utilization.cpp
+  src/instr/instr_trace.cpp
   )
 
 set(JEDULE_SRC
@@ -597,10 +545,10 @@ set(JEDULE_SRC
   include/simgrid/jedule/jedule_output.h
   include/simgrid/jedule/jedule_platform.h
   include/simgrid/jedule/jedule_sd_binding.h
-  src/instr/jedule/jedule_events.c
-  src/instr/jedule/jedule_output.c
-  src/instr/jedule/jedule_platform.c
-  src/instr/jedule/jedule_sd_binding.c
+  src/instr/jedule/jedule_events.cpp
+  src/instr/jedule/jedule_output.cpp
+  src/instr/jedule/jedule_platform.cpp
+  src/instr/jedule/jedule_sd_binding.cpp
   )
 
 set(MC_SRC_BASE
@@ -697,18 +645,20 @@ set(headers_to_install
   include/simdag/simdag.h
   include/simdag/datatypes.h
   
+  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
   include/simgrid/platf.h
-  include/simgrid/platf_generator.h
-  include/simgrid/plugins.h
   include/simgrid/simix.h
+  include/simgrid/simix.hpp
   include/simgrid/host.h
   include/simgrid/link.h
+  include/simgrid/s4u/forward.hpp
   include/simgrid/s4u/actor.hpp
   include/simgrid/s4u/async.hpp
   include/simgrid/s4u/comm.hpp
@@ -718,9 +668,9 @@ set(headers_to_install
   include/simgrid/s4u/mailbox.hpp  
   include/simgrid/s4u/storage.hpp  
   include/simgrid/s4u.h
+  include/simgrid/plugins/energy.h
   include/smpi/mpi.h
   include/smpi/smpi.h
-  include/smpi/smpi_cocci.h
   include/smpi/smpi_main.h
   include/surf/simgrid_dtd.h
   include/surf/surf_routing.h
@@ -734,6 +684,8 @@ set(headers_to_install
   include/xbt/config.h
   include/xbt/cunit.h
   include/xbt/dict.h
+  include/xbt/string.hpp
+  include/xbt/signal.hpp
   include/xbt/dynar.h
   include/xbt/ex.h
   include/xbt/fifo.h
@@ -745,6 +697,7 @@ set(headers_to_install
   include/xbt/hash.h
   include/xbt/heap.h
   include/xbt/lib.h
+  include/xbt/Extendable.hpp
   include/xbt/log.h
   include/xbt/mallocator.h
   include/xbt/matrix.h
@@ -752,10 +705,7 @@ set(headers_to_install
   include/xbt/mmalloc.h
   include/xbt/module.h
   include/xbt/parmap.h
-  include/xbt/peer.h
-  include/xbt/queue.h
   include/xbt/replay.h
-  include/xbt/set.h
   include/xbt/str.h
   include/xbt/strbuff.h
   include/xbt/swag.h
@@ -771,42 +721,56 @@ set(source_of_generated_headers
   src/context_sysv_config.h.in)
 
 ### depend of some variables setted upper
-# -->CONTEXT_THREADS CONTEXT_UCONTEXT
-if(${CONTEXT_THREADS}) #pthread
+# -->HAVE_THREAD_CONTEXTS HAVE_UCONTEXT_CONTEXTS
+if(${HAVE_THREAD_CONTEXTS}) #pthread
+  set(SURF_SRC
+    ${SURF_SRC}
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
+    )
+else() # NOT pthread
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
+    )
+endif()
+
+if(${HAVE_THREAD_CONTEXTS}) #pthread
   set(SURF_SRC
     ${SURF_SRC}
-    src/simix/smx_context_thread.c
     src/xbt/xbt_os_thread.c
     )
 else() # NOT pthread
   set(EXTRA_DIST
     ${EXTRA_DIST}
-    src/simix/smx_context_thread.c
     src/xbt/xbt_os_thread.c
     )
 endif()
 
-if(${CONTEXT_UCONTEXT}) #ucontext
+if(${HAVE_UCONTEXT_CONTEXTS}) #ucontext
   set(SURF_SRC
     ${SURF_SRC}
-    src/simix/smx_context_sysv.c
+    src/simix/UContext.cpp
     )
 else() # NOT ucontext
   set(EXTRA_DIST
     ${EXTRA_DIST}
-    src/simix/smx_context_sysv.c
+    src/simix/UContext.cpp
     )
 endif()
 
 ### Simgrid Lib sources
 set(simgrid_sources
   ${BINDINGS_SRC}
-  ${S4U_SRC}
+  ${MC_SRC_BASE}
   ${MSG_SRC}
+  ${S4U_SRC}
   ${SIMDAG_SRC}
   ${SIMGRID_SRC}
   ${SIMIX_SRC}
   ${SURF_SRC}
+  ${TRACING_SRC}
   ${XBT_SRC}
   )
 
@@ -829,16 +793,6 @@ if(enable_smpi)
     )
 endif()
 
-set(simgrid_sources
-    ${simgrid_sources}
-    ${TRACING_SRC}
-    )
-
-set(simgrid_sources
-  ${simgrid_sources}
-  ${MC_SRC_BASE}
-  )
-
 if(HAVE_MC)
   set(simgrid_sources
     ${simgrid_sources}
@@ -857,7 +811,8 @@ endif()
 if(WIN32)
   set(simgrid_sources
     ${simgrid_sources}
-    src/simix/smx_context_thread.c
+    src/simix/ThreadContext.cpp
+    src/simix/ThreadContext.hpp
     src/xbt/win32_ucontext.c
     src/xbt/xbt_os_thread.c
     )
@@ -892,10 +847,6 @@ set(DOC_SOURCES
   doc/triva-time_interval.png
   doc/triva-time_interval.svg
 
-  doc/HelloWorld/CMakeLists.txt
-  doc/HelloWorld/HelloWorld.c
-  doc/HelloWorld/README
-
   doc/doxygen/FAQ.doc
   doc/doxygen/advanced.doc
   doc/doxygen/bindings.doc
@@ -907,14 +858,14 @@ set(DOC_SOURCES
   doc/doxygen/header.html
   doc/doxygen/help.doc
   doc/doxygen/index.doc
-  doc/doxygen/inside_ci.doc
+  doc/doxygen/inside.doc
+  doc/doxygen/inside_tests.doc
   doc/doxygen/inside_cmake.doc
   doc/doxygen/inside_doxygen.doc
   doc/doxygen/inside_extending.doc
   doc/doxygen/inside_release.doc
   doc/doxygen/install.doc
-  doc/doxygen/internals.doc
-  doc/doxygen/introduction.doc
+  doc/doxygen/tutorial.doc
   doc/doxygen/module-msg.doc
   doc/doxygen/module-sd.doc
   doc/doxygen/module-simix.doc
@@ -946,11 +897,6 @@ set(DOC_SOURCES
   doc/msg-tuto-src/masterworker2.c
   doc/msg-tuto-src/masterworker3.c
   doc/msg-tuto-src/masterworker4.c
-  doc/msg-tuto-src/platforms/cloud.xml
-  doc/msg-tuto-src/platforms/g5k.xml
-  doc/msg-tuto-src/platforms/griffon.xml
-  doc/msg-tuto-src/platforms/peers.xml
-  doc/msg-tuto-src/platforms/platform.xml
 
   CITATION.bib
   )
@@ -969,7 +915,6 @@ set(DOC_TOOLS
 
 # these files get copied automatically to the html documentation
 set(DOC_IMG
-  ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css
   ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg
@@ -987,12 +932,6 @@ set(DOC_IMG
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win.bmp
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win_2011.bmp
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_01.png
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_02.png
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_03.png
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png
-  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/smpi_simgrid_alltoall_pair_16.png
   ${CMAKE_HOME_DIRECTORY}/doc/webcruft/smpi_simgrid_alltoall_ring_16.png
   )
@@ -1009,6 +948,7 @@ set(bin_files
 
 set(txt_files
   ${txt_files}
+  .appveyor-download.cmd
   AUTHORS
   COPYING
   README
@@ -1020,7 +960,6 @@ set(txt_files
   LICENSE-LGPL-2.1
   NEWS
   TODO
-  configure
   )
 
 set(EXAMPLES_CMAKEFILES_TXT
@@ -1029,8 +968,10 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/java/bittorrent/CMakeLists.txt
   examples/java/chord/CMakeLists.txt
   examples/java/cloud/CMakeLists.txt
+  examples/java/cloud/energy/CMakeLists.txt
   examples/java/cloud/migration/CMakeLists.txt
   examples/java/commTime/CMakeLists.txt
+  examples/java/energy/CMakeLists.txt
   examples/java/io/CMakeLists.txt
   examples/java/kademlia/CMakeLists.txt
   examples/java/master_slave_bypass/CMakeLists.txt
@@ -1040,13 +981,9 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/java/mutualExclusion/CMakeLists.txt
   examples/java/pingPong/CMakeLists.txt
   examples/java/priority/CMakeLists.txt
-  examples/java/reservationSurfPlugin/CMakeLists.txt
   examples/java/startKillTime/CMakeLists.txt
-  examples/java/surfCpuModel/CMakeLists.txt
-  examples/java/surfPlugin/CMakeLists.txt
   examples/java/suspend/CMakeLists.txt
   examples/java/tracing/CMakeLists.txt
-  examples/lua/CMakeLists.txt
   examples/msg/CMakeLists.txt
   examples/msg/actions/CMakeLists.txt
   examples/msg/bittorrent/CMakeLists.txt
@@ -1081,10 +1018,6 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/s4u/CMakeLists.txt
   examples/s4u/basic/CMakeLists.txt
   examples/s4u/io/CMakeLists.txt
-  examples/scala/CMakeLists.txt
-  examples/scala/master_slave_bypass/CMakeLists.txt
-  examples/scala/master_slave_kill/CMakeLists.txt
-  examples/scala/masterslave/CMakeLists.txt
   examples/simdag/CMakeLists.txt
   examples/simdag/dax/CMakeLists.txt
   examples/simdag/dot/CMakeLists.txt
@@ -1100,19 +1033,17 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/smpi/energy/CMakeLists.txt
   examples/smpi/energy/f77/CMakeLists.txt
   examples/smpi/energy/f90/CMakeLists.txt
-  examples/xbt/CMakeLists.txt
   )
 
 set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/bug-17132/CMakeLists.txt
-  teshsuite/java/CMakeLists.txt
+  teshsuite/java/semaphore/CMakeLists.txt
   teshsuite/java/sleep_host_off/CMakeLists.txt
   teshsuite/lua/lua_platforms.tesh
   teshsuite/mc/CMakeLists.txt
   teshsuite/mc/dwarf/CMakeLists.txt
   teshsuite/mc/dwarf_expression/CMakeLists.txt
   teshsuite/mc/replay/CMakeLists.txt
-  teshsuite/msg/CMakeLists.txt
   teshsuite/msg/get_sender/CMakeLists.txt
   teshsuite/msg/host_on_off/CMakeLists.txt
   teshsuite/msg/host_on_off_processes/CMakeLists.txt
@@ -1125,7 +1056,6 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/simdag/availability/CMakeLists.txt
   teshsuite/simdag/basic/CMakeLists.txt
   teshsuite/simdag/incomplete/CMakeLists.txt
-  teshsuite/simdag/network/CMakeLists.txt
   teshsuite/simdag/network/mxn/CMakeLists.txt
   teshsuite/simdag/network/p2p/CMakeLists.txt
   teshsuite/simdag/partask/CMakeLists.txt
@@ -1181,7 +1111,6 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
   teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
   teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
-  teshsuite/surf/CMakeLists.txt
   teshsuite/surf/lmm_usage/CMakeLists.txt
   teshsuite/surf/maxmin_bench/CMakeLists.txt
   teshsuite/surf/surf_usage/CMakeLists.txt
@@ -1226,7 +1155,6 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/Modules/FindNS3.cmake
   tools/cmake/Modules/FindRngStream.cmake
   tools/cmake/Modules/FindRubySimgrid.cmake
-  tools/cmake/Modules/FindScala.cmake
   tools/cmake/Modules/FindSimGrid.cmake
   tools/cmake/Modules/FindValgrind.cmake
   tools/cmake/Option.cmake
@@ -1239,16 +1167,11 @@ set(CMAKE_SOURCE_FILES
   tools/cmake/scripts/IPC/Run/Win32IO.pm
   tools/cmake/scripts/IPC/Run/Win32Pump.pm
   tools/cmake/scripts/Diff.pm
-  tools/cmake/scripts/Makefile.default
-  tools/cmake/scripts/SimGrid.packproj
   tools/cmake/scripts/generate_memcheck_tests.pl
   tools/cmake/scripts/my_valgrind.pl
-  tools/cmake/scripts/postinstall.sh
-  tools/cmake/scripts/preinstall.sh
   tools/cmake/scripts/update_tesh.pl
   tools/cmake/UnitTesting.cmake
   tools/cmake/src/internal_config.h.in
-  tools/cmake/src/simgrid.nsi.in
   tools/cmake/test_prog/prog_AC_CHECK_MCSC.c
   tools/cmake/test_prog/prog_gnu_dynlinker.c
   tools/cmake/test_prog/prog_mutex_timedlock.c
@@ -1281,12 +1204,11 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/clusters_routing_full.xml
   examples/platforms/crosstraffic.xml
   examples/platforms/conf/gridpp_grid_2004.conf
-  examples/platforms/conf/gridpp_grid_2004.xml
   examples/platforms/conf/lcg_sept2004_grid.conf
-  examples/platforms/conf/lcg_sept2004_grid.xml
   examples/platforms/conf/transform_optorsim_platform.pl
   examples/platforms/config.xml
   examples/platforms/config_tracing.xml
+  examples/platforms/trace/linkBandwidth7.bw
   examples/platforms/trace/trace_A_failure.txt
   examples/platforms/trace/trace_A.txt
   examples/platforms/trace/trace_B.txt
@@ -1296,8 +1218,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/g5k.xml
   examples/platforms/generation_scripts/create_hierarchical_clusters.pl
   examples/platforms/generation_scripts/enhancedDTDwithHierarchicalCluster.pl
-  examples/platforms/generation_scripts/generate_g5k_platform.pl
-  examples/platforms/generation_scripts/generate_g5k_platform_cabinets.pl
   examples/platforms/griffon.xml
   examples/platforms/meta_cluster.xml
   examples/platforms/multicore_machine.xml
@@ -1307,10 +1227,10 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/routing_cluster.xml
   examples/platforms/routing_cluster.lua
   examples/platforms/routing_none.xml
+  examples/platforms/simulacrum_7_hosts.xml
   examples/platforms/storage/content/small_content.txt
   examples/platforms/storage/content/storage_content.txt
   examples/platforms/storage/content/win_storage_content.txt
-  examples/platforms/storage/remote_io.deployment.xml
   examples/platforms/storage/remote_io.xml
   examples/platforms/storage/storage.xml
   examples/platforms/small_platform.xml