Merge branch 'klement/simgrid-klement' into master

[simgrid.git] / MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
index f9de1aa..1ab01b9 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -636,9 +636,9 @@ include examples/smpi/replay_multiple_manual_deploy/workload_compute_consecutive
 include examples/smpi/replay_multiple_manual_deploy/workload_compute_simple
 include examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time
 include examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time_and_resources
-include examples/smpi/smpi_s4u_masterslave/deployment_masterslave_mailbox_smpi.xml
-include examples/smpi/smpi_s4u_masterslave/masterslave_mailbox_smpi.cpp
-include examples/smpi/smpi_s4u_masterslave/s4u_smpi.tesh
+include examples/smpi/smpi_s4u_masterworker/deployment_masterworker_mailbox_smpi.xml
+include examples/smpi/smpi_s4u_masterworker/masterworker_mailbox_smpi.cpp
+include examples/smpi/smpi_s4u_masterworker/s4u_smpi.tesh
 include examples/smpi/trace/trace.c
 include examples/smpi/trace/trace.tesh
 include examples/smpi/trace_call_location/adjust
@@ -1821,6 +1821,20 @@ include docs/source/Tutorial_Algorithms.rst
 include docs/source/Tutorial_MPI_Applications.rst
 include docs/source/XML_Reference.rst
 include docs/source/_ext/autodoxy.py
+include docs/source/_ext/javasphinx/LICENSE
+include docs/source/_ext/javasphinx/MANIFEST.in
+include docs/source/_ext/javasphinx/README.md
+include docs/source/_ext/javasphinx/doc/conf.py
+include docs/source/_ext/javasphinx/doc/index.rst
+include docs/source/_ext/javasphinx/javasphinx/__init__.py
+include docs/source/_ext/javasphinx/javasphinx/apidoc.py
+include docs/source/_ext/javasphinx/javasphinx/compiler.py
+include docs/source/_ext/javasphinx/javasphinx/domain.py
+include docs/source/_ext/javasphinx/javasphinx/extdoc.py
+include docs/source/_ext/javasphinx/javasphinx/formatter.py
+include docs/source/_ext/javasphinx/javasphinx/htmlrst.py
+include docs/source/_ext/javasphinx/javasphinx/util.py
+include docs/source/_ext/javasphinx/setup.py
 include docs/source/_ext/showfile.css
 include docs/source/_ext/showfile.js
 include docs/source/_ext/showfile.py
@@ -1961,7 +1975,7 @@ include examples/smpi/mc/non_deterministic.tesh
 include examples/smpi/mc/only_send_deterministic.tesh
 include examples/smpi/replay_multiple/CMakeLists.txt
 include examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
-include examples/smpi/smpi_s4u_masterslave/CMakeLists.txt
+include examples/smpi/smpi_s4u_masterworker/CMakeLists.txt
 include include/simgrid/Exception.hpp
 include include/simgrid/actor.h
 include include/simgrid/barrier.h
@@ -1995,6 +2009,7 @@ include include/simgrid/kernel/routing/NetZoneImpl.hpp
 include include/simgrid/kernel/routing/RoutedZone.hpp
 include include/simgrid/kernel/routing/TorusZone.hpp
 include include/simgrid/kernel/routing/VivaldiZone.hpp
+include include/simgrid/kernel/routing/WifiZone.hpp
 include include/simgrid/link.h
 include include/simgrid/mailbox.h
 include include/simgrid/modelchecker.h
@@ -2235,6 +2250,7 @@ include src/kernel/routing/NetZoneImpl.cpp
 include src/kernel/routing/RoutedZone.cpp
 include src/kernel/routing/TorusZone.cpp
 include src/kernel/routing/VivaldiZone.cpp
+include src/kernel/routing/WifiZone.cpp
 include src/mc/AddressSpace.hpp
 include src/mc/ModelChecker.cpp
 include src/mc/ModelChecker.hpp