Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Add in DefinePackage.cmake the man pages
[simgrid.git] / buildtools / Cmake / DefinePackages.cmake
index 0431796..293ef28 100644 (file)
@@ -1,11 +1,13 @@
 ### define source packages
 
 set(EXTRA_DIST
-  src/amok/Bandwidth/bandwidth_private.h
-  src/amok/amok_modinter.h
+  src/bindings/java/MANIFEST.MF.in
+  src/include/instr/instr_interface.h
   src/include/mc/datatypes.h
   src/include/mc/mc.h
   src/include/simgrid/platf_interface.h
+  src/include/simgrid/sg_config.h
+  src/include/smpi/smpi_interface.h
   src/include/surf/datatypes.h
   src/include/surf/maxmin.h
   src/include/surf/random_mgr.h
@@ -14,9 +16,9 @@ set(EXTRA_DIST
   src/include/surf/surf_resource_lmm.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/include/xbt/xbt_os_time.h
-  src/mk_supernovae.pl
   src/msg/msg_mailbox.h
   src/msg/msg_private.h
   src/portable.h
@@ -24,6 +26,14 @@ set(EXTRA_DIST
   src/simdag/dax_dtd.c
   src/simdag/dax_dtd.h
   src/simdag/private.h
+  src/simix/simcalls.in
+  src/simix/simcalls.py
+  src/simix/simcalls_generated_enum.h
+  src/simix/simcalls_generated_string.c
+  src/simix/simcalls_generated_res_getter_setter.h
+  src/simix/simcalls_generated_args_getter_setter.h
+  src/simix/simcalls_generated_case.c
+  src/simix/simcalls_generated_body.c
   src/simix/smx_host_private.h
   src/simix/smx_io_private.h
   src/simix/smx_network_private.h
@@ -32,28 +42,54 @@ set(EXTRA_DIST
   src/simix/smx_smurf_private.h
   src/simix/smx_synchro_private.h
   src/smpi/README
+  src/smpi/colls/colls.h
+  src/smpi/colls/colls_private.h
+  src/smpi/colls/coll_tuned_topo.h
   src/smpi/private.h
   src/smpi/smpi_mpi_dt_private.h
-  src/surf/cpu_ti_private.h
-  src/surf/platf_generator_private.h
+  src/surf/plugins/energy.hpp
+  src/surf/cpu_interface.hpp
+  src/surf/cpu_ti.hpp
+  src/surf/cpu_cas01.hpp
   src/surf/gtnets/gtnets_interface.h
   src/surf/gtnets/gtnets_simulator.h
   src/surf/gtnets/gtnets_topology.h
-  src/surf/maxmin_private.h
-  src/surf/network_gtnets_private.h
-  src/surf/network_ns3_private.h
-  src/surf/network_private.h
+  src/surf/maxmin_private.hpp
+  src/surf/network_interface.hpp
+  src/surf/network_gtnets.hpp
+  src/surf/network_ns3.hpp
+  src/surf/network_cm02.hpp
+  src/surf/network_smpi.hpp
+  src/surf/network_constant.hpp
   src/surf/ns3/my-point-to-point-helper.h
   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/simgrid.dtd
   src/surf/simgrid_dtd.c
-  src/surf/storage_private.h
+  src/surf/storage_interface.hpp
+  src/surf/storage_n11.hpp
+  src/surf/surf_interface.hpp
   src/surf/surf_private.h
-  src/surf/surf_routing_private.h
+  src/surf/surf_routing_private.hpp
+  src/surf/surf_routing.hpp
+  src/surf/surf_routing_cluster.hpp
+  src/surf/surf_routing_cluster_torus.hpp
+  src/surf/surf_routing_dijkstra.hpp
+  src/surf/surf_routing_floyd.hpp
+  src/surf/surf_routing_full.hpp
+  src/surf/surf_routing_generic.hpp
+  src/surf/surf_routing_none.hpp
+  src/surf/surf_routing_vivaldi.hpp
   src/surf/surfxml_parse.c
   src/surf/trace_mgr_private.h
+  src/surf/vm_workstation_interface.hpp
+  src/surf/vm_workstation_hl13.hpp
+  src/surf/workstation_interface.hpp
+  src/surf/workstation_clm03.hpp
+  src/surf/workstation_ptask_L07.hpp
+  src/win32/config.h
   src/xbt/automaton/automaton_lexer.yy.c
   src/xbt/automaton/parserPromela.lex
   src/xbt/automaton/parserPromela.tab.cacc
@@ -85,34 +121,119 @@ set(EXTRA_DIST
   src/xbt/mmalloc/mmtrace.awk
   src/xbt/mmalloc/mrealloc.c
   src/xbt/setset_private.h
+  src/xbt/win32_ucontext.c
   tools/tesh/run_context.h
   tools/tesh/tesh.h
-  )
-
-set(XBT_RL_SRC
-  src/xbt/xbt_rl_synchro.c
-  src/xbt/xbt_rl_time.c
-  )
-
-set(XBT_SG_SRC
-  src/xbt/xbt_sg_synchro.c
-  src/xbt/xbt_sg_time.c
+  src/surf/surf_routing_cluster_fat_tree.hpp
   )
 
 set(SMPI_SRC
+  src/surf/surf_routing_cluster_fat_tree.cpp
+  src/smpi/instr_smpi.c
   src/smpi/smpi_base.c
   src/smpi/smpi_bench.c
   src/smpi/smpi_c99.c
   src/smpi/smpi_coll.c
   src/smpi/smpi_comm.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_topo.c
+  src/smpi/colls/smpi_openmpi_selector.c
+  src/smpi/colls/smpi_mpich_selector.c
+  src/smpi/colls/colls_global.c
+  src/smpi/colls/allgather-2dmesh.c
+  src/smpi/colls/allgather-3dmesh.c
+  src/smpi/colls/allgather-bruck.c
+  src/smpi/colls/allgather-GB.c
+  src/smpi/colls/allgather-loosely-lr.c
+  src/smpi/colls/allgather-NTSLR.c
+  src/smpi/colls/allgather-NTSLR-NB.c
+  src/smpi/colls/allgather-pair.c
+  src/smpi/colls/allgather-rdb.c
+  src/smpi/colls/allgather-rhv.c
+  src/smpi/colls/allgather-ring.c
+  src/smpi/colls/allgather-SMP-NTS.c
+  src/smpi/colls/allgather-smp-simple.c
+  src/smpi/colls/allgather-spreading-simple.c
+  src/smpi/colls/allgather-ompi-neighborexchange.c
+  src/smpi/colls/allgatherv-GB.c
+  src/smpi/colls/allgatherv-pair.c
+  src/smpi/colls/allgatherv-ring.c
+  src/smpi/colls/allgatherv-ompi-neighborexchange.c
+  src/smpi/colls/allgatherv-ompi-bruck.c
+  src/smpi/colls/allgatherv-mpich-rdb.c
+  src/smpi/colls/allgatherv-mpich-ring.c
+  src/smpi/colls/allreduce-lr.c
+  src/smpi/colls/allreduce-rab1.c
+  src/smpi/colls/allreduce-rab2.c
+  src/smpi/colls/allreduce-rab-rdb.c
+  src/smpi/colls/allreduce-rdb.c
+  src/smpi/colls/allreduce-redbcast.c
+  src/smpi/colls/allreduce-smp-binomial.c
+  src/smpi/colls/allreduce-smp-binomial-pipeline.c
+  src/smpi/colls/allreduce-smp-rdb.c
+  src/smpi/colls/allreduce-smp-rsag.c
+  src/smpi/colls/allreduce-smp-rsag-lr.c
+  src/smpi/colls/allreduce-smp-rsag-rab.c
+  src/smpi/colls/allreduce-ompi-ring-segmented.c
+  src/smpi/colls/alltoall-2dmesh.c
+  src/smpi/colls/alltoall-3dmesh.c
+#  src/smpi/colls/alltoall-bruck.c
+  src/smpi/colls/alltoall-pair.c
+  src/smpi/colls/alltoall-pair-light-barrier.c
+  src/smpi/colls/alltoall-pair-mpi-barrier.c
+  src/smpi/colls/alltoall-pair-one-barrier.c
+  src/smpi/colls/alltoall-rdb.c
+  src/smpi/colls/alltoall-ring.c
+  src/smpi/colls/alltoall-ring-light-barrier.c
+  src/smpi/colls/alltoall-ring-mpi-barrier.c
+  src/smpi/colls/alltoall-ring-one-barrier.c
+  src/smpi/colls/alltoallv-pair.c
+  src/smpi/colls/alltoallv-pair-light-barrier.c
+  src/smpi/colls/alltoallv-pair-mpi-barrier.c
+  src/smpi/colls/alltoallv-pair-one-barrier.c
+  src/smpi/colls/alltoallv-ring.c
+  src/smpi/colls/alltoallv-ring-light-barrier.c
+  src/smpi/colls/alltoallv-ring-mpi-barrier.c
+  src/smpi/colls/alltoallv-ring-one-barrier.c
+  src/smpi/colls/alltoallv-bruck.c
+  src/smpi/colls/alltoallv-ompi-basic-linear.c
+  src/smpi/colls/bcast-arrival-pattern-aware.c
+  src/smpi/colls/bcast-arrival-pattern-aware-wait.c
+  src/smpi/colls/bcast-arrival-scatter.c
+  src/smpi/colls/bcast-binomial-tree.c
+  src/smpi/colls/bcast-flattree.c
+  src/smpi/colls/bcast-flattree-pipeline.c
+  src/smpi/colls/bcast-NTSB.c
+  src/smpi/colls/bcast-NTSL.c
+  src/smpi/colls/bcast-NTSL-Isend.c
+  src/smpi/colls/bcast-scatter-LR-allgather.c
+  src/smpi/colls/bcast-scatter-rdb-allgather.c
+  src/smpi/colls/bcast-SMP-binary.c
+  src/smpi/colls/bcast-SMP-binomial.c
+  src/smpi/colls/bcast-SMP-linear.c
+  src/smpi/colls/coll_tuned_topo.c
+  src/smpi/colls/bcast-ompi-split-bintree.c
+  src/smpi/colls/bcast-ompi-pipeline.c
+  src/smpi/colls/reduce-arrival-pattern-aware.c
+  src/smpi/colls/reduce-binomial.c
+  src/smpi/colls/reduce-flat-tree.c
+  src/smpi/colls/reduce-NTSL.c
+  src/smpi/colls/reduce-scatter-gather.c
+  src/smpi/colls/reduce-ompi.c
+  src/smpi/colls/gather-ompi.c
+  src/smpi/colls/reduce_scatter-ompi.c
+  src/smpi/colls/reduce_scatter-mpich.c
+  src/smpi/colls/smpi_automatic_selector.c
+  src/smpi/colls/scatter-ompi.c
+  src/smpi/colls/barrier-ompi.c
   )
-  
+
 if(SMPI_F2C)
   set(SMPI_SRC
     ${SMPI_SRC}
@@ -159,15 +280,15 @@ set(XBT_SRC
   src/xbt/xbt_peer.c
   src/xbt/xbt_queue.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
-  src/xbt/xbt_synchro.c
   src/xbt/xbt_virtu.c
   src/xbt_modinter.h
   )
 
-if(HAVE_MMAP)
+if(HAVE_MMALLOC)
   set(XBT_SRC
     ${XBT_SRC}
     src/xbt/mmalloc/mm.c
@@ -178,11 +299,11 @@ set(GTNETS_SRC
   src/surf/gtnets/gtnets_interface.cc
   src/surf/gtnets/gtnets_simulator.cc
   src/surf/gtnets/gtnets_topology.cc
-  src/surf/network_gtnets.c
+  src/surf/network_gtnets.cpp
   )
 
 set(NS3_SRC
-  src/surf/network_ns3.c
+  src/surf/network_ns3.cpp
   src/surf/ns3/my-point-to-point-helper.cc
   src/surf/ns3/ns3_interface.cc
   src/surf/ns3/ns3_simulator.cc
@@ -190,35 +311,43 @@ set(NS3_SRC
   )
 
 set(SURF_SRC
-  src/surf/cpu_cas01.c
-  src/surf/cpu_ti.c
-  src/surf/fair_bottleneck.c
-  src/surf/lagrange.c
-  src/surf/maxmin.c
-  src/surf/network.c
-  src/surf/network_constant.c
+  src/surf/plugins/energy.cpp
+  src/surf/cpu_interface.cpp
+  src/surf/cpu_ti.cpp
+  src/surf/cpu_cas01.cpp
+  src/surf/fair_bottleneck.cpp
+  src/surf/instr_routing.c
+  src/surf/instr_surf.c
+  src/surf/lagrange.cpp
+  src/surf/maxmin.cpp
+  src/surf/network_interface.cpp
+  src/surf/network_cm02.cpp
+  src/surf/network_smpi.cpp
+  src/surf/network_constant.cpp
   src/surf/platf_generator.c
   src/surf/random_mgr.c
   src/surf/sg_platf.c
-  src/surf/storage.c
-  src/surf/surf.c
-  src/surf/surf_action.c
-  src/surf/surf_config.c
-  src/surf/surf_model.c
-  src/surf/surf_routing.c
-  src/surf/surf_routing_cluster.c
-  src/surf/surf_routing_dijkstra.c
-  src/surf/surf_routing_floyd.c
-  src/surf/surf_routing_full.c
-  src/surf/surf_routing_generic.c
-  src/surf/surf_routing_none.c
-  src/surf/surf_routing_rulebased.c
-  src/surf/surf_routing_vivaldi.c
+  src/surf/storage_interface.cpp
+  src/surf/storage_n11.cpp
+  src/surf/surf_interface.cpp
+  src/surf/surf_c_bindings.cpp
+  src/surf/surf_routing.cpp
+  src/surf/surf_routing_cluster.cpp
+  src/surf/surf_routing_cluster_torus.cpp
+  src/surf/surf_routing_dijkstra.cpp
+  src/surf/surf_routing_floyd.cpp
+  src/surf/surf_routing_full.cpp
+  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/workstation.c
-  src/surf/workstation_ptask_L07.c
+  src/surf/workstation_interface.cpp
+  src/surf/workstation_clm03.cpp
+  src/surf/workstation_ptask_L07.cpp
+  src/surf/vm_workstation_interface.cpp
+  src/surf/vm_workstation_hl13.cpp
   src/xbt/xbt_sg_stubs.c
   )
 
@@ -236,11 +365,18 @@ set(SIMIX_SRC
   src/simix/smx_smurf.c
   src/simix/smx_synchro.c
   src/simix/smx_user.c
+  src/simix/smx_vm.c
+  )
+
+set(SIMGRID_SRC
+  src/simgrid/sg_config.c
   )
 
 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_config.c
   src/msg/msg_deployment.c
   src/msg/msg_environment.c
   src/msg/msg_global.c
@@ -249,6 +385,7 @@ set(MSG_SRC
   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
   )
@@ -270,20 +407,8 @@ set(SIMIX_SRC
 )
 #* ****************************************************************************************** *#
 
-#* ****************************************************************************************** *#
-#* TUTORIAL: New Model                                                                        *#
-
-set(SURF_SRC
-  ${SURF_SRC}
-  src/surf/new_model.c
-  )
-set(EXTRA_DIST
-  ${EXTRA_DIST}
-  src/surf/new_model_private.h
-  )
-#* ****************************************************************************************** *#
-
 set(SIMDAG_SRC
+  src/simdag/instr_sd_task.c
   src/simdag/sd_daxloader.c
   src/simdag/sd_global.c
   src/simdag/sd_link.c
@@ -308,13 +433,132 @@ set(BINDINGS_SRC
   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/Surf.java
+  src/bindings/java/org/simgrid/surf/SurfJNI.java
+  src/bindings/java/org/simgrid/surf/Plugin.java
+  src/bindings/java/org/simgrid/surf/Model.java
+  src/bindings/java/org/simgrid/surf/CpuModel.java
+  src/bindings/java/org/simgrid/surf/Resource.java
+  src/bindings/java/org/simgrid/surf/Action.java
+  src/bindings/java/org/simgrid/surf/Cpu.java
+  src/bindings/java/org/simgrid/surf/CpuAction.java
+  src/bindings/java/org/simgrid/surf/NetworkLink.java
+  src/bindings/java/org/simgrid/surf/NetworkAction.java
+
+  src/bindings/java/org/simgrid/surf/RoutingEdge.java
+  src/bindings/java/org/simgrid/surf/TmgrTraceEvent.java
+  src/bindings/java/org/simgrid/surf/TmgrTrace.java
+
+  src/bindings/java/org/simgrid/surf/ActionList.java
+
+  #enums
+  src/bindings/java/org/simgrid/surf/ActionState.java
+  src/bindings/java/org/simgrid/surf/ResourceState.java
+
+  src/bindings/java/org/simgrid/surf/LmmConstraint.java
+  src/bindings/java/org/simgrid/surf/LmmVariable.java
+  src/bindings/java/org/simgrid/surf/XbtDict.java
+)
+
+set(JMSG_C_SRC
+  src/bindings/java/jmsg.c
+  src/bindings/java/jmsg.h
+  src/bindings/java/jmsg_as.c
+  src/bindings/java/jmsg_as.h
+  src/bindings/java/jmsg_comm.c
+  src/bindings/java/jmsg_comm.h
+  src/bindings/java/jmsg_file.c
+  src/bindings/java/jmsg_file.h
+  src/bindings/java/jmsg_host.c
+  src/bindings/java/jmsg_host.h
+  src/bindings/java/jmsg_process.c
+  src/bindings/java/jmsg_process.h
+  src/bindings/java/jmsg_rngstream.c
+  src/bindings/java/jmsg_rngstream.h
+  src/bindings/java/jmsg_synchro.c
+  src/bindings/java/jmsg_synchro.h
+  src/bindings/java/jmsg_task.c
+  src/bindings/java/jmsg_task.h
+  src/bindings/java/jmsg_vm.c
+  src/bindings/java/jmsg_vm.h
+  src/bindings/java/jxbt_utilities.c
+  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
+)
+
+set(JSURF_C_SRC
+  src/bindings/java/surfJAVA_wrap.cxx
+  src/bindings/java/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
+  src/bindings/java/org/simgrid/msg/Comm.java
+  src/bindings/java/org/simgrid/msg/File.java
+  src/bindings/java/org/simgrid/msg/Host.java
+  src/bindings/java/org/simgrid/msg/HostFailureException.java
+  src/bindings/java/org/simgrid/msg/HostNotFoundException.java
+  src/bindings/java/org/simgrid/msg/JniException.java
+  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
+  src/bindings/java/org/simgrid/msg/RngStream.java
+  src/bindings/java/org/simgrid/msg/Semaphore.java
+  src/bindings/java/org/simgrid/msg/Task.java
+  src/bindings/java/org/simgrid/msg/TaskCancelledException.java
+  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.h
+)
+
+set(JTRACE_JAVA_SRC
+  src/bindings/java/org/simgrid/trace/Trace.java
+)
+
+if(HAVE_TRACING)
+  list(APPEND JMSG_C_SRC ${JTRACE_C_SRC})
+  list(APPEND JMSG_JAVA_SRC ${JTRACE_JAVA_SRC})
+else()
+  list(APPEND EXTRA_DIST ${JTRACE_C_SRC})
+  list(APPEND EXTRA_DIST ${JTRACE_JAVA_SRC})
+endif()
+
 set(LUA_SRC
   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_stub_generator.c
   src/bindings/lua/lua_task.c
   src/bindings/lua/lua_utils.c
   src/bindings/lua/simgrid_lua.c
@@ -323,18 +567,15 @@ set(LUA_SRC
 set(TRACING_SRC
   src/instr/instr_config.c
   src/instr/instr_interface.c
-  src/instr/instr_msg_process.c
-  src/instr/instr_msg_task.c
   src/instr/instr_paje_containers.c
+  src/instr/instr_TI_trace.c
   src/instr/instr_paje_trace.c
+  src/instr/instr_trace.c
   src/instr/instr_paje_header.c
   src/instr/instr_paje_types.c
   src/instr/instr_paje_values.c
   src/instr/instr_private.h
   src/instr/instr_resource_utilization.c
-  src/instr/instr_routing.c
-  src/instr/instr_smpi.c
-  src/instr/instr_surf.c
   )
 
 set(JEDULE_SRC
@@ -353,30 +594,39 @@ set(MC_SRC
   src/mc/mc_compare.c
   src/mc/mc_dpor.c
   src/mc/mc_global.c
+  src/mc/mc_dwarf.c
+  src/mc/mc_member.c
+  src/mc/mc_dwarf_attrnames.h
+  src/mc/mc_dwarf_expression.c
+  src/mc/mc_dwarf_tagnames.h
   src/mc/mc_liveness.c
   src/mc/mc_memory.c
   src/mc/mc_private.h
   src/mc/mc_request.c
   src/mc/mc_state.c
   src/mc/memory_map.c
+  src/mc/mc_pair.c
+  src/mc/mc_hash.c
+  src/mc/mc_set.cpp
   )
 
 set(headers_to_install
-  include/amok/bandwidth.h
-  include/amok/peermanagement.h
+  include/simgrid.h
   include/instr/instr.h
   include/msg/datatypes.h
   include/msg/msg.h
   include/simdag/datatypes.h
   include/simdag/simdag.h
+  include/simgrid/datatypes.h
   include/simgrid/modelchecker.h
   include/simgrid/platf.h
   include/simgrid/platf_generator.h
+  include/simgrid/plugins.h
   include/simgrid/simix.h
   include/smpi/mpi.h
-  include/smpi/mpif.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
   include/surf/surfxml_parse.h
@@ -390,7 +640,6 @@ set(headers_to_install
   include/xbt/dynar.h
   include/xbt/ex.h
   include/xbt/fifo.h
-  include/xbt/file_stat.h
   include/xbt/function_types.h
   include/xbt/graph.h
   include/xbt/graphxml.h
@@ -413,15 +662,14 @@ set(headers_to_install
   include/xbt/str.h
   include/xbt/strbuff.h
   include/xbt/swag.h
-  include/xbt/synchro.h
   include/xbt/synchro_core.h
   include/xbt/sysdep.h
-  include/xbt/time.h
   include/xbt/virtu.h
   include/xbt/xbt_os_thread.h
   )
 set(source_of_generated_headers
   include/simgrid_config.h.in
+  include/smpi/mpif.h.in
   include/smpi/smpif.h.in
   src/context_sysv_config.h.in)
 
@@ -470,15 +718,45 @@ endif()
 set(simgrid_sources
   ${BINDINGS_SRC}
   ${GTNETS_USED}
-  ${JEDULE_SRC}
   ${MSG_SRC}
   ${SIMDAG_SRC}
+  ${SIMGRID_SRC}
   ${SIMIX_SRC}
   ${SURF_SRC}
-  ${TRACING_SRC}
   ${XBT_SRC}
   )
 
+if(${HAVE_JEDULE})
+  set(simgrid_sources
+    ${simgrid_sources}
+    ${JEDULE_SRC}
+    )
+else()
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    ${JEDULE_SRC}
+    )
+endif()
+
+if(enable_smpi)
+  set(simgrid_sources
+    ${simgrid_sources}
+    ${SMPI_SRC}
+    )
+endif()
+
+if(${HAVE_TRACING})
+  set(simgrid_sources
+    ${simgrid_sources}
+    ${TRACING_SRC}
+    )
+else()
+  set(EXTRA_DIST
+    ${EXTRA_DIST}
+    ${TRACING_SRC}
+    )
+endif()
+
 if(HAVE_MC)
   set(simgrid_sources
     ${simgrid_sources}
@@ -516,239 +794,133 @@ else()
 endif()
 
 set(DOC_SOURCES
-  doc/amok_bw_sat.png
-  doc/amok_bw_test.png
-  doc/AS_hierarchy.png
+  doc/Doxyfile.in
+  doc/Layout.xml
   doc/sg_thread_model.fig
   doc/simix.fig
   doc/surf_nutshell.fig
-  doc/Doxyfile.in
-  doc/FAQ.doc
-  doc/index.doc
-  doc/simgrid.css
-  doc/SimgridDoxygenLayout.xml
   doc/triva-graph_configuration.png
+  doc/triva-graph_configuration.svg
   doc/triva-graph_visualization.png
+  doc/triva-graph_visualization.svg
   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
+  doc/doxygen/contributing.doc
+  doc/doxygen/deployment.doc
+  doc/doxygen/footer.html
+  doc/doxygen/getting_started.doc
+  doc/doxygen/header.html
+  doc/doxygen/help.doc
+  doc/doxygen/index.doc
+  doc/doxygen/inside_autotests.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/module-msg.doc
+  doc/doxygen/module-sd.doc
+  doc/doxygen/module-simix.doc
+  doc/doxygen/module-surf.doc
+  doc/doxygen/module-smpi.doc
+  doc/doxygen/module-trace.doc
+  doc/doxygen/module-xbt.doc
+  doc/doxygen/modules.doc
+  doc/doxygen/options.doc
+  doc/doxygen/platform.doc
+  doc/doxygen/pls.doc
+  doc/doxygen/stylesheet.css
+  doc/doxygen/tracing.doc
+  doc/doxygen/use.doc
+
+  doc/msg-tuto-src/deployment0.xml
+  doc/msg-tuto-src/deployment1.xml
+  doc/msg-tuto-src/deployment2.xml
+  doc/msg-tuto-src/deployment3.xml
+  doc/msg-tuto-src/deployment_general.xml
+  doc/msg-tuto-src/masterworker0.c
+  doc/msg-tuto-src/masterworker1.c
+  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
+
+  doc/manpage/smpicc.1
+  doc/manpage/smpirun.1
+  CITATION.bib
   )
 
 set(DOC_FIGS
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig
   )
-  
-set(DOC_SHARED_TAG
-  doc/shared/doxygen/simgriddevguide.tag
-  doc/shared/doxygen/simgridrefguide.tag
-  doc/shared/doxygen/simgriduserguide.tag
-  )
-  
+
 set(DOC_TOOLS
   tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/index_create.pl
   tools/doxygen/xbt_log_extract_hierarchy.pl
   )
 
-set(DOC_GTUT_SRC
-  doc/gtut-files/01-bones.c
-  doc/gtut-files/01-bones.output
-  doc/gtut-files/02-simple.c
-  doc/gtut-files/02-simple.output
-  doc/gtut-files/03-args.c
-  doc/gtut-files/03-args.output
-  doc/gtut-files/03-args.xml
-  doc/gtut-files/04-callback.c
-  doc/gtut-files/04-callback.output
-  doc/gtut-files/05-globals.c
-  doc/gtut-files/05-globals.output
-  doc/gtut-files/06-logs.c
-  doc/gtut-files/06-logs.output
-  doc/gtut-files/06-logs.output.error
-  doc/gtut-files/06-logs.output.fmt
-  doc/gtut-files/06-logs.output.fmt-bt
-  doc/gtut-files/06-logs.output.verbose
-  doc/gtut-files/07-timers.c
-  doc/gtut-files/07-timers.output
-  doc/gtut-files/08-exceptions.c
-  doc/gtut-files/08-exceptions.output
-  doc/gtut-files/09-datatype-dump.c
-  doc/gtut-files/09-simpledata.c
-  doc/gtut-files/09-simpledata.output
-  doc/gtut-files/10-rpc.c
-  doc/gtut-files/10-rpc.output
-  doc/gtut-files/11-explicitwait.c
-  doc/gtut-files/11-explicitwait.output
-  doc/gtut-files/11-explicitwait.xml
-  doc/gtut-files/gtut-platform-3nodes.xml
-  doc/gtut-files/gtut-platform.xml
-  doc/gtut-files/Makefile
-  doc/gtut-files/README
-  doc/gtut-files/test.xml
-)
-
-set(USER_GUIDE_SOURCES
-  doc/user_guide/doxygen/footer.html
-  doc/user_guide/doxygen/header.html
-  doc/user_guide/doxygen/UserGuideDoxyfile.in
-  doc/user_guide/doxygen/UserGuideDoxygenLayout.xml
-  doc/user_guide/doxygen/bindings.doc
-  doc/user_guide/doxygen/deployment.doc
-  doc/user_guide/doxygen/examples.doc
-  doc/user_guide/doxygen/index.doc
-  doc/user_guide/doxygen/install.doc
-  doc/user_guide/doxygen/options.doc
-  doc/user_guide/doxygen/platform.doc
-  doc/user_guide/doxygen/pls.doc
-  doc/user_guide/doxygen/tracing.doc
-  doc/user_guide/doxygen/use.doc
-  doc/user_guide/doxygen/stylesheet.css
-  )
-  
-set(LISTE_GTUT
-    doc/gtut-files/gtut-tour-00-install.doc
-    doc/gtut-files/gtut-tour-01-bones.doc
-    doc/gtut-files/gtut-tour-02-simple.doc
-    doc/gtut-files/gtut-tour-03-args.doc
-    doc/gtut-files/gtut-tour-04-callback.doc
-    doc/gtut-files/gtut-tour-05-globals.doc
-    doc/gtut-files/gtut-tour-06-logs.doc
-    doc/gtut-files/gtut-tour-07-timers.doc
-    doc/gtut-files/gtut-tour-08-exceptions.doc
-    doc/gtut-files/gtut-tour-09-simpledata.doc
-    doc/gtut-files/gtut-tour-10-rpc.doc
-    doc/gtut-files/gtut-tour-11-explicitwait.doc
-    doc/gtut-files/gtut-tour-12-staticstruct.doc
-    doc/gtut-files/gtut-tour-13-pointers.doc
-    doc/gtut-files/gtut-tour-14-dynar.doc
-    doc/gtut-files/gtut-tour-15-manualdatadef.doc
-    doc/gtut-files/gtut-tour-16-exchangecb.doc
-    doc/gtut-files/gtut-tour.doc
-    doc/gtut-files/gtut-tour-recap-messages.doc
-  )
-
-set(EXTRA_LISTE_GTUT
-    doc/gtut-files/01-bones.output
-    doc/gtut-files/02-simple.output
-    doc/gtut-files/03-args.output
-    doc/gtut-files/03-args.xml
-    doc/gtut-files/04-callback.output
-    doc/gtut-files/05-globals.output
-    doc/gtut-files/06-logs.output
-    doc/gtut-files/06-logs.output.error
-    doc/gtut-files/06-logs.output.fmt
-    doc/gtut-files/06-logs.output.fmt-bt
-    doc/gtut-files/06-logs.output.verbose
-    doc/gtut-files/07-timers.output
-    doc/gtut-files/08-exceptions.output
-    doc/gtut-files/09-simpledata.output
-    doc/gtut-files/10-rpc.output
-    doc/gtut-files/11-explicitwait.output
-    doc/gtut-files/11-explicitwait.xml
-    doc/gtut-files/gtut-howto-design.doc
-    doc/gtut-files/gtut-howto.doc
-    doc/gtut-files/gtut-introduction.doc
-    doc/gtut-files/gtut-main.doc
-    doc/gtut-files/gtut-platform-3nodes.xml
-    doc/gtut-files/gtut-platform.xml
-    doc/gtut-files/README
-    doc/gtut-files/test.xml
-    )
-  
-set(REF_GUIDE_SOURCES
-  doc/ref_guide/doxygen/footer.html
-  doc/ref_guide/doxygen/header.html
-  doc/ref_guide/doxygen/main.doc
-  doc/ref_guide/doxygen/module-amok.doc
-  doc/ref_guide/doxygen/module-msg.doc
-  doc/ref_guide/doxygen/module-sd.doc
-  doc/ref_guide/doxygen/module-simix.doc
-  doc/ref_guide/doxygen/module-surf.doc
-  doc/ref_guide/doxygen/module-trace.doc
-  doc/ref_guide/doxygen/module-xbt.doc
-  doc/ref_guide/doxygen/modules.doc
-  doc/ref_guide/doxygen/RefGuideDoxyfile.in
-  doc/ref_guide/doxygen/RefGuideDoxygenLayout.xml
-  doc/ref_guide/doxygen/stylesheet.css
-  )
-
-set(DEV_GUIDE_SOURCES
-  doc/dev_guide/doxygen/footer.html
-  doc/dev_guide/doxygen/header.html
-  doc/dev_guide/doxygen/index.doc
-  doc/dev_guide/doxygen/cmake.doc
-  doc/dev_guide/doxygen/simgrid.doc
-  doc/dev_guide/doxygen/xps.doc
-  doc/dev_guide/doxygen/DevGuideDoxyfile.in
-  doc/dev_guide/doxygen/DevGuideDoxygenLayout.xml
-  doc/dev_guide/doxygen/stylesheet.css
-  )
-
+# these files get copied automatically to the html documentation
 set(DOC_IMG
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/README
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_001.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_002.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_003.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_004.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_005.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_006.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_007.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_008.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_009.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_010.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_011.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_012.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_013.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_014.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_015.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_016.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_017.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_018.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_019.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_020.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_021.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_022.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_023.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_024.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_025.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_026.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_027.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_028.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_029.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101_030.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid-101.pdf
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win_2011.bmp
-${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win.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/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
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.icns
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.ico
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/awstats_logo3.png
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/output.goal.pdf
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/poster_thumbnail.png
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif
+  ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png
+  ${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
+  )
 
 set(bin_files
   ${bin_files}
   src/smpi/smpicc.in
   src/smpi/smpif2c.in
   src/smpi/smpiff.in
+  src/smpi/smpif90.in
   src/smpi/smpirun.in
+  src/smpi/smpitools.sh
   )
 
 set(txt_files
   ${txt_files}
   AUTHORS
   COPYING
+  README
+  README.java
   ChangeLog
+  ChangeLog.SimGrid-java
   INSTALL
   LICENSE-LGPL-2.1
   NEWS
@@ -757,14 +929,38 @@ set(txt_files
   )
 
 set(EXAMPLES_CMAKEFILES_TXT
-  examples/amok/bandwidth/CMakeLists.txt
-  examples/amok/saturate/CMakeLists.txt
+  examples/java/CMakeLists.txt
+  examples/java/async/CMakeLists.txt
+  examples/java/bittorrent/CMakeLists.txt
+  examples/java/chord/CMakeLists.txt
+  examples/java/cloud/CMakeLists.txt
+  examples/java/cloud/migration/CMakeLists.txt
+  examples/java/commTime/CMakeLists.txt
+  examples/java/io/CMakeLists.txt
+  examples/java/kademlia/CMakeLists.txt
+  examples/java/master_slave_bypass/CMakeLists.txt
+  examples/java/master_slave_kill/CMakeLists.txt
+  examples/java/masterslave/CMakeLists.txt
+  examples/java/migration/CMakeLists.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
+  examples/msg/chainsend/CMakeLists.txt
   examples/msg/chord/CMakeLists.txt
   examples/msg/cloud/CMakeLists.txt
+  examples/msg/energy/e1/CMakeLists.txt
+  examples/msg/energy/e2/CMakeLists.txt
+  examples/msg/energy/e3/CMakeLists.txt
   examples/msg/gpu/CMakeLists.txt
   examples/msg/gtnets/CMakeLists.txt
   examples/msg/icomms/CMakeLists.txt
@@ -775,43 +971,73 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/msg/migration/CMakeLists.txt
   examples/msg/ns3/CMakeLists.txt
   examples/msg/parallel_task/CMakeLists.txt
+  examples/msg/pastry/CMakeLists.txt
   examples/msg/pmm/CMakeLists.txt
   examples/msg/priority/CMakeLists.txt
   examples/msg/properties/CMakeLists.txt
+  examples/msg/semaphores/CMakeLists.txt
   examples/msg/sendrecv/CMakeLists.txt
   examples/msg/start_kill_time/CMakeLists.txt
   examples/msg/suspend/CMakeLists.txt
   examples/msg/token_ring/CMakeLists.txt
   examples/msg/tracing/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
   examples/simdag/goal/CMakeLists.txt
+  examples/simdag/io/CMakeLists.txt
   examples/simdag/metaxml/CMakeLists.txt
   examples/simdag/properties/CMakeLists.txt
   examples/simdag/scheduling/CMakeLists.txt
   examples/smpi/CMakeLists.txt
   examples/smpi/MM/CMakeLists.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/CMakeLists.txt
   teshsuite/msg/CMakeLists.txt
+  teshsuite/msg/storage/CMakeLists.txt
   teshsuite/msg/trace/CMakeLists.txt
+  teshsuite/bug-17132/CMakeLists.txt
   teshsuite/simdag/CMakeLists.txt
+  teshsuite/simdag/availability/CMakeLists.txt
   teshsuite/simdag/network/CMakeLists.txt
   teshsuite/simdag/network/mxn/CMakeLists.txt
   teshsuite/simdag/network/p2p/CMakeLists.txt
   teshsuite/simdag/partask/CMakeLists.txt
   teshsuite/simdag/platforms/CMakeLists.txt
-  teshsuite/xbt/CMakeLists.txt
+  teshsuite/simix/CMakeLists.txt
   teshsuite/smpi/CMakeLists.txt
-  teshsuite/smpi/mpich-test/env/CMakeLists.txt
-  teshsuite/smpi/mpich-test/coll/CMakeLists.txt
-  teshsuite/smpi/mpich-test/context/CMakeLists.txt
-  teshsuite/smpi/mpich-test/profile/CMakeLists.txt
-  teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/group/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/init/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt
+#  teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
+  teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
+  teshsuite/xbt/CMakeLists.txt
   )
 
 set(TOOLS_CMAKEFILES_TXT
@@ -823,37 +1049,39 @@ set(TOOLS_CMAKEFILES_TXT
 set(TESTSUITE_CMAKEFILES_TXT
   testsuite/surf/CMakeLists.txt
   testsuite/xbt/CMakeLists.txt
+  testsuite/mc/CMakeLists.txt
   )
 
 set(CMAKE_SOURCE_FILES
   CMakeLists.txt
   buildtools/Cmake/AddTests.cmake
   buildtools/Cmake/CTestConfig.cmake
+  buildtools/Cmake/CTestCustom.cmake
   buildtools/Cmake/CompleteInFiles.cmake
   buildtools/Cmake/DefinePackages.cmake
   buildtools/Cmake/Distrib.cmake
   buildtools/Cmake/Flags.cmake
   buildtools/Cmake/GenerateDoc.cmake
   buildtools/Cmake/GenerateDocWin.cmake
-  buildtools/Cmake/GenerateRefGuide.cmake
-  buildtools/Cmake/GenerateUserGuide.cmake
-  buildtools/Cmake/GenerateDevGuide.cmake
   buildtools/Cmake/MaintainerMode.cmake
   buildtools/Cmake/MakeExe.cmake
+  buildtools/Cmake/MakeJava.cmake
   buildtools/Cmake/MakeLib.cmake
   buildtools/Cmake/MakeLibWin.cmake
   buildtools/Cmake/Modules/FindF2c.cmake
+  buildtools/Cmake/Modules/FindGFortran.cmake
   buildtools/Cmake/Modules/FindGTnets.cmake
   buildtools/Cmake/Modules/FindGraphviz.cmake
+  buildtools/Cmake/Modules/FindLibSigc++.cmake
+  buildtools/Cmake/Modules/FindLibunwind.cmake
+  buildtools/Cmake/Modules/FindLibdw.cmake
   buildtools/Cmake/Modules/FindLua51Simgrid.cmake
   buildtools/Cmake/Modules/FindNS3.cmake
-  buildtools/Cmake/Modules/FindPCRE.cmake
-  buildtools/Cmake/Modules/FindPcreWin.cmake
   buildtools/Cmake/Modules/FindRngStream.cmake
   buildtools/Cmake/Modules/FindRubySimgrid.cmake
+  buildtools/Cmake/Modules/FindScala.cmake
   buildtools/Cmake/Modules/FindSimGrid.cmake
   buildtools/Cmake/Modules/FindValgrind.cmake
-  buildtools/Cmake/Modules/FindLibunwind.cmake
   buildtools/Cmake/Option.cmake
   buildtools/Cmake/Pipol.cmake
   buildtools/Cmake/PrintArgs.cmake
@@ -862,18 +1090,18 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/Scripts/SimGrid.packproj
   buildtools/Cmake/Scripts/generate_memcheck_tests.pl
   buildtools/Cmake/Scripts/generate_new_tests.pl
+  buildtools/Cmake/Scripts/java_bundle.sh
   buildtools/Cmake/Scripts/my_valgrind.pl
   buildtools/Cmake/Scripts/postinstall.sh
   buildtools/Cmake/Scripts/preinstall.sh
   buildtools/Cmake/Scripts/tesh.pl
-  buildtools/Cmake/Scripts/test_java.sh
   buildtools/Cmake/Scripts/update_tesh.pl
-  buildtools/Cmake/Supernovae.cmake
   buildtools/Cmake/UnitTesting.cmake
+  buildtools/Cmake/src/internal_config.h.in
   buildtools/Cmake/src/simgrid.nsi.in
   buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c
-  buildtools/Cmake/test_prog/prog_getline.c
-  buildtools/Cmake/test_prog/prog_max_size.c
+  buildtools/Cmake/test_prog/prog_gnu_dynlinker.c
+  buildtools/Cmake/test_prog/prog_gtnets.cpp
   buildtools/Cmake/test_prog/prog_mutex_timedlock.c
   buildtools/Cmake/test_prog/prog_printf_null.c
   buildtools/Cmake/test_prog/prog_sem_init.c
@@ -883,7 +1111,6 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/test_prog/prog_stackgrowth.c
   buildtools/Cmake/test_prog/prog_stacksetup.c
   buildtools/Cmake/test_prog/prog_thread_storage.c
-  buildtools/Cmake/test_prog/prog_va_copy.c
   buildtools/Cmake/test_prog/prog_vsnprintf.c
   )
 
@@ -894,7 +1121,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/cluster.xml
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_no_backbone.xml
-  examples/platforms/cluster_routing_rulebased.xml
   examples/platforms/clusters_routing_full.xml
   examples/platforms/conf/gridpp_grid_2004.conf
   examples/platforms/conf/gridpp_grid_2004.xml
@@ -902,7 +1128,9 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/conf/lcg_sept2004_grid.xml
   examples/platforms/conf/transform_optorsim_platform.pl
   examples/platforms/config.xml
+  examples/platforms/content/small_content.txt
   examples/platforms/content/storage_content.txt
+  examples/platforms/content/win_storage_content.txt
   examples/platforms/data_center.xml
   examples/platforms/g5k.xml
   examples/platforms/generation_scripts/create_hierarchical_clusters.pl
@@ -910,8 +1138,11 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/generation_scripts/generate_g5k_platform.pl
   examples/platforms/generation_scripts/generate_g5k_platform_cabinets.pl
   examples/platforms/griffon.xml
+  examples/platforms/torus_cluster.xml
+  examples/platforms/meta_cluster.xml
   examples/platforms/multicore_machine.xml
   examples/platforms/prop.xml
+  examples/platforms/routing_cluster.xml
   examples/platforms/storage.xml
   examples/platforms/syscoord/generate_peer_platform.pl
   examples/platforms/syscoord/median_harvard.syscoord
@@ -920,10 +1151,8 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/syscoord/median_meridian.xml
   examples/platforms/syscoord/median_p2psim.syscoord
   examples/platforms/syscoord/median_p2psim.xml
-  examples/platforms/vivaldi.xml
-  examples/platforms/routing_cluster.xml
-  examples/platforms/meta_cluster.xml
   examples/platforms/two_peers.xml
+  examples/platforms/vivaldi.xml
   )
 
 set(generated_src_files