From 3a2885b7d34fc929bc4e407f95435c57cbb576cc Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Tue, 4 Feb 2020 11:54:25 +0100 Subject: [PATCH] fix make distcheck and pip compile --- MANIFEST.in | 13 ++++++++++--- examples/c/CMakeLists.txt | 6 +++++- teshsuite/msg/CMakeLists.txt | 3 ++- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 8be325c80f..d5d97a7f59 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -16,6 +16,12 @@ include doc/webcruft/simgrid_logo_2011.gif include doc/webcruft/simgrid_logo_2011.png include doc/webcruft/simgrid_logo_2011_small.png include doc/webcruft/storage_sample_scenario.png +include examples/c/actor-create/actor-create.c +include examples/c/actor-create/actor-create.tesh +include examples/c/actor-create/actor-create_d.xml +include examples/c/async-waitany/async-waitany.c +include examples/c/async-waitany/async-waitany.tesh +include examples/c/async-waitany/async-waitany_d.xml include examples/deprecated/java/app/bittorrent/Common.java include examples/deprecated/java/app/bittorrent/Connection.java include examples/deprecated/java/app/bittorrent/Main.java @@ -561,8 +567,6 @@ include examples/smpi/trace_call_location/trace_call_location.c include examples/smpi/trace_call_location/trace_call_location.tesh include examples/smpi/trace_simple/trace_simple.c include examples/smpi/trace_simple/trace_simple.tesh -include teshsuite/c/async-waitany/async-waitany.c -include teshsuite/c/async-waitany/async-waitany_d.xml include teshsuite/java/semaphoregc/SemaphoreGC.java include teshsuite/java/semaphoregc/semaphoregc.tesh include teshsuite/java/sleephostoff/SleepHostOff.java @@ -618,6 +622,9 @@ include teshsuite/msg/async-wait/async-wait_d.xml include teshsuite/msg/async-waitall/async-waitall.c include teshsuite/msg/async-waitall/async-waitall.tesh include teshsuite/msg/async-waitall/async-waitall_d.xml +include teshsuite/msg/async-waitany/async-waitany.c +include teshsuite/msg/async-waitany/async-waitany.tesh +include teshsuite/msg/async-waitany/async-waitany_d.xml include teshsuite/msg/cloud-capping/cloud-capping.c include teshsuite/msg/cloud-capping/cloud-capping.tesh include teshsuite/msg/cloud-migration/cloud-migration.c @@ -1863,6 +1870,7 @@ include docs/source/tuto_smpi/img/big-picture.svg include docs/source/tuto_smpi/img/lu.S.4.png include docs/source/tuto_smpi/roundtrip.c include examples/README.rst +include examples/c/CMakeLists.txt include examples/deprecated/java/.classpath include examples/deprecated/java/.project include examples/deprecated/java/CMakeLists.txt @@ -2660,7 +2668,6 @@ include src/xbt/xbt_str.cpp include src/xbt/xbt_str_test.cpp include src/xbt/xbt_virtu.cpp include src/xbt_modinter.h -include teshsuite/c/CMakeLists.txt include teshsuite/java/CMakeLists.txt include teshsuite/lua/CMakeLists.txt include teshsuite/lua/lua_platforms.tesh diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt index 2c4027a1ca..29c2f9f0bd 100644 --- a/examples/c/CMakeLists.txt +++ b/examples/c/CMakeLists.txt @@ -9,7 +9,11 @@ foreach(x actor-create async-waitany) endforeach() set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) -set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/async-waitany_d.xml PARENT_SCOPE) +set(tesh_files ${tesh_files} PARENT_SCOPE) + +set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/actor-create/actor-create_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/async-waitany_d.xml + PARENT_SCOPE) foreach(x async-waitany) ADD_TESH(c-${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt index f42e4010e1..705edb4406 100644 --- a/teshsuite/msg/CMakeLists.txt +++ b/teshsuite/msg/CMakeLists.txt @@ -1,6 +1,6 @@ # C examples foreach(x app-pingpong app-token-ring - async-wait async-waitall + async-wait async-waitall async-waitany cloud-capping cloud-migration cloud-two-tasks cloud-simple get_sender host_on_off host_on_off_recv process-daemon process-kill process-join process-lifetime process-migration process-suspend process-yield @@ -67,6 +67,7 @@ set(xml_files ${xml_files} ${CMAKE_CURRENT_SOURCE_DIR}/app-bittorrent/ap ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait3_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-wait/async-wait4_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/async-waitall/async-waitall_d.xml + ${CMAKE_CURRENT_SOURCE_DIR}/async-waitany/async-waitany_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/io-file-remote/io-file-remote_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/platform-properties/platform-properties_d.xml ${CMAKE_CURRENT_SOURCE_DIR}/process-lifetime/baseline_d.xml -- 2.20.1