branch: externals/wisitoken-grammar-mode commit ca949b96aaf66eb30e357adbbbbbac95dbf0be2e Author: Stephen Leake <stephen_le...@stephe-leake.org> Commit: Stephen Leake <stephen_le...@stephe-leake.org>
Release 1.0.3; fix more packaging bugs * build.sh: Add -j8. * wisitoken-grammar-mmm.el: Delete. * wisitoken-grammar-mode.el: Bump version. * wisitoken_grammar.gpr: Delete; replace with .gp. * wisitoken_grammar.gpr.gp: New file; choose 'wisi' or 'wisitoken'. --- build.sh | 2 +- wisitoken-grammar-mmm.el | 44 ------- wisitoken-grammar-mode.el | 2 +- wisitoken_grammar.gpr => wisitoken_grammar.gpr.gp | 150 +++++++++++----------- 4 files changed, 78 insertions(+), 120 deletions(-) diff --git a/build.sh b/build.sh index bfbb378..b054fc3 100755 --- a/build.sh +++ b/build.sh @@ -24,7 +24,7 @@ export GPR_PROJECT_PATH="../wisi-2.2.1" gnatprep -DELPA="yes" wisitoken_grammar.gpr.gp wisitoken_grammar.gpr -gprbuild -p -P wisitoken_grammar.gpr +gprbuild -p -j8 -P wisitoken_grammar.gpr gprinstall -f -p -P wisitoken_grammar.gpr --install-name=wisitoken_grammar # end of file diff --git a/wisitoken-grammar-mmm.el b/wisitoken-grammar-mmm.el deleted file mode 100644 index cc19a7c..0000000 --- a/wisitoken-grammar-mmm.el +++ /dev/null @@ -1,44 +0,0 @@ -;;; Define multi-major-mode stuff for wisitoken-grammar mode. -*- lexical-binding:t -*- - -;; Copyright (C) 2019 Free Software Foundation, Inc. - -;; This file is free software; you can redistribute it and/or modify -;; it under the 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 file 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 -;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. - -(require 'mmm-mode) - -(mmm-add-classes - '((wisi-action - :match-submode wisitoken-grammar-mmm-submode - :face mmm-code-submode-face - :front "%(" - :back ")%" - :insert ((?a wisi-action nil @ "%(" @ "" _ "" @ ")%"))) - (wisi-code - :match-submode wisi-mmm-submode - :face mmm-code-submode-face - :front "%{" - :back "}%" - :insert ((?a wisi-code nil @ "%{" @ "" _ "" @ "}%"))) - )) - -(defvar wisitoken-grammar-action-mode) ;; in wisitoken-grammar-mode.el -(defun wisitoken-grammar-mmm-submode (_delim) - "for :match-submode" - wisitoken-grammar-action-mode) - -(add-to-list 'mmm-mode-ext-classes-alist '(wisitoken-grammar-mode nil wisi-action)) -(add-to-list 'mmm-mode-ext-classes-alist '(wisitoken-grammar-mode nil wisi-code)) - -(provide 'wisitoken-grammar-mmm) -;;; end of file diff --git a/wisitoken-grammar-mode.el b/wisitoken-grammar-mode.el index 42bfe65..493f337 100644 --- a/wisitoken-grammar-mode.el +++ b/wisitoken-grammar-mode.el @@ -5,7 +5,7 @@ ;; Author: Stephen Leake <stephen_le...@stephe-leake.org> ;; Maintainer: Stephen Leake <stephen_le...@stephe-leake.org> ;; Keywords: languages -;; Version: 1.0.2 +;; Version: 1.0.3 ;; package-requires: ((wisi "2.2.1") (emacs "25.0") (mmm-mode "0.5.7")) ;; no upstream url; just ELPA diff --git a/wisitoken_grammar.gpr b/wisitoken_grammar.gpr.gp similarity index 96% rename from wisitoken_grammar.gpr rename to wisitoken_grammar.gpr.gp index 7d65dde..3ac9502 100644 --- a/wisitoken_grammar.gpr +++ b/wisitoken_grammar.gpr.gp @@ -1,74 +1,76 @@ --- Abstract : --- --- build executables --- --- Copyright (C) 2017 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 "wisi"; -with "wisitoken"; -with "standard_common"; -project WisiToken_Grammar is - - for Main use - ("wisitoken_grammar_mode_parse.ads", - "run_wisitoken_grammar_parse.ads" - ); - - 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"); - - 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; - - package Builder is - -- We use ".exe" extension even on non-Windows, to simplify the makefiles. - for Executable_Suffix use ".exe"; - end Builder; - - package Binder is - for default_switches ("Ada") use ("-E"); -- symbolic traceback - end Binder; - -end WisiToken_Grammar; +-- Abstract : +-- +-- build executables +-- +-- Copyright (C) 2017 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 "wisi"; +#if ELPA="no" +with "wisitoken"; +#end if; +with "standard_common"; +project WisiToken_Grammar is + + for Main use + ("wisitoken_grammar_mode_parse.ads", + "run_wisitoken_grammar_parse.ads" + ); + + 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"); + + 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; + + package Builder is + -- We use ".exe" extension even on non-Windows, to simplify the makefiles. + for Executable_Suffix use ".exe"; + end Builder; + + package Binder is + for default_switches ("Ada") use ("-E"); -- symbolic traceback + end Binder; + +end WisiToken_Grammar;