From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sat, 26 Sep 2020 21:49:12 +0000 (+0200)
Subject: Merge branch 'master' of framagit.org:simgrid/simgrid into master
X-Git-Tag: v3.26~426
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d7377843192020efb1b215c504e36e84558ac520?hp=35396134941edb726769112d256609358ca00486

Merge branch 'master' of framagit.org:simgrid/simgrid into master
---

diff --git a/MANIFEST.in b/MANIFEST.in
index 2fd570b7ed..8b1f81f942 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1819,6 +1819,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
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 8c6a280370..739760d67f 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -896,6 +896,20 @@ set(DOC_SOURCES
   docs/source/_ext/showfile.css
   docs/source/_ext/showfile.js
   docs/source/_ext/showfile.py
+  docs/source/_ext/javasphinx/LICENSE
+  docs/source/_ext/javasphinx/MANIFEST.in
+  docs/source/_ext/javasphinx/README.md
+  docs/source/_ext/javasphinx/doc/conf.py
+  docs/source/_ext/javasphinx/doc/index.rst
+  docs/source/_ext/javasphinx/javasphinx/__init__.py
+  docs/source/_ext/javasphinx/javasphinx/apidoc.py
+  docs/source/_ext/javasphinx/javasphinx/compiler.py
+  docs/source/_ext/javasphinx/javasphinx/domain.py
+  docs/source/_ext/javasphinx/javasphinx/extdoc.py
+  docs/source/_ext/javasphinx/javasphinx/formatter.py
+  docs/source/_ext/javasphinx/javasphinx/htmlrst.py
+  docs/source/_ext/javasphinx/javasphinx/util.py
+  docs/source/_ext/javasphinx/setup.py
   docs/source/_static/css/custom.css
   docs/source/_templates/breadcrumbs.html
 
diff --git a/tools/internal/check_dist_archive.exclude b/tools/internal/check_dist_archive.exclude
index d3df9da7ae..74872a26a5 100644
--- a/tools/internal/check_dist_archive.exclude
+++ b/tools/internal/check_dist_archive.exclude
@@ -26,6 +26,8 @@
 
 + contrib/.*
 
++ \.github/.*
+
 + tools/appveyor-irc-notify\.py
 + tools/docker/.*
 + tools/git-hooks/.*