From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Koen Meersman Newsgroups: gmane.emacs.bugs Subject: bug#40403: emacs ada-mode : updated build.sh script. Date: Fri, 3 Apr 2020 13:46:00 +0200 Message-ID: Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="000000000000c4958005a2617653" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="112126"; mail-complaints-to="usenet@ciao.gmane.io" To: 40403@debbugs.gnu.org, ada-mode-users@nongnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Apr 03 14:25:13 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jKLNp-000T0f-GR for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 03 Apr 2020 14:25:13 +0200 Original-Received: from localhost ([::1]:54644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKLNo-0006Sb-Eo for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 03 Apr 2020 08:25:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52926) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKLNg-0006Rf-G6 for bug-gnu-emacs@gnu.org; Fri, 03 Apr 2020 08:25:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKLNe-0005yl-OV for bug-gnu-emacs@gnu.org; Fri, 03 Apr 2020 08:25:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jKLNe-0005yg-Ja for bug-gnu-emacs@gnu.org; Fri, 03 Apr 2020 08:25:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jKLNe-00058f-78; Fri, 03 Apr 2020 08:25:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Koen Meersman Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org, stephen_leake@stephe-leake.org Resent-Date: Fri, 03 Apr 2020 12:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40403 X-GNU-PR-Package: emacs, ada-mode X-Debbugs-Original-To: bug-gnu-emacs@gnu.org, ada-mode-users@nongnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.158591666819655 (code B ref -1); Fri, 03 Apr 2020 12:25:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 3 Apr 2020 12:24:28 +0000 Original-Received: from localhost ([127.0.0.1]:41341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKLN5-00056s-JF for submit@debbugs.gnu.org; Fri, 03 Apr 2020 08:24:28 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:56158) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jKKm8-0002FN-8L for submit@debbugs.gnu.org; Fri, 03 Apr 2020 07:46:16 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48591) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jKKm6-0005AL-EY for bug-gnu-emacs@gnu.org; Fri, 03 Apr 2020 07:46:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jKKm4-0007lw-Ss for bug-gnu-emacs@gnu.org; Fri, 03 Apr 2020 07:46:14 -0400 Original-Received: from mail-ot1-x343.google.com ([2607:f8b0:4864:20::343]:45402) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jKKm4-0007lX-OY for bug-gnu-emacs@gnu.org; Fri, 03 Apr 2020 07:46:12 -0400 Original-Received: by mail-ot1-x343.google.com with SMTP id c9so6877670otl.12 for ; Fri, 03 Apr 2020 04:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=kIvNNhIR5aGOxf3n5VTmQLj0MB8U7JrbSEHjGC5q05A=; b=ILXVHUgvpcXd9flh5zC9LHUdzTK5RThYw0NzA6rUvy7XU8QoTbIg9dt3Abo4YEgv2i G2yjXyJ6Ruy1zpPFNejYId+g8KayemEs8U4tgLyfTlik6ohDboWOFbpkhXMjDkCdOi9M SX0PNn8OtSp42bYf/xiig6mwmeKx/KCExO8yJ+4uzh/rixKU3bPSmslyh2DgN7H5AKp4 d4Yhx+Dsuh4ZJMJX8m8OSwhERKYqO1lHvU08j9u9CRGVZ02Vohx5m76epeerPQa4306G B/ZaKI5Jt98EfhdhKhrLtokcEq5xERPBZkYDsiFAILzNa2b4BVitt8yiYIvGfDHxEoj5 SYWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=kIvNNhIR5aGOxf3n5VTmQLj0MB8U7JrbSEHjGC5q05A=; b=oxQ0txeHDywB8nB6AKwWtgMdDINgk6zmFHV9kyQv0wC9I5TFsFs29SM29/09mR4dgj 8SS+w5UNEuVuSlkDXK+J2vU9k5HnhrPvWhFq6EIuQHbX7NZ0Rh7vawUxGWg2lhmxrZ7x raPQLlaxzna0/5LQ3Iz6SboB+yIEHoXbEAjHXORsVb9/ife7xoHh3Qc7akgIssXL3t+r k99Skl1LrdlznT75jopBs2mMAMWmV44DmBv9FJERKwTWKXFZn+M7bOI1bPsSka9Eyr6U eWpqgUyHZCx44DQSLtprOYPLmo9Jf0l2Rx4bk+tAZEGuo+TIjJp+3L9pp9hNxe+b95mP /QCA== X-Gm-Message-State: AGi0PuYEgxamONjaT58kWGXSiGO9DiVpiXGllOsVL9Q/Bpad7XcMxjFz +l1+sBckXA4dwt0BkBoaI0RP7J30nmWZFo5BXMFrkDSOE98= X-Google-Smtp-Source: APiQypJ1yul8EBEySqYUSkZCxQ8G+tfTFr0SNYoKgl22GXVatwDhzSOvnFy1hMX1BydzjY8EcnTmFDbpn1Ef/O+WCZA= X-Received: by 2002:a9d:12d:: with SMTP id 42mr5778140otu.2.1585914371674; Fri, 03 Apr 2020 04:46:11 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Mailman-Approved-At: Fri, 03 Apr 2020 08:24:26 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:177985 Archived-At: --000000000000c4958005a2617653 Content-Type: text/plain; charset="UTF-8" Package: emacs, ada-mode -- I have updated build.sh a bit: * if build.sh called with extra options then these options are passed to gprbuild. (to allow using more CPU's, passing other gnat options, ... without modifying the *.gpr files.) * Not using ' $GPR_PROJECT_PATH' to wisi directory, as GPR_PROJECT_PATH is used by gprbuild. (and can point to own compiled gnatcoll_xref and others) * Allow calling build.sh multiple times - first call gprclean, to clean project - not removing ' ada_lr1_parse_table.txt.gz' If you agree on these changes, can someone apply this patch to ada-mode? Thanks, Koen The patch : --- build.sh.orig 2020-04-03 11:33:25.771222460 +0000 +++ build.sh 2020-04-03 11:34:37.337921847 +0000 @@ -1,29 +1,38 @@ #!/bin/sh # Build executables for Ada mode. +# build.sh +# e.g. 'build.sh -j0' : use all available processors to compile +# 'build.sh -wn' : treat warnings as warnings. +# 'build.sh -vh' : Verbose output (high verbosity) # # See install.sh for install - +# # In December 2016, GNATCOLL changed its Xref interface. First, the # GPR was split out; and second, one of the subprogram # interfaces.changed. # + # Determine whether the split-out gnatcoll_xref.gpr is available. +# To get ada-mode compiling with gnatcoll_xref, make sure the gnatcoll directory is added to $GPR_PROJECT_PATH +# i.e. the following file should exist: $GPR_PROJECT_PATH/gnatcoll_xref.gpr echo 'with "gnatcoll_xref"; abstract project check_xref is end check_xref;' > check_xref.gpr; -gprbuild -P check_xref.gpr > /dev/null 2>&1; +gprbuild -f -P check_xref.gpr > /dev/null 2>&1; if test $? -eq 0 ; then HAVE_GNATCOLL_XREF="yes"; else HAVE_GNATCOLL_XREF="no"; fi - echo "HAVE_GNATCOLL_XREF=$HAVE_GNATCOLL_XREF" +WISI_DIR="../wisi-3.0.1" +TOP_GPR="ada_mode_wisi_parse.gpr" + gnatprep -DHAVE_GNATCOLL_XREF=$HAVE_GNATCOLL_XREF gpr_query-process_refresh.adb.gp gpr_query-process_refresh.adb # support for libadalang is still experimental gnatprep -DHAVE_GNATCOLL_XREF=$HAVE_GNATCOLL_XREF -DHAVE_LIBADALANG="no" -DELPA="yes" ada_mode_wisi_parse.gpr.gp ada_mode_wisi_parse.gpr -export GPR_PROJECT_PATH="../wisi-3.0.1" +gnatprep -DELPA="yes" $WISI_DIR/wisi.gpr.gp $WISI_DIR/wisi.gpr -gnatprep -DELPA="yes" $GPR_PROJECT_PATH/wisi.gpr.gp $GPR_PROJECT_PATH/wisi.gpr +gprclean -r -P $TOP_GPR -aP$WISI_DIR -gprbuild -p -j8 -P ada_mode_wisi_parse.gpr -gzip -d -q ada_lr1_parse_table.txt.gz +gprbuild -p -j8 -P $TOP_GPR -aP $WISI_DIR "$@" +gzip -c -d -q ada_lr1_parse_table.txt.gz >ada_lr1_parse_table.txt # end of file --- Koen Meersman Sint Lambertuslaan 85 2812 Muizen + 32 (0)15 34 66 08 + 32 (0)476 60 69 30 koen.meersman@gmail.com --000000000000c4958005a2617653 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Package: emacs, ada-mode=C2=A0

--
=C2=A0
I have updated build.sh a bit:=C2= =A0

=C2=A0 * if build.sh called with extra options= then these options are passed to gprbuild.
=C2=A0 =C2=A0 (to all= ow using more CPU's, passing other gnat options, ... without modifying = the *.gpr files.)=C2=A0
=C2=A0 * Not using ' $GPR_PROJECT_PATH' to wisi directory, as GPR_PROJECT_PATH is used by gp= rbuild. (and can point to own compiled=C2=A0gnatcoll_xref and others)
=
=C2=A0 * Allow calling build.sh multiple times=C2=A0
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0- first call gprclean, to clean project
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0- not removing ' ada_lr1_parse_table.txt.gz'

If you agree on th= ese changes, can someone apply this patch to ada-mode?=C2=A0

=
Thanks,=C2=A0

Koen

= The patch :=C2=A0

--- build.sh.orig =C2=A0 =C2=A0 =C2=A0 2020-= 04-03 11:33:25.771222460 +0000
+++ build.sh =C2=A0 =C2=A02020-04-03 11:3= 4:37.337921847 +0000
@@ -1,29 +1,38 @@
=C2=A0#!/bin/sh
=C2=A0# Bui= ld executables for Ada mode.
+# =C2=A0 =C2=A0build.sh <other gprbuild= options>
+# =C2=A0 =C2=A0e.g. 'build.sh -j0' : use all avail= able processors to compile
+# =C2=A0 =C2=A0 =C2=A0 =C2=A0 'build.sh = -wn' : treat warnings as warnings.
+# =C2=A0 =C2=A0 =C2=A0 =C2=A0 &#= 39;build.sh -vh' : Verbose output (high verbosity)
=C2=A0#
=C2=A0= # See install.sh for install
-
+#
=C2=A0# In December 2016, GNATCO= LL changed its Xref interface. First, the
=C2=A0# GPR was split out; and= second, one of the subprogram
=C2=A0# interfaces.changed.
=C2=A0#+
=C2=A0# Determine whether the split-out gnatcoll_xref.gpr is availabl= e.
+# To get ada-mode compiling with gnatcoll_xref, make sure the gnatco= ll directory is added to $GPR_PROJECT_PATH
+# i.e. the following file sh= ould exist: $GPR_PROJECT_PATH/gnatcoll_xref.gpr
=C2=A0echo 'with &qu= ot;gnatcoll_xref"; abstract project check_xref is end check_xref;'= > check_xref.gpr;
-gprbuild -P check_xref.gpr > /dev/null 2>&a= mp;1;
+gprbuild -f -P check_xref.gpr > /dev/null 2>&1;
=C2= =A0if test $? -eq 0 ; then HAVE_GNATCOLL_XREF=3D"yes"; else HAVE_= GNATCOLL_XREF=3D"no"; fi
-
=C2=A0echo "HAVE_GNATCOLL_X= REF=3D$HAVE_GNATCOLL_XREF"

+WISI_DIR=3D"../wisi-3.0.1"= ;
+TOP_GPR=3D"ada_mode_wisi_parse.gpr"
+
=C2=A0gnatprep = -DHAVE_GNATCOLL_XREF=3D$HAVE_GNATCOLL_XREF gpr_query-process_refresh.adb.gp gpr_query-process_= refresh.adb

=C2=A0# support for libadalang is still experimental
= =C2=A0gnatprep -DHAVE_GNATCOLL_XREF=3D$HAVE_GNATCOLL_XREF -DHAVE_LIBADALANG= =3D"no" -DELPA=3D"yes" ada_mode_wisi_parse.gpr.gp ada_mode_wisi_parse.gpr
-export GPR_PROJECT_PATH=3D"../wisi-3.0.1"
+gnatprep -DELPA= =3D"yes" $WISI_DIR/wisi.gpr.gp= $WISI_DIR/wisi.gpr

-gnatprep -DELPA=3D"yes" $GPR_PROJECT_= PATH/wisi.gpr.gp $GPR_PROJECT_PATH/wisi.= gpr
+gprclean -r -P $TOP_GPR -aP$WISI_DIR

-gprbuild -p -j8 -P ada= _mode_wisi_parse.gpr
-gzip -d -q ada_lr1_parse_table.txt.gz
+gprbuild= -p -j8 -P $TOP_GPR -aP $WISI_DIR "$@"

+gzip -c -d -q ada_= lr1_parse_table.txt.gz >ada_lr1_parse_table.txt
=C2=A0# end of file

---
Koen Meersman
S= int Lambertuslaan 85
2812 Muizen
+ 32 (0)15 34 66 08
+ 32 (0)476 = 60 69 30
ko= en.meersman@gmail.com
--000000000000c4958005a2617653--