Merge branch 'mr/thevenoux/gnatcheck#2' into 'master'

Make gnatcheck and gnatkp separate binaries

Closes eng/codepeer/gnatcheck#2

See merge request eng/libadalang/langkit-query-language!594

Author: thvnx

lkql_checker/lkql_checker.gpr

@@ -10,7 +10,7 @@ project LKQL_Checker is
    for Source_Dirs use ("src");
    for Object_Dir use "obj/" & Build_Mode;
    for Exec_Dir use "bin";
-   for Main use ("main.adb");
+   for Main use ("gnatcheck.adb", "gnatkp.adb");
 
    package Binder is
       case Build_Mode is
@@ -22,7 +22,6 @@ project LKQL_Checker is
    end Binder;
 
    package Builder is
-      for Executable ("main.adb") use "gnatcheck";
       for Switches ("Ada") use ("-j0");
    end Builder;
 

lkql_checker/src/gnatcheck.adb

@@ -0,0 +1,11 @@
+--
+--  Copyright (C) 2005-2025, AdaCore
+--  SPDX-License-Identifier: GPL-3.0-or-later
+--
+
+with Lkql_Checker; use Lkql_Checker;
+
+procedure Gnatcheck is
+begin
+   Main (Gnatcheck_Mode);
+end Gnatcheck;

lkql_checker/src/gnatcheck.ads

@@ -0,0 +1,6 @@
+--
+--  Copyright (C) 2005-2025, AdaCore
+--  SPDX-License-Identifier: GPL-3.0-or-later
+--
+
+procedure Gnatcheck;

lkql_checker/src/gnatkp.adb

@@ -0,0 +1,11 @@
+--
+--  Copyright (C) 2005-2025, AdaCore
+--  SPDX-License-Identifier: GPL-3.0-or-later
+--
+
+with Lkql_Checker; use Lkql_Checker;
+
+procedure Gnatkp is
+begin
+   Main (Gnatkp_Mode);
+end Gnatkp;

lkql_checker/src/gnatkp.ads

@@ -0,0 +1,6 @@
+--
+--  Copyright (C) 2005-2025, AdaCore
+--  SPDX-License-Identifier: GPL-3.0-or-later
+--
+
+procedure Gnatkp;

lkql_checker/src/lkql_checker-diagnoses.adb

@@ -1695,7 +1695,7 @@ package body Lkql_Checker.Diagnoses is
 
    procedure Print_Out_Diagnoses is
       Max_Diagnoses      : constant Natural :=
-        (if Gnatkp_Mode then 0 else Arg.Max_Diagnoses.Get);
+        (if Mode = Gnatkp_Mode then 0 else Arg.Max_Diagnoses.Get);
       Diagnoses_Reported : Natural := 0;
       Limit_Exceeded     : Boolean := False;
 
@@ -1798,7 +1798,7 @@ package body Lkql_Checker.Diagnoses is
 
          Report (Trim (Minute_Of_Check'Img, Left));
 
-         Report (Executable & " version : " & Version_String);
+         Report (Lkql_Checker_Mode_Image & " version : " & Version_String);
 
          Report_No_EOL ("command line      : ");
          Print_Command_Line;
@@ -1922,8 +1922,7 @@ package body Lkql_Checker.Diagnoses is
    is
       Pragma_Name : constant Text_Type := To_Lower (El.F_Id.Text);
       Pragma_Args : constant LAL.Analysis.Base_Assoc_List := El.F_Args;
-      Tool_Name   : constant Text_Type :=
-        (if Gnatkp_Mode then "gnatkp" else "gnatcheck");
+      Tool_Name   : constant Text_Type := To_Text (Lkql_Checker_Mode_Image);
    begin
       return
         Pragma_Name in "annotate" | "gnat_annotate"
@@ -2270,7 +2269,7 @@ package body Lkql_Checker.Diagnoses is
          return;
       end if;
 
-      if Gnatkp_Mode then
+      if Mode = Gnatkp_Mode then
          Match (Match_Kp_Exempt_Comment, Text, Matches);
       else
          Match (Match_Rule_Exempt_Comment, Text, Matches);

lkql_checker/src/lkql_checker-options.adb

@@ -1,4 +1,6 @@
 with GNAT.Command_Line; use GNAT.Command_Line;
+with Ada.Command_Line;  use Ada.Command_Line;
+with Ada.Directories;   use Ada.Directories;
 
 with Lkql_Checker.Output;       use Lkql_Checker.Output;
 with Lkql_Checker.Projects;     use Lkql_Checker.Projects;

lkql_checker/src/lkql_checker-options.ads

@@ -6,8 +6,6 @@
 --  This package defines options that are supposed to be of a common interest
 --  for all the tools.
 
-with Ada.Command_Line;      use Ada.Command_Line;
-with Ada.Directories;       use Ada.Directories;
 with Ada.Environment_Variables;
 with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
 
@@ -33,9 +31,6 @@ package Lkql_Checker.Options is
    Version_String : constant String :=
      Lkql_Checker_Version & " (" & Date & ")";
 
-   Executable : constant String := Base_Name (Command_Name);
-   --  Name of the current executable (e.g. "gnatcheck" or "gnatkp")
-
    Custom_Worker_Var : constant String := "GNATCHECK_WORKER";
    --  The name of the environment variable used to define a custom worker
    --  executable.
@@ -69,11 +64,6 @@ package Lkql_Checker.Options is
    --  tool (includes both wrong parameters and wrong combinations of correct
    --  parameters).
 
-   Gnatkp_Mode : Boolean := Executable = "gnatkp";
-   --  Whether we are running in KP detection mode
-   --  Set either when the executable is called gnatkp or with the debug switch
-   --  '-dkp'
-
    Legacy : Boolean := False;
    --  If True, run in legacy mode, with no support for additional rule files.
 
@@ -679,7 +669,7 @@ package Lkql_Checker.Options is
       function XML_Report_File_Path return String;
 
       function Ignore_Project_Switches return Boolean
-      is (Ignore_Project_Switches_Opt.Get or Gnatkp_Mode);
+      is (Ignore_Project_Switches_Opt.Get or Mode = Gnatkp_Mode);
 
       function Source_Files_Specified return Boolean
       is (Source_Files.Get /= Null_Unbounded_String);
@@ -706,10 +696,12 @@ package Lkql_Checker.Options is
       --  the specified ``Default_Name``.
 
       function Text_Report_File_Path return String
-      is (Resolve_Report_File (Text_Output.Get, Executable & ".out"));
+      is (Resolve_Report_File
+            (Text_Output.Get, Lkql_Checker_Mode_Image & ".out"));
 
       function XML_Report_File_Path return String
-      is (Resolve_Report_File (XML_Output.Get, Executable & ".xml"));
+      is (Resolve_Report_File
+            (XML_Output.Get, Lkql_Checker_Mode_Image & ".xml"));
    end Arg;
 
    --------------------------

lkql_checker/src/lkql_checker-output.adb

@@ -126,7 +126,7 @@ package body Lkql_Checker.Output is
       Log_Message : Boolean := False)
    is
       Final_Message : constant String :=
-        (if Tool_Name then Executable & ": " else "")
+        (if Tool_Name then Lkql_Checker_Mode_Image & ": " else "")
         & (if Location /= "" then Location & ": " else "")
         & (case Tag is
              when Info    => "info: ",
@@ -255,7 +255,7 @@ package body Lkql_Checker.Output is
 
    procedure Print_Version_Info is
    begin
-      Print (Executable & " " & Version_String);
+      Print (Lkql_Checker_Mode_Image & " " & Version_String);
       Print
         ("Copyright (C) " & "2004" & '-' & Current_Year & ", AdaCore.",
          Log_Message => False);
@@ -363,7 +363,8 @@ package body Lkql_Checker.Output is
    begin
       if Log_File_Name = null then
          Log_File_Name :=
-           new String'(Global_Report_Dir.all & Executable & ".log");
+           new String'
+             (Global_Report_Dir.all & Lkql_Checker_Mode_Image & ".log");
       end if;
 
       Open_Or_Create (Log_File_Name.all, Out_File, Log_File);
@@ -432,7 +433,7 @@ package body Lkql_Checker.Output is
    begin
       pragma Style_Checks ("M200"); -- Allow long lines
 
-      if Gnatkp_Mode then
+      if Mode = Gnatkp_Mode then
          Put_Line ("gnatkp: the GNAT known problem detector");
          Put_Line
            ("usage: gnatkp -Pproject [options] [-rules [-from=file] {+Rkp_id[:param]}]");

lkql_checker/src/lkql_checker-output.ads

@@ -16,7 +16,7 @@ package Lkql_Checker.Output is
    procedure Print_Version_Info;
    --  Prints into Stderr the tool version information in the following format:
    --
-   --  (gnatcheck|gnatkp) <version> (<date>)
+   --  <tool> <version> (<date>)
    --  Copyright (C) 2004-<current year>, AdaCore.
 
    procedure Report_Unhandled_Exception (Ex : Exception_Occurrence);