From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 17 Sep 2018 22:47:16 +0000 (+0200)
Subject: Rename cluster.xml to cluster_backbone.xml
X-Git-Tag: v3_21~93
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d1614bd7c880c562af7dce339b0564a21f30c24d

Rename cluster.xml to cluster_backbone.xml

also, fix the make dist and some cosmetics.
---

diff --git a/docs/source/tuto_smpi.rst b/docs/source/tuto_smpi.rst
index 18b5d9adb7..28ca7e7dfa 100644
--- a/docs/source/tuto_smpi.rst
+++ b/docs/source/tuto_smpi.rst
@@ -81,7 +81,7 @@ Simple Example with 3 hosts
 At the most basic level, you can describe your simulated platform as a
 graph of hosts and network links. For instance:
 
-.. image:: /tuto_smpi/img/3hosts.png
+.. image:: /tuto_smpi/3hosts.png
    :align: center
 
 .. literalinclude:: /tuto_smpi/3hosts.xml
diff --git a/docs/source/tuto_smpi/img/3hosts.png b/docs/source/tuto_smpi/3hosts.png
similarity index 100%
rename from docs/source/tuto_smpi/img/3hosts.png
rename to docs/source/tuto_smpi/3hosts.png
diff --git a/examples/java/app/bittorrent/Main.java b/examples/java/app/bittorrent/Main.java
index a181eb3dc8..314888f02c 100644
--- a/examples/java/app/bittorrent/Main.java
+++ b/examples/java/app/bittorrent/Main.java
@@ -20,7 +20,7 @@ class Main{
     Msg.init(args);
     if(args.length < 2) {
       Msg.info("Usage   : Bittorrent platform_file deployment_file");
-      Msg.info("example : Bittorrent ../platforms/cluster.xml bittorrent.xml");
+      Msg.info("example : Bittorrent ../platforms/cluster_backbone.xml bittorrent.xml");
       System.exit(1);
     }
 
diff --git a/examples/java/app/bittorrent/app-bittorrent.tesh b/examples/java/app/bittorrent/app-bittorrent.tesh
index c9608c654e..3eedd82a3b 100644
--- a/examples/java/app/bittorrent/app-bittorrent.tesh
+++ b/examples/java/app/bittorrent/app-bittorrent.tesh
@@ -3,7 +3,7 @@
 ! output sort 19
 ! timeout 15
 
-$ java -classpath ${classpath:=.} app/bittorrent/Main ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/app/bittorrent/bittorrent.xml
+$ java -classpath ${classpath:=.} app/bittorrent/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/app/bittorrent/bittorrent.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [5000.046836] [java/INFO] MSG_main finished; Terminating the simulation...
 > [node-0.acme.org:app.bittorrent.Tracker:(1) 0.000000] [java/INFO] Tracker launched.
diff --git a/examples/java/dht/chord/dht-chord.tesh b/examples/java/dht/chord/dht-chord.tesh
index 6f75315785..11b2e8468d 100644
--- a/examples/java/dht/chord/dht-chord.tesh
+++ b/examples/java/dht/chord/dht-chord.tesh
@@ -2,7 +2,7 @@
 
 ! output sort 19
 
-$ java -classpath ${classpath:=.} dht/chord/Main ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/dht/chord/chord.xml
+$ java -classpath ${classpath:=.} dht/chord/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dht/chord/chord.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [1046.732943] [java/INFO] MSG_main finished; Terminating the simulation...
 > [node-1.acme.org:dht.chord.Node:(2) 0.000000] [java/INFO] Joining the ring with id 366680 knowing node 42
diff --git a/examples/java/dht/kademlia/dht-kademlia.tesh b/examples/java/dht/kademlia/dht-kademlia.tesh
index d2c6f69cb2..f5ff1e4714 100644
--- a/examples/java/dht/kademlia/dht-kademlia.tesh
+++ b/examples/java/dht/kademlia/dht-kademlia.tesh
@@ -2,7 +2,7 @@
 
 ! output sort 19
 
-$ java -classpath ${classpath:=.} dht/kademlia/Main ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/dht/kademlia/kademlia.xml
+$ java -classpath ${classpath:=.} dht/kademlia/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dht/kademlia/kademlia.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [900.000000] [java/INFO] MSG_main finished; Terminating the simulation...
 > [node-0.acme.org:dht.kademlia.Node:(1) 0.000000] [java/INFO] Hi, I'm going to create the network with the id 0!
diff --git a/examples/java/process/startkilltime/process-startkilltime.tesh b/examples/java/process/startkilltime/process-startkilltime.tesh
index d3a5f486ff..889c1fd7c3 100644
--- a/examples/java/process/startkilltime/process-startkilltime.tesh
+++ b/examples/java/process/startkilltime/process-startkilltime.tesh
@@ -1,5 +1,5 @@
 #!/usr/bin/env tesh
-$ java -classpath ${classpath:=.} process/startkilltime/Main ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/process/startkilltime/startkilltime.xml
+$ java -classpath ${classpath:=.} process/startkilltime/Main ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/process/startkilltime/startkilltime.xml
 > [0.000000] [java/INFO] Using regular java threads.
 > [node-0.acme.org:process.startkilltime.Sleeper:(1) 0.000000] [java/INFO] Hello! I go to sleep.
 > [node-1.acme.org:process.startkilltime.Sleeper:(2) 1.000000] [java/INFO] Hello! I go to sleep.
diff --git a/examples/msg/cloud-masterworker/cloud-masterworker.c b/examples/msg/cloud-masterworker/cloud-masterworker.c
index 93b2ef35e1..bcbb01ade0 100644
--- a/examples/msg/cloud-masterworker/cloud-masterworker.c
+++ b/examples/msg/cloud-masterworker/cloud-masterworker.c
@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
   MSG_init(&argc, argv);
   MSG_vm_live_migration_plugin_init();
 
-  xbt_assert(argc >1,"Usage: %s example/platforms/cluster.xml\n", argv[0]);
+  xbt_assert(argc >1,"Usage: %s example/platforms/cluster_backbone.xml\n", argv[0]);
 
   /* Load the platform file */
   MSG_create_environment(argv[1]);
diff --git a/examples/msg/cloud-masterworker/cloud-masterworker.tesh b/examples/msg/cloud-masterworker/cloud-masterworker.tesh
index aacd8f1d69..08a3842448 100644
--- a/examples/msg/cloud-masterworker/cloud-masterworker.tesh
+++ b/examples/msg/cloud-masterworker/cloud-masterworker.tesh
@@ -2,7 +2,7 @@
 
 p Testing the Cloud API with a simple master/workers
 
-$ $SG_TEST_EXENV ${bindir:=.}/cloud-masterworker$EXEEXT --log=no_loc ${platfdir}/cluster.xml
+$ $SG_TEST_EXENV ${bindir:=.}/cloud-masterworker$EXEEXT --log=no_loc ${platfdir}/cluster_backbone.xml
 > [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] # Launch 2 VMs
 > [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] create VM00 on PM(node-1.acme.org)
 > [node-0.acme.org:master:(1) 0.000000] [msg_test/INFO] put a process (WRK00) on VM00
diff --git a/examples/msg/dht-kademlia/dht-kademlia.tesh b/examples/msg/dht-kademlia/dht-kademlia.tesh
index e34f10f1ae..940e8dc92d 100644
--- a/examples/msg/dht-kademlia/dht-kademlia.tesh
+++ b/examples/msg/dht-kademlia/dht-kademlia.tesh
@@ -3,7 +3,7 @@
 p Testing the Kademlia implementation with MSG
 
 ! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/dht-kademlia ${platfdir}/cluster.xml ${srcdir}/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir}/dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n"
 > [  0.000000] ( 1:node@node-0.acme.org) Hi, I'm going to create the network with id 0
 > [  0.000000] ( 2:node@node-1.acme.org) Hi, I'm going to join the network with id 1
 > [  0.000000] ( 3:node@node-2.acme.org) Hi, I'm going to join the network with id 3
diff --git a/examples/msg/dht-pastry/dht-pastry.tesh b/examples/msg/dht-pastry/dht-pastry.tesh
index d86b3ae825..4f0cd41a59 100644
--- a/examples/msg/dht-pastry/dht-pastry.tesh
+++ b/examples/msg/dht-pastry/dht-pastry.tesh
@@ -2,7 +2,7 @@
 
 p Testing the Pastry implementation with MSG
 
-$ $SG_TEST_EXENV ${bindir:=.}/dht-pastry$EXEEXT -nb_bits=6 ${platfdir}/cluster.xml ${srcdir}/dht-pastry_d.xml --log=msg_pastry.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/dht-pastry$EXEEXT -nb_bits=6 ${platfdir}/cluster_backbone.xml ${srcdir}/dht-pastry_d.xml --log=msg_pastry.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [ 25.007806] (1:node@node-0.acme.org) Task update from 366680 !!!
 > [ 25.007806] (1:node@node-0.acme.org) Node:
 > [ 25.007806] (1:node@node-0.acme.org)  Id: 42 '0000002a' 
diff --git a/examples/platforms/cluster.xml b/examples/platforms/cluster_backbone.xml
similarity index 100%
rename from examples/platforms/cluster.xml
rename to examples/platforms/cluster_backbone.xml
diff --git a/examples/platforms/cluster_fat_tree.xml.svg b/examples/platforms/cluster_fat_tree.svg
similarity index 100%
rename from examples/platforms/cluster_fat_tree.xml.svg
rename to examples/platforms/cluster_fat_tree.svg
diff --git a/examples/platforms/cluster_torus.xml.svg b/examples/platforms/cluster_torus.svg
similarity index 100%
rename from examples/platforms/cluster_torus.xml.svg
rename to examples/platforms/cluster_torus.svg
diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh
index 2f6c5be924..4a58e068dd 100644
--- a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh
+++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-lifetime ${platfdir}/cluster.xml s4u-actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-lifetime ${platfdir}/cluster_backbone.xml s4u-actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [  0.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  2.000000] (3:sleeper@node-0.acme.org) Hello! I go to sleep.
diff --git a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh
index ae84ce8df0..78c526950b 100644
--- a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh
+++ b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh
@@ -4,7 +4,7 @@ p Testing the Bittorrent implementation with S4U
 
 ! timeout 10
 ! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-bittorrent ${platfdir}/cluster.xml s4u-app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-bittorrent ${platfdir}/cluster_backbone.xml s4u-app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
 > [    0.000000] (1:tracker@node-0.acme.org) Tracker launched.
 > [    0.000000] (2:peer@node-1.acme.org) Hi, I'm joining the network with id 2
 > [    0.000000] (3:peer@node-2.acme.org) Hi, I'm joining the network with id 3
diff --git a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh
index dc325c4532..fc96fcb010 100644
--- a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh
+++ b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh
@@ -4,7 +4,7 @@ p Testing the chainsend S4U implementation
 
 ! timeout 60
 ! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-chainsend ${platfdir}/cluster.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-app-chainsend ${platfdir}/cluster_backbone.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
 > [    2.214423] (2:peer@node-1.acme.org) ### 2.214423 16777216 bytes (Avg 7.225360 MB/s); copy finished (simulated).
 > [    2.222796] (3:peer@node-2.acme.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated).
 > [    2.231170] (4:peer@node-3.acme.org) ### 2.231170 16777216 bytes (Avg 7.171127 MB/s); copy finished (simulated).
diff --git a/examples/s4u/dht-chord/s4u-dht-chord.tesh b/examples/s4u/dht-chord/s4u-dht-chord.tesh
index 8f4168bc05..3505574dbe 100644
--- a/examples/s4u/dht-chord/s4u-dht-chord.tesh
+++ b/examples/s4u/dht-chord/s4u-dht-chord.tesh
@@ -3,7 +3,7 @@
 p Testing the Chord implementation with S4U
 
 ! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-dht-chord$EXEEXT -nb_bits=3 ${platfdir}/cluster.xml s4u-dht-chord_d.xml --log=s4u_chord.thres:verbose "--log=root.fmt:[%10.5r]%e(%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-dht-chord$EXEEXT -nb_bits=3 ${platfdir}/cluster_backbone.xml s4u-dht-chord_d.xml --log=s4u_chord.thres:verbose "--log=root.fmt:[%10.5r]%e(%P@%h)%e%m%n"
 > [   0.00000] (node@node-0.acme.org) My finger table:
 > [   0.00000] (node@node-0.acme.org) Start | Succ
 > [   0.00000] (node@node-0.acme.org)    3  |  42
diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia.cpp b/examples/s4u/dht-kademlia/s4u-dht-kademlia.cpp
index 172292a3dc..5ff1345d8c 100644
--- a/examples/s4u/dht-kademlia/s4u-dht-kademlia.cpp
+++ b/examples/s4u/dht-kademlia/s4u-dht-kademlia.cpp
@@ -87,7 +87,8 @@ int main(int argc, char* argv[])
   simgrid::s4u::Engine e(&argc, argv);
 
   /* Check the arguments */
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n\tExample: %s cluster.xml dht-kademlia_d.xml\n",
+  xbt_assert(argc > 2,
+             "Usage: %s platform_file deployment_file\n\tExample: %s cluster_backbone.xml dht-kademlia_d.xml\n",
              argv[0], argv[0]);
 
   e.load_platform(argv[1]);
diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh
index e17c478a89..94de33bf7c 100644
--- a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh
+++ b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh
@@ -3,7 +3,7 @@
 p Testing the Kademlia implementation with S4U
 
 ! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-dht-kademlia ${platfdir}/cluster.xml ${srcdir:=.}/s4u-dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-dht-kademlia ${platfdir}/cluster_backbone.xml ${srcdir:=.}/s4u-dht-kademlia_d.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n"
 > [  0.000000] ( 1:node@node-0.acme.org) Hi, I'm going to create the network with id 0
 > [  0.000000] ( 2:node@node-1.acme.org) Hi, I'm going to join the network with id 1
 > [  0.000000] ( 3:node@node-2.acme.org) Hi, I'm going to join the network with id 3
diff --git a/examples/simdag/dag-dotload/sd_dag-dotload.tesh b/examples/simdag/dag-dotload/sd_dag-dotload.tesh
index 68337f1186..317aa20efc 100644
--- a/examples/simdag/dag-dotload/sd_dag-dotload.tesh
+++ b/examples/simdag/dag-dotload/sd_dag-dotload.tesh
@@ -4,7 +4,7 @@ p Test the loader of DAG written in the DOT format
 # The order differ when executed with gcc's thread sanitizer
 ! output sort
 
-$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/dag-dotload/dag.dot
+$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------
 > [0.000000] [sd_task/INFO] Displaying task root
@@ -217,7 +217,7 @@ $ cat ${srcdir:=.}/dag-dotload/dag.trace
 $ rm -f ${srcdir:=.}/dag-dotload/dag.trace ${srcdir:=.}/dot.dot
 
 ! expect return 2
-$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot
+$ $SG_TEST_EXENV ${bindir:=.}/dag-dotload/sd_dag-dotload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/dag-dotload/dag_with_cycle.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] the task root is not marked
 > [0.000000] [sd_daxparse/WARNING] the task 1 is in a cycle
diff --git a/examples/simdag/daxload/sd_daxload.tesh b/examples/simdag/daxload/sd_daxload.tesh
index c81779d426..c2823c2321 100644
--- a/examples/simdag/daxload/sd_daxload.tesh
+++ b/examples/simdag/daxload/sd_daxload.tesh
@@ -2,7 +2,7 @@
 p Test the DAX loader on a small DAX instance
 
 ! output sort
-$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/daxload/smalldax.xml
+$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/smalldax.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] Ignore file o1 size redefinition from 1000000 to 304
 > [0.000000] [sd_daxparse/WARNING] Ignore file o2 size redefinition from 1000000 to 304
@@ -127,7 +127,7 @@ $ cmake -E remove -f ${srcdir:=.}/dax.dot ${srcdir:=.}/daxload/smalldax.trace
 p Test the DAX loader with a DAX comprising a cycle.
 
 ! expect return 255
-$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/daxload/simple_dax_with_cycle.xml
+$ $SG_TEST_EXENV ${bindir:=.}/daxload/sd_daxload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/daxload/simple_dax_with_cycle.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] the task root is not marked
 > [0.000000] [sd_daxparse/WARNING] the task 1@task1 is in a cycle
diff --git a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh b/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh
index c68786fdc2..22879fe81a 100644
--- a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh
+++ b/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh
@@ -4,7 +4,7 @@ p Test the loader of PTG (Parallel Task Graph) written in the DOT format
 # The order differ when executed with gcc's thread sanitizer
 ! output sort
 
-$ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload  ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/ptg-dotload/ptg.dot
+$ $SG_TEST_EXENV ${bindir:=.}/ptg-dotload/sd_ptg-dotload  ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/ptg-dotload/ptg.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------
 > [0.000000] [sd_task/INFO] Displaying task root
diff --git a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh
index d59c98516e..bc50781fcc 100644
--- a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh
+++ b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh
@@ -2,7 +2,7 @@
 p Test the loader of DAG written in the DOT format
 
 ! expect return 2
-$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc  "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/schedule-dotload/dag_with_bad_schedule.dot
+$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc  "--log=sd_dotparse.thres:verbose" ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_bad_schedule.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task 'end' can not be scheduled on -1 hosts
 > [0.000000] [sd_dotparse/VERBOSE] The schedule is ignored, task '1' can not be scheduled on 0 hosts
@@ -15,7 +15,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc
 # The order differ when executed with gcc's thread sanitizer
 ! output sort
 
-$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc ${srcdir:=.}/../platforms/cluster.xml ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.dot
+$ $SG_TEST_EXENV ${bindir:=.}/schedule-dotload/sd_schedule-dotload --log=no_loc ${srcdir:=.}/../platforms/cluster_backbone.xml ${srcdir:=.}/schedule-dotload/dag_with_good_schedule.dot
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [test/INFO] ------------------- Display all tasks of the loaded DAG ---------------------------
 > [0.000000] [sd_task/INFO] Displaying task root
diff --git a/examples/simdag/throttling/sd_throttling.tesh b/examples/simdag/throttling/sd_throttling.tesh
index 1d5e5b2811..d2c17c776e 100644
--- a/examples/simdag/throttling/sd_throttling.tesh
+++ b/examples/simdag/throttling/sd_throttling.tesh
@@ -4,7 +4,7 @@ p Modify the rate of communication tasks even when they are auto-scheduled
 # We need to sort this out because the order changes with the sanitizers (at least)
 ! output sort
 
-$ $SG_TEST_EXENV ./throttling/sd_throttling ${srcdir:=.}/../platforms/cluster.xml
+$ $SG_TEST_EXENV ./throttling/sd_throttling ${srcdir:=.}/../platforms/cluster_backbone.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [5.000000] [sd_comm_throttling/INFO] Simulation stopped after 5.0000 seconds
 > [5.000000] [sd_comm_throttling/INFO] Task 'Task A' start time: 0.000000, finish time: 5.000000
diff --git a/examples/simdag/typed_tasks/sd_typed_tasks.tesh b/examples/simdag/typed_tasks/sd_typed_tasks.tesh
index eb9e71a407..9e87d2f233 100644
--- a/examples/simdag/typed_tasks/sd_typed_tasks.tesh
+++ b/examples/simdag/typed_tasks/sd_typed_tasks.tesh
@@ -2,7 +2,7 @@
 p Usage test of simdag's typed tasks
 
 ! output sort
-$ $SG_TEST_EXENV ./typed_tasks/sd_typed_tasks ${srcdir:=.}/../platforms/cluster.xml
+$ $SG_TEST_EXENV ./typed_tasks/sd_typed_tasks ${srcdir:=.}/../platforms/cluster_backbone.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [2.080600] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 3' start time: 0.000000, finish time: 0.400000
 > [2.080600] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 1' start time: 0.000000, finish time: 0.400000
diff --git a/examples/smpi/mc/bugged1_liveness.c b/examples/smpi/mc/bugged1_liveness.c
index ae95a603bf..2b2b494e64 100644
--- a/examples/smpi/mc/bugged1_liveness.c
+++ b/examples/smpi/mc/bugged1_liveness.c
@@ -12,7 +12,7 @@
 
 /* Run :
   /usr/bin/time -f "clock:%e user:%U sys:%S swapped:%W exitval:%x max:%Mk" "$@" \
-    ../../../smpi_script/bin/smpirun -hostfile hostfile_bugged1_liveness -platform ../../platforms/cluster.xml \
+    ../../../smpi_script/bin/smpirun -hostfile hostfile_bugged1_liveness -platform ../../platforms/cluster_backbone.xml \
     --cfg=contexts/factory:ucontext --cfg=model-check/reduction:none \
     --cfg=model-check/property:promela_bugged1_liveness --cfg=smpi/send-is-detached-thresh:0 \
     --cfg=contexts/stack-size:128 --cfg=model-check/visited:100000 --cfg=model-check/max-depth:100000 ./bugged1_liveness
diff --git a/examples/smpi/mc/non_deterministic.tesh b/examples/smpi/mc/non_deterministic.tesh
index 634c2721e0..b41d0d35b5 100644
--- a/examples/smpi/mc/non_deterministic.tesh
+++ b/examples/smpi/mc/non_deterministic.tesh
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 
 ! timeout 60
-$ ../../../smpi_script/bin/smpirun -wrapper ${bindir:=.}/../../../bin/simgrid-mc -hostfile ${srcdir:=.}/hostfile_non_deterministic  -platform ${srcdir:=.}/../../platforms/cluster.xml --log=xbt_cfg.thresh:warning --cfg=model-check/communications-determinism:1 --cfg=smpi/send-is-detached-thresh:0 --cfg=smpi/host-speed:1e9 ./smpi_non_deterministic
+$ ../../../smpi_script/bin/smpirun -wrapper ${bindir:=.}/../../../bin/simgrid-mc -hostfile ${srcdir:=.}/hostfile_non_deterministic  -platform ${srcdir:=.}/../../platforms/cluster_backbone.xml --log=xbt_cfg.thresh:warning --cfg=model-check/communications-determinism:1 --cfg=smpi/send-is-detached-thresh:0 --cfg=smpi/host-speed:1e9 ./smpi_non_deterministic
 > [0.000000] [mc_global/INFO] Check communication determinism
 > [0.000000] [mc_comm_determinism/INFO] The communications pattern of the process 1 is different! (Different communication : 1)
 > [0.000000] [mc_comm_determinism/INFO] ****************************************************
diff --git a/examples/smpi/mc/only_send_deterministic.c b/examples/smpi/mc/only_send_deterministic.c
index f2c9f57892..9994dafc62 100644
--- a/examples/smpi/mc/only_send_deterministic.c
+++ b/examples/smpi/mc/only_send_deterministic.c
@@ -1,4 +1,4 @@
-/* ../../../smpi_script/bin/smpirun -hostfile hostfile_send_deterministic -platform ../../platforms/cluster.xml -np 3 --cfg=smpi/send-is-detached-thresh:0 gdb\ --args\ ./send_deterministic */
+/* ../../../smpi_script/bin/smpirun -hostfile hostfile_send_deterministic -platform ../../platforms/cluster_backbone.xml -np 3 --cfg=smpi/send-is-detached-thresh:0 gdb\ --args\ ./send_deterministic */
 
 /* Copyright (c) 2009-2018. The SimGrid Team.
  * All rights reserved.                                                     */
diff --git a/examples/smpi/mc/only_send_deterministic.tesh b/examples/smpi/mc/only_send_deterministic.tesh
index 8d70599b23..8b6147f364 100644
--- a/examples/smpi/mc/only_send_deterministic.tesh
+++ b/examples/smpi/mc/only_send_deterministic.tesh
@@ -1,7 +1,7 @@
 #!/usr/bin/env tesh
 
 ! timeout 60
-$ ../../../smpi_script/bin/smpirun -wrapper "${bindir:=.}/../../../bin/simgrid-mc" --log=xbt_cfg.thresh:warning -hostfile ${srcdir:=.}/hostfile_only_send_deterministic  -platform ${srcdir:=.}/../../platforms/cluster.xml --cfg=model-check/communications-determinism:1 --cfg=smpi/send-is-detached-thresh:0 --cfg=smpi/host-speed:1e9 ./smpi_only_send_deterministic
+$ ../../../smpi_script/bin/smpirun -wrapper "${bindir:=.}/../../../bin/simgrid-mc" --log=xbt_cfg.thresh:warning -hostfile ${srcdir:=.}/hostfile_only_send_deterministic  -platform ${srcdir:=.}/../../platforms/cluster_backbone.xml --cfg=model-check/communications-determinism:1 --cfg=smpi/send-is-detached-thresh:0 --cfg=smpi/host-speed:1e9 ./smpi_only_send_deterministic
 > [0.000000] [mc_comm_determinism/INFO] Check communication determinism
 > [0.000000] [mc_comm_determinism/INFO] ******************************************************
 > [0.000000] [mc_comm_determinism/INFO] **** Only-send-deterministic communication pattern ****
diff --git a/teshsuite/msg/app-bittorrent/app-bittorrent.tesh b/teshsuite/msg/app-bittorrent/app-bittorrent.tesh
index fed52d9976..9d603fb672 100644
--- a/teshsuite/msg/app-bittorrent/app-bittorrent.tesh
+++ b/teshsuite/msg/app-bittorrent/app-bittorrent.tesh
@@ -4,7 +4,7 @@ p Testing the Bittorrent implementation with MSG
 
 ! timeout 10
 ! output sort 19
-$ ${bindir:=.}/bittorrent ${platfdir}/cluster.xml app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/bittorrent ${platfdir}/cluster_backbone.xml app-bittorrent_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
 > [    0.000000] (1:tracker@node-0.acme.org) Tracker launched.
 > [    0.000000] (2:peer@node-1.acme.org) Hi, I'm joining the network with id 2
 > [    0.000000] (3:peer@node-2.acme.org) Hi, I'm joining the network with id 3
diff --git a/teshsuite/msg/app-chainsend/app-chainsend.tesh b/teshsuite/msg/app-chainsend/app-chainsend.tesh
index f983dac097..f021c71ec3 100644
--- a/teshsuite/msg/app-chainsend/app-chainsend.tesh
+++ b/teshsuite/msg/app-chainsend/app-chainsend.tesh
@@ -4,7 +4,7 @@ p Testing the chainsend MSG implementation
 
 ! timeout 60
 ! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/chainsend ${platfdir}/cluster.xml app-chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/chainsend ${platfdir}/cluster_backbone.xml app-chainsend_d.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
 > [    2.214423] (2:peer@node-1.acme.org) ### 2.214423 16777216 bytes (Avg 7.225359 MB/s); copy finished (simulated).
 > [    2.222796] (3:peer@node-2.acme.org) ### 2.222796 16777216 bytes (Avg 7.198141 MB/s); copy finished (simulated).
 > [    2.231170] (4:peer@node-3.acme.org) ### 2.231170 16777216 bytes (Avg 7.171126 MB/s); copy finished (simulated).
diff --git a/teshsuite/msg/process-lifetime/process-lifetime.tesh b/teshsuite/msg/process-lifetime/process-lifetime.tesh
index 8ab9a51260..f22f6521ec 100644
--- a/teshsuite/msg/process-lifetime/process-lifetime.tesh
+++ b/teshsuite/msg/process-lifetime/process-lifetime.tesh
@@ -2,7 +2,7 @@
 
 p Test0 Process without time
 
-$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster.xml ${srcdir:=.}/baseline_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/baseline_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [ 10.000000] (1:sleeper@node-0.acme.org) Done sleeping.
 > [ 10.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed).
@@ -10,7 +10,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster.xml ${srcdir:
 
 p Test1 Process with start time
 
-$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster.xml ${srcdir:=.}/start_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/start_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [  1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep.
@@ -34,7 +34,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster.xml ${srcdir:
 p Test1 Process with kill time
 
 ! output sort
-$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster.xml ${srcdir:=.}/kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  0.000000] (2:sleeper@node-2.acme.org) Hello! I go to sleep.
 > [  0.000000] (3:sleeper@node-3.acme.org) Hello! I go to sleep.
@@ -47,7 +47,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster.xml ${srcdir:
 p Test2 Process with start and kill times
 
 ! output sort
-$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster.xml ${srcdir:=.}/start_kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/process-lifetime ${platfdir}/cluster_backbone.xml ${srcdir:=.}/start_kill_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [  1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep.
diff --git a/teshsuite/s4u/CMakeLists.txt b/teshsuite/s4u/CMakeLists.txt
index 3230f31fb6..32a7e842d2 100644
--- a/teshsuite/s4u/CMakeLists.txt
+++ b/teshsuite/s4u/CMakeLists.txt
@@ -29,7 +29,7 @@ foreach(x listen_async pid storage_client_server)
 endforeach()
 
 # The output is not relevant
-ADD_TEST(tesh-s4u-comm-pt2pt   ${CMAKE_BINARY_DIR}/teshsuite/s4u/comm-pt2pt/comm-pt2pt     ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster.xml)
+ADD_TEST(tesh-s4u-comm-pt2pt    ${CMAKE_BINARY_DIR}/teshsuite/s4u/comm-pt2pt/comm-pt2pt    ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster_backbone.xml)
 
 
 
diff --git a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
index 76b4fefa5c..91d68f6589 100644
--- a/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
+++ b/teshsuite/s4u/comm-pt2pt/comm-pt2pt.cpp
@@ -18,7 +18,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example")
 
 static void usage(const char* binaryName, const char* defaultSend, const char* defaultRecv)
 {
-  std::fprintf(stderr, "Usage: %s examples/platforms/cluster.xml <send_spec> <recv_spec>\n"
+  std::fprintf(stderr, "Usage: %s examples/platforms/cluster_backbone.xml <send_spec> <recv_spec>\n"
                        "where spec is a list of letters giving the kind of tests you want to see.\n"
                        "Existing sender spec:\n"
                        " r regular send\n"
@@ -37,7 +37,7 @@ static void usage(const char* binaryName, const char* defaultSend, const char* d
                        " j irecv on permanent mailbox (after a little delay)\n"
                        " J irecv on permanent mailbox (after a little delay)\n"
                        "\n"
-                       "Example 1: %s examples/platforms/cluster.xml rRiIdD rrrrrr # testing all send functions\n"
+                       "Example 1: %s examples/platforms/cluster_backbone.xml rRiIdD rrrrrr # testing all send functions\n"
                        "Default specs: %s %s (all possible pairs)\n",
                binaryName, binaryName, defaultSend, defaultRecv);
   exit(1);
diff --git a/teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c b/teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c
index 4bbbecd08f..0c674e8934 100644
--- a/teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c
+++ b/teshsuite/simdag/evaluate-get-route-time/evaluate-get-route-time.c
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-//for i in $(seq 1 100); do teshsuite/simdag/platforms/evaluate_get_route_time ../examples/platforms/cluster.xml 1 2> /tmp/null ; done
+//for i in $(seq 1 100); do teshsuite/simdag/platforms/evaluate_get_route_time ../examples/platforms/cluster_backbone.xml 1 2> /tmp/null ; done
 
 
 #include <stdio.h>
diff --git a/teshsuite/smpi/coll-alltoall/clusters.tesh b/teshsuite/smpi/coll-alltoall/clusters.tesh
index c19e44f9b8..798892e524 100644
--- a/teshsuite/smpi/coll-alltoall/clusters.tesh
+++ b/teshsuite/smpi/coll-alltoall/clusters.tesh
@@ -2,7 +2,7 @@
 ! output sort
 
 p Test classic - backbone
-$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ${bindir}/../hostfile_cluster -platform ${platfdir:=.}/cluster.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error
+$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ${bindir}/../hostfile_cluster -platform ${platfdir:=.}/cluster_backbone.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error
 > [rank 0] -> node-0.acme.org
 > [rank 1] -> node-1.acme.org
 > [rank 2] -> node-2.acme.org
@@ -42,7 +42,7 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ${bindir}/../host
 
 ! output sort
 p Test separate clusters
-$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -platform ../../../examples/platforms/cluster_backbone.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error
+$ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -platform ../../../examples/platforms/cluster_multi.xml -np 12 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-alltoall -q --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error
 > [rank 0] -> node-0.1core.org
 > [rank 1] -> node-1.1core.org
 > [rank 2] -> node-2.1core.org
diff --git a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
index 6ab5b152b5..1535753570 100644
--- a/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
+++ b/teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
@@ -17,7 +17,7 @@ if(enable_smpi AND enable_smpi_MPICH3_testsuite)
 endif()
 
 if (enable_smpi_MPICH3_testsuite AND HAVE_RAW_CONTEXTS)
-  ADD_TEST(test-smpi-mpich3-perf-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/perf ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${TESH_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -tests=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/perf/testlist -execarg=-platform\ ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster.xml -execarg=--log=root.thr:critical -execarg=--cfg=smpi/async-small-thresh:65536 -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/simulate-computation:0)
+  ADD_TEST(test-smpi-mpich3-perf-raw       ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/perf ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests "-wrapper=${TESH_WRAPPER}" -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -tests=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/perf/testlist -execarg=-platform\ ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster_backbone.xml -execarg=--log=root.thr:critical -execarg=--cfg=smpi/async-small-thresh:65536 -execarg=--cfg=contexts/factory:raw -execarg=--cfg=smpi/simulate-computation:0)
 endif()
 
 foreach(file allredtrace commcreatep non_zero_root sendrecvl timer transp-datatype twovec dtpack indexperf manyrma 
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 9b49b2e74e..6c06790772 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -922,6 +922,7 @@ set(DOC_SOURCES
   docs/requirements.txt
   docs/source/conf.py
   docs/source/Doxyfile
+  docs/source/_ext/hidden_code_block.py
 
   docs/source/img/eclipseScreenShot.png
   docs/source/img/extlink.png
@@ -1134,13 +1135,15 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/bypassASroute.xml
   examples/platforms/bypassRoute.xml
   examples/platforms/cloud.xml
-  examples/platforms/cluster.xml
+  examples/platforms/cluster_backbone.xml
   examples/platforms/cluster_multi.xml
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_prototype.lua
   examples/platforms/cluster_crossbar.xml
-  examples/platforms/cluster_torus.xml
   examples/platforms/cluster_fat_tree.xml
+  examples/platforms/cluster_fat_tree.svg
+  examples/platforms/cluster_torus.xml
+  examples/platforms/cluster_torus.svg
   examples/platforms/cluster_dragonfly.xml
   examples/platforms/crosstraffic.xml
   examples/platforms/optorsim/gridpp_grid_2004.conf