Re: GNAT GPL 2017 gnatcoll.xref disappeared?

[Simon Wright <simon@pushface.org>]

[-- Attachment #1: Type: text/plain, Size: 744 bytes --]

Stephen Leake <stephen_leake@stephe-leake.org> writes:

> I'm trying to upgrade to GNAT GPL 2017 (from 2016). I'm running on
> Windows 8.1.
>
> One application uses gnatcoll.xref.
>
> In 2016, that's found in:
>
> gnat/include/gnatcoll/gnatcoll_sqlite.static/gnatcoll-xref.ads
>
> However, the file is not found in the 2017 install. Note that the
> 'gnat-...-bin.exe' installer for 2017 includes gnatcoll, while in 2016
> it's a separate install.
>
> The gnatcoll user guide for 2017 (share/doc/gnatcoll/GNATColl.pdf)
> chapter 25 says gnatcoll.xref should be there (it is used in the
> example code).
>
> Has anyone else run into this? And is there a fix/workaround?

Assuming you're working on ada-mode .. these patches should do the
trick!


[-- Attachment #2: Patch for new gnatcoll.xref location --]
[-- Type: text/plain, Size: 1201 bytes --]

diff --git a/ada_mode_gps_indent.gpr b/ada_mode_gps_indent.gpr
index 3667edfc..a6656059 100644
--- a/ada_mode_gps_indent.gpr
+++ b/ada_mode_gps_indent.gpr
@@ -19,6 +19,7 @@
 with "gnat_util";
 with "gnatcoll_sqlite";
 with "gnatcoll_iconv";
+with "gnatcoll_xref";
 project Ada_Mode_GPS_Indent is
    for Main use ("ada_mode_gps_indent.adb");
 
diff --git a/gpr_query.adb b/gpr_query.adb
index d53a622d..7737b798 100644
--- a/gpr_query.adb
+++ b/gpr_query.adb
@@ -444,8 +444,7 @@ procedure Gpr_Query is
       pragma Unreferenced (Args);
    begin
       Xref.Parse_All_LI_Files
-        (Tree                => Tree,
-         Project             => Tree.Root_Project,
+        (Project             => Tree.Root_Project,
          Parse_Runtime_Files => False, --  True encounters bug in gnatcoll.projects; null pointer
          Show_Progress       => Progress_Reporter,
          ALI_Encoding        => ALI_Encoding.all,
diff --git a/gpr_query.gpr b/gpr_query.gpr
index 6e57ee13..fcb9c655 100644
--- a/gpr_query.gpr
+++ b/gpr_query.gpr
@@ -18,6 +18,7 @@
 
 with "gnatcoll";
 with "gnatcoll_sqlite";
+with "gnatcoll_xref";
 with "gnat_util";
 project Gpr_query is
    for Main use ("gpr_query.adb");