From mboxrd@z Thu Jan  1 00:00:00 1970
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on polar.synack.me
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00
	autolearn=unavailable autolearn_force=no version=3.4.4
Path: 
 eternal-september.org!reader01.eternal-september.org!reader02.eternal-september.org!news.eternal-september.org!news.eternal-september.org!.POSTED!not-for-mail
From: Simon Wright <simon@pushface.org>
Newsgroups: comp.lang.ada
Subject: Re: GNAT GPL 2017 gnatcoll.xref disappeared?
Date: Thu, 22 Jun 2017 20:27:48 +0100
Organization: A noiseless patient Spider
Message-ID: <lyr2yb4ybv.fsf@pushface.org>
References: <11b656c0-3dc8-48cc-9515-70e4386ca24b@googlegroups.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Injection-Info: mx02.eternal-september.org;
 posting-host="a891fb36de253123be22f8a7f89750e8";
	logging-data="17607"; mail-complaints-to="abuse@eternal-september.org";
	posting-account="U2FsdGVkX189BECisrPBb+9cmSROv79Te7mNMdkU78c="
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (darwin)
Cancel-Lock: sha1:53PU/EyOfqVcSY4PmcLRJNjNGXA=
	sha1:gSKLEv604pQ16RQHH13RpDy9Exc=
Xref: news.eternal-september.org comp.lang.ada:47060
Date: 2017-06-22T20:27:48+01:00
List-Id: <comp.lang.ada>

--=-=-=
Content-Type: text/plain

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!


--=-=-=
Content-Type: text/plain
Content-Disposition: inline; filename=xref-diffs
Content-Description: Patch for new gnatcoll.xref location

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");

--=-=-=--