From 736b3ee3a67e06a00a520960d6953f039ee7f912 Mon Sep 17 00:00:00 2001
From: Pierre-Marie de Rodat <derodat@adacore.com>
Date: Fri, 23 Jun 2023 12:23:03 +0000
Subject: [PATCH] Make libpythonlang and liblktlang standalone

Since nowadays Langkit itself depends on both libraries to do its work
and since both libraries use `Langkit_Support`, the standalone mode is
necessary to allow Langkit developpers to use Langkit testcases to check
and debug (potentially very buggy) patches on `Langkit_Support`.
---
 contrib/lkt/extensions/mains/lkt_toolbox.adb         | 12 +++++-------
 .../extensions/src/liblktlang-default_provider.ads   |  2 +-
 contrib/lkt/manage.py                                |  3 ++-
 contrib/python/manage.py                             |  3 ++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/contrib/lkt/extensions/mains/lkt_toolbox.adb b/contrib/lkt/extensions/mains/lkt_toolbox.adb
index 595f2764e..7d9b4dc28 100644
--- a/contrib/lkt/extensions/mains/lkt_toolbox.adb
+++ b/contrib/lkt/extensions/mains/lkt_toolbox.adb
@@ -10,13 +10,11 @@ with GNAT.Traceback.Symbolic;
 with GNATCOLL.Opt_Parse;          use GNATCOLL.Opt_Parse;
 with GNATCOLL.Traces;
 
-with Langkit_Support.Diagnostics; use Langkit_Support.Diagnostics;
-
-with Langkit_Support.Diagnostics.Output;
-use Langkit_Support.Diagnostics.Output;
-
-with Langkit_Support.Slocs;       use Langkit_Support.Slocs;
-with Langkit_Support.Text;        use Langkit_Support.Text;
+with Liblktlang_Support.Diagnostics; use Liblktlang_Support.Diagnostics;
+with Liblktlang_Support.Diagnostics.Output;
+use Liblktlang_Support.Diagnostics.Output;
+with Liblktlang_Support.Slocs;       use Liblktlang_Support.Slocs;
+with Liblktlang_Support.Text;        use Liblktlang_Support.Text;
 
 with Liblktlang.Analysis;         use Liblktlang.Analysis;
 with Liblktlang.Common;
diff --git a/contrib/lkt/extensions/src/liblktlang-default_provider.ads b/contrib/lkt/extensions/src/liblktlang-default_provider.ads
index 04cf81fc9..f47fbfc81 100644
--- a/contrib/lkt/extensions/src/liblktlang-default_provider.ads
+++ b/contrib/lkt/extensions/src/liblktlang-default_provider.ads
@@ -1,4 +1,4 @@
-with Langkit_Support.Text; use Langkit_Support.Text;
+with Liblktlang_Support.Text; use Liblktlang_Support.Text;
 
 with Liblktlang.Implementation; use Liblktlang.Implementation;
 
diff --git a/contrib/lkt/manage.py b/contrib/lkt/manage.py
index b68c65b26..8a575e7a1 100755
--- a/contrib/lkt/manage.py
+++ b/contrib/lkt/manage.py
@@ -36,7 +36,8 @@ class Manage(ManageScript):
             grammar=lkt_grammar,
             default_unit_provider=LibraryEntity(
                 'Liblktlang.Default_Provider', 'Create'
-            )
+            ),
+            standalone=True,
         )
 
     def generate_prelude(self, emitter, context):
diff --git a/contrib/python/manage.py b/contrib/python/manage.py
index 5d537637f..6d3d366f0 100755
--- a/contrib/python/manage.py
+++ b/contrib/python/manage.py
@@ -15,7 +15,8 @@ class Manage(ManageScript):
 
         return CompileCtx(lang_name='Python',
                           lexer=python_lexer,
-                          grammar=python_grammar)
+                          grammar=python_grammar,
+                          standalone=True)
 
 
 if __name__ == '__main__':