Merge branch 'mr/thevenoux-langkit-query-language#564' into 'master'

Fix the `-V/--verbose` switches output

Closes #564

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

Author: thvnx

lkql_checker/doc/gnatcheck_rm/using_gnatcheck.rst

@@ -16,7 +16,7 @@ The following switches control the general ``gnatcheck`` behavior
   .. index:: --version
 
 
-``--version``
+``-V, --version``
   Display Copyright and version, then exit disregarding all other options.
 
   .. index:: --help
@@ -395,7 +395,7 @@ GNATcheck:
     There are several command-line switches that you cannot pass through the
     ``Switches`` attribute:
 
-    * ``--version``
+    * ``-V, --version``
     * ``-h, --help``
     * ``--list-rules``
     * ``-P``

lkql_checker/src/gnatcheck-options.ads

@@ -218,6 +218,7 @@ package Gnatcheck.Options is
           (Parser => Parser,
            Name   => "Version",
            Long   => "--version",
+           Short  => "-V",
            Help   => "show the tool version and exit");
 
       package Help is new

lkql_checker/src/gnatcheck-output.adb

@@ -13,8 +13,7 @@ with GNAT.Directory_Operations; use GNAT.Directory_Operations;
 with GNAT.OS_Lib;               use GNAT.OS_Lib;
 with GNAT.Traceback.Symbolic;
 
-with Gnatcheck.Options;          use Gnatcheck.Options;
-with Gnatcheck.String_Utilities; use Gnatcheck.String_Utilities;
+with Gnatcheck.Options; use Gnatcheck.Options;
 
 with Interfaces.C_Streams; use Interfaces.C_Streams;
 
@@ -250,39 +249,15 @@ package body Gnatcheck.Output is
       Emit_Message (Message, New_Line => New_Line, Log_Message => Log_Message);
    end Print;
 
-   ------------------------
-   -- Print_Tool_Version --
-   ------------------------
-
-   procedure Print_Tool_Version (Released_At : Positive) is
-   begin
-      if Gnatkp_Mode then
-         Put_Line ("GNATKP " & Date);
-      else
-         Put_Line ("GNATCHECK " & Version_String);
-      end if;
-
-      Put_Line
-        ("Copyright (C) "
-         & Image (Released_At)
-         & '-'
-         & Current_Year
-         & ", AdaCore.");
-   end Print_Tool_Version;
-
    ------------------------
    -- Print_Version_Info --
    ------------------------
 
-   procedure Print_Version_Info (Released_At : Positive) is
+   procedure Print_Version_Info is
    begin
-      Print (Executable & " " & Version_String, Log_Message => False);
+      Print (Executable & " " & Version_String);
       Print
-        ("Copyright "
-         & Image (Released_At)
-         & '-'
-         & Current_Year
-         & ", AdaCore.",
+        ("Copyright (C) " & "2004" & '-' & Current_Year & ", AdaCore.",
          Log_Message => False);
    end Print_Version_Info;
 
@@ -462,7 +437,7 @@ package body Gnatcheck.Output is
          Put_Line
            ("usage: gnatkp -Pproject [options] [-rules [-from=file] {+Rkp_id[:param]}]");
          Put_Line ("options:");
-         Put_Line (" --version  - Display version and exit");
+         Put_Line (" -V, --version  - Display version and exit");
          Put_Line (" -h, --help - Display usage and exit");
          Put_Line ("");
          Put_Line
@@ -529,7 +504,7 @@ package body Gnatcheck.Output is
       Put_Line
         ("usage: gnatcheck [options] {filename} {-files=filename} -rules rule_switches [-cargs gcc_switches]");
       Put_Line ("options:");
-      Put_Line (" --version  - Display version and exit");
+      Put_Line (" -V, --version  - Display version and exit");
       Put_Line (" -h, --help - Display usage and exit");
       Put_Line ("");
       Put_Line

lkql_checker/src/gnatcheck-output.ads

@@ -13,18 +13,11 @@ package Gnatcheck.Output is
    --  Whether a warning message has been emitted while "warnings as errors"
    --  mode is enabled. This ensure the return code of GNATcheck is not 0.
 
-   procedure Print_Version_Info (Released_At : Positive);
+   procedure Print_Version_Info;
    --  Prints into Stderr the tool version information in the following format:
    --
-   --  <toolname>
-   --  Copyright <Released_At>-<current year>, AdaCore.
-   --
-   --  Released_At is supposed to be the year when the tool is first released.
-
-   procedure Print_Tool_Version (Released_At : Positive);
-   --  Similar to Print_Version_Info, but sends the output into Stdout and
-   --  the format of the information printed is similar to what is printed
-   --  for '--version' option by all the other GNAT tools.
+   --  (gnatcheck|gnatkp) <version> (<date>)
+   --  Copyright (C) 2004-<current year>, AdaCore.
 
    procedure Report_Unhandled_Exception (Ex : Exception_Occurrence);
    --  Reports an unhandled exception into Standard_Error

lkql_checker/src/gnatcheck-projects.adb

@@ -1136,7 +1136,7 @@ package body Gnatcheck.Projects is
       if Arg.Verbose.Get and then not Arg.Aggregated_Project then
          --  When processing aggregated projects one by one, we want
          --  Verbose_Mode to print this only in the outer invocation.
-         Print_Version_Info (2004);
+         Print_Version_Info;
       end if;
 
       --  We generate the rule help unconditionally

lkql_checker/src/gnatcheck_main.adb

@@ -396,7 +396,7 @@ begin
    Scan_Arguments (First_Pass => True);
 
    if Arg.Version.Get then
-      Print_Tool_Version (2004);
+      Print_Version_Info;
       OS_Exit (E_Success);
 
    elsif Arg.Help.Get then

lkql_jit/cli/src/main/java/com/adacore/lkql_jit/cli/LKQLMain.java

@@ -23,7 +23,9 @@
         LKQLRefactor.class,
     },
     description = "Unified driver for LKQL (Langkit query language). Allows you to run LKQL " +
-    "scripts or apply specific checks on a given Ada codebase"
+    "scripts or apply specific checks on a given Ada codebase",
+    // Version information are substituted by anod for production builds
+    version = { "lkql 26.0w (unknown date)", "Copyright (C) 2004-2025, AdaCore." }
 )
 public class LKQLMain implements Callable<Integer> {
 

testsuite/drivers/gnatcheck_driver.py

@@ -697,7 +697,12 @@ def output_refiners(self) -> list[OutputRefiner]:
                 "gnatcheck <version> (<date>)",
             )
         )
-        result.append(PatternSubstitute("Copyright [0-9-]+", "Copyright <date>"))
+        result.append(
+            PatternSubstitute(
+                "Copyright \\(C\\) [0-9-]+",
+                "Copyright (C) <date>"
+            )
+        )
 
         # Remove project search path information
         result.append(PatternSubstitute(

testsuite/tests/gnatcheck/lkql_rules_merging/merge_sets/test.out

@@ -11,7 +11,7 @@ rules1.lkql:7:20: info: register new instance sc1
 rules1.lkql:8:20: info: register new instance sc2
 rules2.lkql:6:13: warning: instance rule2b runs the same check than instance rule2 declared at rules1.lkql:6:5
 gnatcheck <version> (<date>)
-Copyright <date>, AdaCore.
+Copyright (C) <date>, AdaCore.
 test.adb:1:01: rule violation: rule2 [rule2]
 test.adb:1:01: rule violation: rule2 [rule2b|rule2]
 test.adb:1:11: rule violation: rule1 [name1d|rule1]

testsuite/tests/gnatcheck/lkql_rules_merging/merge_sets_error_1/test.out

@@ -5,7 +5,7 @@ rules2.lkql:5:14: error: instance name1b has a different configuration than the
 rules1.lkql:4:5: info: register new instance rule2
 rules2.lkql:6:5: warning: ignore duplicate instance rule2, previous declaration at rules1.lkql:4:5
 gnatcheck <version> (<date>)
-Copyright <date>, AdaCore.
+Copyright (C) <date>, AdaCore.
 gnatcheck: error: no rule to check specified
 try "gnatcheck --help" for more information.
 >>>program returned status code 2