Fix CMakeLists.txt

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 3e821da..e4d0f42 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -1181,9 +1181,13 @@ set(PLATFORMS_EXAMPLES
   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/content/small_content.txt
   examples/platforms/content/storage_content.txt
   examples/platforms/content/win_storage_content.txt
+  examples/platforms/trace/trace_A_failure.txt
+  examples/platforms/trace/trace_A.txt
+  examples/platforms/trace/trace_B.txt
   examples/platforms/data_center.xml
   examples/platforms/deployment_remote_io.xml
   examples/platforms/energy_platform.xml
@@ -1202,6 +1206,10 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/routing_cluster.xml
   examples/platforms/storage.xml
   examples/platforms/small_platform.xml
+  examples/platforms/small_platform_fatpipe.xml
+  examples/platforms/small_platform_one_link_routes.xml
+  examples/platforms/small_platform_with_failures.xml
+  examples/platforms/small_platform_with_routers.xml
   examples/platforms/syscoord/generate_peer_platform.pl
   examples/platforms/syscoord/median_harvard.syscoord
   examples/platforms/syscoord/median_harvard.xml
@@ -1211,6 +1219,7 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/syscoord/median_p2psim.xml
   examples/platforms/torus_cluster.xml
   examples/platforms/two_hosts_platform.xml
+  examples/platforms/two_hosts_platform_with_availability.xml
   examples/platforms/two_peers.xml
   examples/platforms/vivaldi.xml
   )

diff --git a/examples/lua/CMakeLists.txt b/examples/lua/CMakeLists.txt
index e37c3c2..90ecd20 100644 (file)
--- a/examples/lua/CMakeLists.txt
+++ b/examples/lua/CMakeLists.txt
@@ -17,7 +17,6 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/bittorrent/bittorrent.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/kademlia/kademlia.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/quicksort_deployment.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/multi_matrix/quicksort_platform.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/state_cloner/deployment_duplicated_globals.xml
   PARENT_SCOPE
   )

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index 5435706..fc23726 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -6,8 +6,6 @@ set(tesh_files
   )
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/small_platform_with_failures.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/small_platform_with_routers.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/msg/actions/CMakeLists.txt b/examples/msg/actions/CMakeLists.txt
index 419c27e..82cb0f0 100644 (file)
--- a/examples/msg/actions/CMakeLists.txt
+++ b/examples/msg/actions/CMakeLists.txt
@@ -15,7 +15,6 @@ set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_split.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/homogeneous_3_hosts.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/msg/chainsend/CMakeLists.txt b/examples/msg/chainsend/CMakeLists.txt
index 5111865..892f0fe 100644 (file)
--- a/examples/msg/chainsend/CMakeLists.txt
+++ b/examples/msg/chainsend/CMakeLists.txt
@@ -15,7 +15,6 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_tesh.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_chainsend.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/msg/cloud/CMakeLists.txt b/examples/msg/cloud/CMakeLists.txt
index 9915030..aba884a 100644 (file)
--- a/examples/msg/cloud/CMakeLists.txt
+++ b/examples/msg/cloud/CMakeLists.txt
@@ -29,7 +29,6 @@ set(tesh_files
   )
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/simple_plat.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/multicore_plat.xml
   PARENT_SCOPE
   )

diff --git a/examples/msg/energy/e1/CMakeLists.txt b/examples/msg/energy/e1/CMakeLists.txt
index d8d7dd8..ef32177 100644 (file)
--- a/examples/msg/energy/e1/CMakeLists.txt
+++ b/examples/msg/energy/e1/CMakeLists.txt
@@ -16,7 +16,6 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_e1.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_e1.xml
   PARENT_SCOPE
   )
 

diff --git a/examples/msg/energy/e2/CMakeLists.txt b/examples/msg/energy/e2/CMakeLists.txt
index 98e96dc..28d2e97 100644 (file)
--- a/examples/msg/energy/e2/CMakeLists.txt
+++ b/examples/msg/energy/e2/CMakeLists.txt
@@ -16,7 +16,6 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_e2.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_e2.xml
   PARENT_SCOPE
   )
 

diff --git a/examples/msg/energy/e3/CMakeLists.txt b/examples/msg/energy/e3/CMakeLists.txt
index eb60260..caef0fd 100644 (file)
--- a/examples/msg/energy/e3/CMakeLists.txt
+++ b/examples/msg/energy/e3/CMakeLists.txt
@@ -16,7 +16,6 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_e3.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_e3.xml
   PARENT_SCOPE
   )
 

diff --git a/examples/msg/icomms/CMakeLists.txt b/examples/msg/icomms/CMakeLists.txt
index a8f8f81..38b44f4 100644 (file)
--- a/examples/msg/icomms/CMakeLists.txt
+++ b/examples/msg/icomms/CMakeLists.txt
@@ -24,7 +24,6 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer03.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer04.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_peer05.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/small_platform.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/msg/masterslave/CMakeLists.txt b/examples/msg/masterslave/CMakeLists.txt
index 91d61fb..026a2de 100644 (file)
--- a/examples/msg/masterslave/CMakeLists.txt
+++ b/examples/msg/masterslave/CMakeLists.txt
@@ -58,11 +58,9 @@ set(xml_files
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_forwarder.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_mailbox_multicore.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_vivaldi.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_clusters.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_kill.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave_mailbox.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_masterslave.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_kill.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/msg/ns3/CMakeLists.txt b/examples/msg/ns3/CMakeLists.txt
index 14d1498..56541cc 100644 (file)
--- a/examples/msg/ns3/CMakeLists.txt
+++ b/examples/msg/ns3/CMakeLists.txt
@@ -17,12 +17,9 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/3hosts_2links_d.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/3hosts_2links_p.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/3links-d-timer.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/3links-d.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/3links-p.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-d.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/dogbone-p.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/One_cluster-d.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/Two_clusters-d.xml
   PARENT_SCOPE

diff --git a/examples/msg/parallel_task/CMakeLists.txt b/examples/msg/parallel_task/CMakeLists.txt
index 788b2e8..9512a4c 100644 (file)
--- a/examples/msg/parallel_task/CMakeLists.txt
+++ b/examples/msg/parallel_task/CMakeLists.txt
@@ -17,7 +17,6 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/test_ptask_deployment.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_ptask_platform.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/msg/sendrecv/CMakeLists.txt b/examples/msg/sendrecv/CMakeLists.txt
index bc61bfd..837ca72 100644 (file)
--- a/examples/msg/sendrecv/CMakeLists.txt
+++ b/examples/msg/sendrecv/CMakeLists.txt
@@ -18,7 +18,6 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_sendrecv.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_sendrecv.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt
index 1da4a81..4cee270 100644 (file)
--- a/examples/msg/tracing/CMakeLists.txt
+++ b/examples/msg/tracing/CMakeLists.txt
@@ -45,9 +45,6 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform-as.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform-config.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/procmig-deploy.xml
   PARENT_SCOPE
   )

diff --git a/examples/scala/CMakeLists.txt b/examples/scala/CMakeLists.txt
index 90617f9..b3676d2 100644 (file)
--- a/examples/scala/CMakeLists.txt
+++ b/examples/scala/CMakeLists.txt
@@ -6,7 +6,6 @@ set(tesh_files
   )
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/scala/master_slave_bypass/CMakeLists.txt b/examples/scala/master_slave_bypass/CMakeLists.txt
index ad451ae..7226ae1 100644 (file)
--- a/examples/scala/master_slave_bypass/CMakeLists.txt
+++ b/examples/scala/master_slave_bypass/CMakeLists.txt
@@ -28,7 +28,6 @@ set(tesh_files
   )
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/scala/master_slave_kill/CMakeLists.txt b/examples/scala/master_slave_kill/CMakeLists.txt
index ebd2979..4880c53 100644 (file)
--- a/examples/scala/master_slave_kill/CMakeLists.txt
+++ b/examples/scala/master_slave_kill/CMakeLists.txt
@@ -28,7 +28,6 @@ set(tesh_files
   )
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
   PARENT_SCOPE
   )
 set(examples_src

diff --git a/examples/scala/masterslave/CMakeLists.txt b/examples/scala/masterslave/CMakeLists.txt
index 5c2bccc..0e1c2f5 100644 (file)
--- a/examples/scala/masterslave/CMakeLists.txt
+++ b/examples/scala/masterslave/CMakeLists.txt
@@ -29,7 +29,6 @@ set(tesh_files
   )
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/deploy.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslaveDeployment.xml
   PARENT_SCOPE
   )

diff --git a/teshsuite/surf/CMakeLists.txt b/teshsuite/surf/CMakeLists.txt
index 8c44e07..50284bc 100644 (file)
--- a/teshsuite/surf/CMakeLists.txt
+++ b/teshsuite/surf/CMakeLists.txt
@@ -4,13 +4,9 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform.xml
   PARENT_SCOPE
   )
 set(txt_files
   ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace_A_failure.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace_A.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace_B.txt
   PARENT_SCOPE
   )