From 823c82fe7b96c09298262a9262e518a57473fb04 Mon Sep 17 00:00:00 2001
From: SUTER Frederic <frederic.suter@cc.in2p3.fr>
Date: Mon, 3 Jan 2022 10:46:58 +0100
Subject: [PATCH] remove Jedule related stuff + fix SIMDAG_SRC->DAG_SRC issue

---
 CMakeLists.txt                   | 7 -------
 MANIFEST.in                      | 1 +
 include/simgrid/config.h.in      | 2 --
 src/simgrid/sg_version.cpp       | 6 ------
 tools/cmake/DefinePackages.cmake | 6 ------
 tools/cmake/Distrib.cmake        | 3 +--
 tools/internal/spell_dict.txt    | 1 -
 7 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3b459aabf..31b507b82a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -378,12 +378,6 @@ else()
   SET(enable_model-checking 0)
 endif()
 
-if(enable_jedule)
-  set(SIMGRID_HAVE_JEDULE 1)
-else()
-  set(SIMGRID_HAVE_JEDULE 0)
-endif()
-
 if(enable_mallocators)
   SET(SIMGRID_HAVE_MALLOCATOR 1)
 else()
@@ -967,7 +961,6 @@ message("")
 message("        Maintainer mode .............: ${enable_maintainer_mode}")
 message("        Documentation................: ${enable_documentation}")
 message("        Model checking ..............: ${SIMGRID_HAVE_MC}")
-message("        Jedule  mode ................: ${SIMGRID_HAVE_JEDULE}")
 message("        Graphviz mode ...............: ${HAVE_GRAPHVIZ}")
 message("        Mallocators .................: ${enable_mallocators}")
 message("")
diff --git a/MANIFEST.in b/MANIFEST.in
index e3f5c90149..ce72ee0621 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2216,6 +2216,7 @@ include src/bindings/python/simgrid_python.cpp
 include src/dag/dax.dtd
 include src/dag/dax_dtd.c
 include src/dag/dax_dtd.h
+include src/dag/loaders.cpp
 include src/include/catch.hpp
 include src/include/mc/datatypes.h
 include src/include/mc/mc.h
diff --git a/include/simgrid/config.h.in b/include/simgrid/config.h.in
index 3d4aa549a8..32e11dfd9c 100644
--- a/include/simgrid/config.h.in
+++ b/include/simgrid/config.h.in
@@ -11,8 +11,6 @@
 
 /* Was MSG compiled in?  */
 #cmakedefine01 SIMGRID_HAVE_MSG
-/* Was Jedule compiled in?  */
-#cmakedefine01 SIMGRID_HAVE_JEDULE
 /* Was the Lua support compiled in? */
 #cmakedefine01 SIMGRID_HAVE_LUA
 /* Were mallocators (object pools) compiled in? */
diff --git a/src/simgrid/sg_version.cpp b/src/simgrid/sg_version.cpp
index 7fcec542f3..6c085b2141 100644
--- a/src/simgrid/sg_version.cpp
+++ b/src/simgrid/sg_version.cpp
@@ -64,12 +64,6 @@ void sg_version()
   XBT_HELP("   ns-3 support disabled at compilation.");
 #endif
 
-#if SIMGRID_HAVE_JEDULE
-  XBT_HELP("   Jedule support compiled in.");
-#else
-  XBT_HELP("   Jedule support disabled at compilation.");
-#endif
-
 #if SIMGRID_HAVE_LUA
   XBT_HELP("   Lua support compiled in.");
 #else
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 6baca65777..03c13e3329 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -802,12 +802,6 @@ else()
                                                 ${MSG_SRC})
 endif()
 
-if(${SIMGRID_HAVE_JEDULE})
-  set(simgrid_sources  ${simgrid_sources}  ${JEDULE_SRC})
-else()
-  set(EXTRA_DIST       ${EXTRA_DIST}       ${JEDULE_SRC})
-endif()
-
 if(enable_smpi)
   set(simgrid_sources  ${simgrid_sources}  ${SMPI_SRC})
 endif()
diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 7a063c9fc5..4276ff9786 100644
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -147,7 +147,6 @@ set(source_to_pack
   ${headers_to_install}
   ${source_of_generated_headers}
   ${BINDINGS_SRC}
-  ${JEDULE_SRC}
   ${JMSG_C_SRC}
   ${JMSG_JAVA_SRC}
   ${LUA_SRC}
@@ -158,7 +157,7 @@ set(source_to_pack
   ${S4U_SRC}
   ${NS3_SRC}
   ${PLUGINS_SRC}
-  ${SIMDAG_SRC}
+  ${DAG_SRC}
   ${SIMGRID_SRC}
   ${SIMIX_SRC}
   ${SMPI_SRC}
diff --git a/tools/internal/spell_dict.txt b/tools/internal/spell_dict.txt
index 219270f757..abbf35a471 100644
--- a/tools/internal/spell_dict.txt
+++ b/tools/internal/spell_dict.txt
@@ -40,7 +40,6 @@ ingroup
 int
 java
 Java
-JEDULE
 JNI
 kcachegrind
 KILLME
-- 
2.20.1