emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ada-mode a2b7ec2: Version 7.1.7; fix packaging bug


From: Stephen Leake
Subject: [elpa] externals/ada-mode a2b7ec2: Version 7.1.7; fix packaging bug
Date: Fri, 6 Aug 2021 04:26:56 -0400 (EDT)

branch: externals/ada-mode
commit a2b7ec2b4c1b6067348b1d1026dd80c133b3200d
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Commit: Stephen Leake <stephen_leake@stephe-leake.org>

    Version 7.1.7; fix packaging bug
    
    * build.sh, install.sh: Fix wildcard for WISI; matched .signed,
    wisitoken.grammar-mode.
    
    * prj.el: Fix typo.
    
    * NEWS: Bump version.
    * README:
    * ada-mode.el:
    * ada-mode.texi:
---
 NEWS          | 5 +++++
 README        | 2 +-
 ada-mode.el   | 4 ++--
 ada-mode.texi | 4 ++--
 build.sh      | 7 ++++++-
 install.sh    | 7 ++++++-
 prj.el        | 2 +-
 7 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/NEWS b/NEWS
index b35340a..cd8e890 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,11 @@ Please send ada-mode bug reports to bug-gnu-emacs@gnu.org, with
 'ada-mode' in the subject. If possible, use M-x report-emacs-bug.
 
 
+* Ada Mode 7.1.7 
+06 Aug 2021
+
+** Packaging bug fix.
+
 * Ada Mode 7.1.6 
 30 Jul 2021
 
diff --git a/README b/README
index 7361dc4..13ccdcf 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Emacs Ada mode version 7.1.6
+Emacs Ada mode version 7.1.7
 
 Ada mode provides auto-casing, fontification, navigation, and
 indentation for Ada source code files.
diff --git a/ada-mode.el b/ada-mode.el
index 622579c..8519b26 100644
--- a/ada-mode.el
+++ b/ada-mode.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Stephen Leake <stephen_leake@stephe-leake.org>
 ;; Keywords: languages
 ;;  ada
-;; Version: 7.1.6
+;; Version: 7.1.7
 ;; package-requires: ((uniquify-files "1.0.1") (wisi "3.1.3") (emacs "25.3"))
 ;; url: http://www.nongnu.org/ada-mode/
 ;;
@@ -117,7 +117,7 @@
 (defun ada-mode-version ()
   "Return Ada mode version."
   (interactive)
-  (let ((version-string "7.1.5"))
+  (let ((version-string "7.1.7"))
     (if (called-interactively-p 'interactive)
        (message version-string)
       version-string)))
diff --git a/ada-mode.texi b/ada-mode.texi
index 8d3dfa6..c8102bb 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -25,7 +25,7 @@ developing GNU and promoting software freedom.''
 
 @titlepage
 @sp 10
-@title Ada Mode Version 7.1.6
+@title Ada Mode Version 7.1.7
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -37,7 +37,7 @@ developing GNU and promoting software freedom.''
 @node Top, Overview, (dir), (dir)
 @top Top
 
-Ada Mode Version 7.1.6
+Ada Mode Version 7.1.7
 @end ifnottex
 
 @menu
diff --git a/build.sh b/build.sh
index 3e0d367..be09a2a 100755
--- a/build.sh
+++ b/build.sh
@@ -19,7 +19,12 @@ fi
 # support for libadalang is still experimental
 gnatprep  -DHAVE_LIBADALANG="no" -DELPA="yes" -DHAVE_GNAT_UTIL=$HAVE_GNAT_UTIL 
ada_mode_wisi_parse.gpr.gp ada_mode_wisi_parse.gpr
 
-WISI_DIR=`ls -d ../wisi*`
+if [ -d ../wisi-3.1.? ]; then
+    WISI_DIR=`ls -d ../wisi-3.1.?`
+else
+    # try devel version
+    WISI_DIR=`ls -d ../wisi-3.1.?.0.*`
+fi
 
 gnatprep -DELPA="yes" $WISI_DIR/wisi.gpr.gp $WISI_DIR/wisi.gpr
 
diff --git a/install.sh b/install.sh
index e27f58f..4f6f518 100755
--- a/install.sh
+++ b/install.sh
@@ -8,7 +8,12 @@
 # If you don't have write permission in the GNAT installation
 # directory, you need to use --prefix=<dir>, or run with root priviledges.
 
-WISI_DIR=`ls -d ../wisi*`
+if [ -d ../wisi-3.1.? ]; then
+    WISI_DIR=`ls -d ../wisi-3.1.?`
+else
+    # try devel version
+    WISI_DIR=`ls -d ../wisi-3.1.?.0.*`
+fi
 
 gprinstall -f -p -P ada_mode_wisi_parse.gpr -aP $WISI_DIR 
--install-name=ada_mode_wisi_parse $1 
 
diff --git a/prj.el b/prj.el
index b1bd7de..7cd9a4e 100644
--- a/prj.el
+++ b/prj.el
@@ -15,6 +15,6 @@
    "Makefile"
    ))
 
-(wisi-prj-delete "ada_mode elpa")
+;;(wisi-prj-delete "ada_mode elpa")
 
 ;; end of file



reply via email to

[Prev in Thread] Current Thread [Next in Thread]