branch: externals/ada-mode commit 0f4da3a0137497fe843b887460609c4e44d5b799 Author: Stephen Leake <stephen_le...@stephe-leake.org> Commit: Stephen Leake <stephen_le...@stephe-leake.org>
Allow compiling in elpa workspace * build.sh: Simplify finding WISI_DIR. * ada_mode.prj: New file, for compiling in elpa workspace. * prj.el: * wisi.gpr.gp: Delete; only in packages/wisi. --- ada_mode.prj | 7 +++++++ build.sh | 7 +------ prj.el | 16 +++++++++++++++ wisi.gpr.gp | 64 ------------------------------------------------------------ 4 files changed, 24 insertions(+), 70 deletions(-) diff --git a/ada_mode.prj b/ada_mode.prj new file mode 100644 index 0000000..e02082d --- /dev/null +++ b/ada_mode.prj @@ -0,0 +1,7 @@ +gpr_project_path=$WISI + +gpr_file=ada_mode_wisi_parse.gpr + +casing=ada-mode.casing + +-- end of file diff --git a/build.sh b/build.sh index be09a2a..3e0d367 100755 --- a/build.sh +++ b/build.sh @@ -19,12 +19,7 @@ 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 -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 +WISI_DIR=`ls -d ../wisi*` gnatprep -DELPA="yes" $WISI_DIR/wisi.gpr.gp $WISI_DIR/wisi.gpr diff --git a/prj.el b/prj.el new file mode 100644 index 0000000..9f17ac0 --- /dev/null +++ b/prj.el @@ -0,0 +1,16 @@ +;; Emacs wisi project definitions for compiling ada-mode in ELPA workspace + +(let ((wisi-core (expand-file-name "../wisi"))) + + (wisi-prj-select-cache + "ada_mode.prj" + (wisi-prj-default ;; for ada-build prj vars + (create-ada-prj + :name "ada_mode elpa" + :compile-env + (list + (concat "WISI=" wisi-core)))) + "Makefile" + )) + +;; end of file diff --git a/wisi.gpr.gp b/wisi.gpr.gp deleted file mode 100644 index 1c17529..0000000 --- a/wisi.gpr.gp +++ /dev/null @@ -1,64 +0,0 @@ --- Abstract : --- --- Make installed and source ELPA package wisi Ada code available for --- other projects. --- --- Copyright (C) 2017, 2019 Free Software Foundation, Inc. --- --- This program is free software; you can redistribute it and/or --- modify it under terms of the GNU General Public License as --- published by the Free Software Foundation; either version 3, or (at --- your option) any later version. This program is distributed in the --- hope that it will be useful, but WITHOUT ANY WARRANTY; without even --- the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR --- PURPOSE. See the GNU General Public License for more details. You --- should have received a copy of the GNU General Public License --- distributed with this program; see file COPYING. If not, write to --- the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, --- MA 02110-1335, USA. - -with "gnatcoll"; -with "standard_common"; -#if ELPA="no" -with "sal"; -with "wisitoken"; -#end if; -project Wisi is - - for Source_Dirs use ("."); - - case Standard_Common.Profile is - when "On" => - for Object_Dir use "obj_pro"; - for Exec_Dir use "exec_pro"; - - when "Off" => - for Object_Dir use "obj"; - for Exec_Dir use "."; - end case; - - for Languages use ("Ada", "C"); -- C needed for wisitoken-bnf-generate; wisitoken_grammar_re2c.c - - package Compiler is - - case Standard_Common.Build is - when "Debug" => - for Default_Switches ("Ada") use - Standard_Common.Compiler.Common_Switches & - Standard_Common.Compiler.Style_Checks & - Standard_Common.Compiler.Debug_Switches; - - for Default_Switches ("C") use Standard_Common.Compiler.Debug_Switches_C; - - when "Normal" => - for Default_Switches ("Ada") use - Standard_Common.Compiler.Common_Switches & - Standard_Common.Compiler.Style_Checks & - Standard_Common.Compiler.Release_Switches; - - for Default_Switches ("C") use Standard_Common.Compiler.Release_Switches_C; - end case; - - end Compiler; - -end Wisi;