mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-13 17:40:22 -08:00
Remove a few more redundant `:group` args. Make use of lexical scoping to replace `(lambda...) with proper closures. * lisp/cedet/ede/custom.el (ede-project-sort-targets-list): Use `dotimes` and replace `(lambda..) with closures. * lisp/cedet/ede/proj-comp.el (proj-comp-insert-variable-once): * lisp/cedet/ede/pmake.el (ede-pmake-insert-variable-once): Remove unused var `addcr`. * lisp/cedet/semantic/complete.el: Use lexical-binding. (semantic-displayer-show-request): Remove unused var `typing-count`. Use `equal` instead of `stringp+string=`. * lisp/cedet/semantic/db-ebrowse.el: Use lexical-binding. (semanticdb-create-ebrowse-database): Remove unused vars `mma` and `regexp`. (semanticdb-ebrowse-strip-trees): Remove unused var `class` and `filename`. (semanticdb-ebrowse-add-globals-to-table): Remove unused var `fname`. * lisp/cedet/semantic/db-find.el: Use lexical-binding. (semanticdb-find-adebug-insert-scanned-tag-cons): Remove always-nil var `tip`. * lisp/cedet/semantic/db-global.el: Use lexical-binding. (semanticdb-enable-gnu-global-databases): Access local var `semantic--ih` by sticking its value in the code passed to `eval` rather than by dynamic scoping. * lisp/cedet/semantic/db-typecache.el: Use lexical-binding. (semanticdb-db-typecache-dump): Remove unused var `junk`. * lisp/cedet/semantic/debug.el: Use lexical-binding. * lisp/cedet/semantic/dep.el: Use lexical-binding. (semantic-add-system-include): Avoid `add-to-list` on a local variable. Access local var `value` by sticking its value in the code passed to `eval` rather than by dynamic scoping. (semantic-remove-system-include): Don't use `delete` on a list received from elsewhere. Access local var `value` by sticking its value in the code passed to `eval` rather than by dynamic scoping. (semantic-reset-system-include): Simplify a bit. * lisp/cedet/semantic/ede-grammar.el: Use lexical-binding. (project-compile-target): Remove unused vars `csrc` and `cb`. Use `cl-incf`. Remove apparently unneeded `with-no-warnings`. * lisp/cedet/semantic/edit.el: Use lexical-binding. (semantic-edits-change-over-tags): Remove unused var `inner-start`. (semantic-edits-incremental-parser-1): Silence warnings about intentionally unused var `last-cond`. * lisp/cedet/semantic/fw.el: Use lexical-binding. (recentf-exclude, semantic-init-hook, ede-auto-add-method) (flymake-start-syntax-check-on-find-file, auto-insert): Declare vars. * lisp/cedet/semantic/ia-sb.el: Use lexical-binding. (semantic-ia-sb-key-map): Move initialization into declaration. (semantic-ia-sb-more-buttons): Remove unused var `idx`. (semantic-ia-sb-line-path): Simplify `if` -> `or`. * lisp/cedet/semantic/idle.el (semantic-idle-breadcrumbs--tag-function): Make it a function returning a closure. * lisp/cedet/semantic/senator.el: Use lexical-binding. (senator-search-set-tag-class-filter): Replace `(lambda..) with a closure. * lisp/cedet/semantic/sort.el: Use lexical-binding. (semanticdb-search-system-databases): Declare var. (semantic-tag-external-member-children-default): Replace `(lambda..) with a closure. * lisp/cedet/semantic/tag-ls.el: Use lexical-binding. (semantic-tag-protection-default, semantic-tag-abstract-p-default): Simplify with `member`. * lisp/cedet/semantic/util.el: Use lexical-binding. (semantic-something-to-tag-table): Declare function `semanticdb-abstract-table--eieio-childp` called via `cl-typep`. * lisp/cedet/semantic/bovine/scm.el (semantic-default-scheme-setup): Remove duplicate setting of `imenu-create-index-function`. * lisp/cedet/semantic/decorate/mode.el (semantic-decoration-build-style-menu): Replace `(lambda..) with a closure. * lisp/cedet/srecode/cpp.el (srecode-semantic-apply-tag-to-dict): Remove always-t variable `member`. * lisp/cedet/srecode/mode.el (srecode-minor-mode-templates-menu): Replace `(lambda..) with a closure. Use `push`. * lisp/cedet/semantic/chart.el: Use lexical-binding. * lisp/cedet/semantic/db-debug.el: Use lexical-binding. * lisp/cedet/semantic/db-el.el: Use lexical-binding. * lisp/cedet/semantic/db-file.el: Use lexical-binding. * lisp/cedet/semantic/db-javascript.el: Use lexical-binding. * lisp/cedet/semantic/db-mode.el: Use lexical-binding. * lisp/cedet/semantic/db-ref.el: Use lexical-binding. * lisp/cedet/semantic/decorate.el: Use lexical-binding. * lisp/cedet/semantic/doc.el: Use lexical-binding. * lisp/cedet/semantic/find.el: Use lexical-binding. * lisp/cedet/semantic/format.el: Use lexical-binding. * lisp/cedet/semantic/html.el: Use lexical-binding. * lisp/cedet/semantic/ia.el: Use lexical-binding. * lisp/cedet/semantic/imenu.el: Use lexical-binding. * lisp/cedet/semantic/java.el: Use lexical-binding. * lisp/cedet/semantic/mru-bookmark.el: Use lexical-binding. * lisp/cedet/semantic/symref.el: Use lexical-binding. * lisp/cedet/semantic/tag-file.el: Use lexical-binding. * lisp/cedet/semantic/tag-write.el: Use lexical-binding. * lisp/cedet/semantic/texi.el: Use lexical-binding. * lisp/cedet/semantic/util-modes.el: Use lexical-binding.
193 lines
7.1 KiB
EmacsLisp
193 lines
7.1 KiB
EmacsLisp
;;; ede/pconf.el --- configure.ac maintenance for EDE -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 1998-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
|
;; Keywords: project
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs 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 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs 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/>.
|
|
|
|
;;; Commentary:
|
|
;;
|
|
;; Code generator for autoconf configure.ac, and support files.
|
|
|
|
(require 'ede/proj)
|
|
(require 'ede/autoconf-edit)
|
|
(defvar compilation-in-progress)
|
|
|
|
(defvar ede-pconf-create-file-query 'ask
|
|
"Controls if queries are made while creating project files.
|
|
A value of `ask' means to always ask the user before creating
|
|
a file, such as AUTHORS. A value of `never' means don't ask, and
|
|
don't do it. A value of nil means to just do it.")
|
|
|
|
;;; Code:
|
|
(cl-defmethod ede-proj-configure-file ((this ede-proj-project))
|
|
"The configure.ac script used by project THIS."
|
|
(ede-expand-filename (ede-toplevel this) "configure.ac" t))
|
|
|
|
(cl-defmethod ede-proj-configure-test-required-file ((this ede-proj-project) file)
|
|
"For project THIS, test that the file FILE exists, or create it."
|
|
(let ((f (ede-expand-filename (ede-toplevel this) file t)))
|
|
(when (not (file-exists-p f))
|
|
(save-excursion
|
|
(find-file f)
|
|
(cond ((string= file "AUTHORS")
|
|
(insert (user-full-name) " <" (user-login-name) ">"))
|
|
((string= file "NEWS")
|
|
(insert "NEWS file for " (ede-name this)))
|
|
(t (insert "\n")))
|
|
(save-buffer)
|
|
(when
|
|
(and (eq ede-pconf-create-file-query 'ask)
|
|
(not (eq ede-pconf-create-file-query 'never))
|
|
(not (y-or-n-p
|
|
(format "I had to create the %s file for you. Ok? "
|
|
file))))
|
|
(error "Quit"))))))
|
|
|
|
|
|
(cl-defmethod ede-proj-configure-synchronize ((this ede-proj-project))
|
|
"Synchronize what we know about project THIS into configure.ac."
|
|
(let ((b (find-file-noselect (ede-proj-configure-file this)))
|
|
;;(td (file-name-directory (ede-proj-configure-file this)))
|
|
(targs (oref this targets))
|
|
(postcmd "")
|
|
) ;; (add-missing nil)
|
|
;; First, make sure we have a file.
|
|
(if (not (file-exists-p (ede-proj-configure-file this)))
|
|
(autoconf-new-program b (oref this name) "Project.ede"))
|
|
(set-buffer b)
|
|
;; Next, verify all targets of all subobjects.
|
|
(autoconf-set-version (oref this version))
|
|
(let ((top-level-project-local this))
|
|
(autoconf-set-output
|
|
(ede-map-all-subprojects
|
|
this
|
|
(lambda (sp)
|
|
;; NOTE: don't put in ./Makefile - configure complains.
|
|
(let ((dir (file-name-as-directory
|
|
(directory-file-name
|
|
(ede-subproject-relative-path sp top-level-project-local)))))
|
|
(when (string= dir "./") (setq dir ""))
|
|
;; Use concat, because expand-file-name removes the relativity.
|
|
(concat dir "Makefile") )))))
|
|
;;
|
|
;; NOTE TO SELF. TURN THIS INTO THE OFFICIAL LIST
|
|
;;
|
|
(ede-proj-dist-makefile this)
|
|
;; Loop over all targets to clean and then add themselves in.
|
|
(ede-map-all-subprojects
|
|
this
|
|
(lambda (sp)
|
|
(ede-map-targets sp #'ede-proj-flush-autoconf)))
|
|
(ede-map-all-subprojects
|
|
this
|
|
(lambda (_sp)
|
|
(ede-map-targets this #'ede-proj-tweak-autoconf)))
|
|
;; Now save
|
|
(save-buffer)
|
|
(setq postcmd "autoreconf -f -i;")
|
|
|
|
;; Verify a bunch of files that are required by automake.
|
|
(ede-proj-configure-test-required-file this "AUTHORS")
|
|
(ede-proj-configure-test-required-file this "NEWS")
|
|
(ede-proj-configure-test-required-file this "README")
|
|
(ede-proj-configure-test-required-file this "ChangeLog")
|
|
;; Let specific targets get missing files.
|
|
(mapc #'ede-proj-configure-create-missing targs)
|
|
;; Verify that we have a make system.
|
|
(if (or (not (ede-expand-filename (ede-toplevel this) "Makefile"))
|
|
;; Now is this one of our old Makefiles?
|
|
(with-current-buffer
|
|
(find-file-noselect
|
|
(ede-expand-filename (ede-toplevel this)
|
|
"Makefile" t)
|
|
t)
|
|
(goto-char (point-min))
|
|
;; Here is the unique piece for our makefiles.
|
|
(re-search-forward "For use with: make" nil t)))
|
|
(setq postcmd (concat postcmd "./configure;")))
|
|
(if (not (string= "" postcmd))
|
|
(progn
|
|
(compile postcmd)
|
|
|
|
(while compilation-in-progress
|
|
(accept-process-output)
|
|
;; If sit for indicates that input is waiting, then
|
|
;; read and discard whatever it is that is going on.
|
|
(when (not (sit-for 1))
|
|
(read-event nil nil .1)
|
|
))
|
|
|
|
(with-current-buffer "*compilation*"
|
|
(goto-char (point-max))
|
|
|
|
;; FIXME: Use `compilation-finish-functions' or similar to
|
|
;; avoid relying on exact format of `mode-line-process'.
|
|
(when (not (string= (car mode-line-process) ":exit [0]"))
|
|
(error "Configure failed!"))
|
|
|
|
;; The Makefile is now recreated by configure?
|
|
(let ((b (get-file-buffer
|
|
(ede-expand-filename (ede-toplevel this)
|
|
"Makefile" 'newfile))))
|
|
;; This makes sure that if Makefile was loaded, and old,
|
|
;; that it gets flushed so we don't keep rebuilding
|
|
;; the autoconf system.
|
|
(if b (kill-buffer b))))
|
|
|
|
))))
|
|
|
|
(cl-defmethod ede-proj-configure-recreate ((this ede-proj-project))
|
|
"Delete project THIS's configure script and start over."
|
|
(if (not (ede-proj-configure-file this))
|
|
(error "Could not determine configure.ac for %S" (eieio-object-name this)))
|
|
(let ((b (get-file-buffer (ede-proj-configure-file this))))
|
|
;; Destroy all evidence of the old configure.ac
|
|
(delete-file (ede-proj-configure-file this))
|
|
(if b (kill-buffer b)))
|
|
(ede-proj-configure-synchronize this))
|
|
|
|
(cl-defmethod ede-proj-tweak-autoconf ((this ede-proj-target))
|
|
"Tweak the configure file (current buffer) to accommodate THIS."
|
|
;; Check the compilers belonging to THIS, and call the autoconf
|
|
;; setup for those compilers.
|
|
(mapc #'ede-proj-tweak-autoconf (ede-proj-compilers this))
|
|
(mapc #'ede-proj-tweak-autoconf (ede-proj-linkers this))
|
|
)
|
|
|
|
(cl-defmethod ede-proj-flush-autoconf ((_this ede-proj-target))
|
|
"Flush the configure file (current buffer) to accommodate THIS.
|
|
By flushing, remove any cruft that may be in the file. Subsequent
|
|
calls to `ede-proj-tweak-autoconf' can restore items removed by flush."
|
|
nil)
|
|
|
|
|
|
;; @TODO - No-one calls this ???
|
|
(cl-defmethod ede-proj-configure-add-missing ((_this ede-proj-target))
|
|
"Query if any files needed by THIS provided by automake are missing.
|
|
Results in --add-missing being passed to automake."
|
|
nil)
|
|
|
|
;; @TODO - No-one implements this yet.
|
|
(cl-defmethod ede-proj-configure-create-missing ((_this ede-proj-target))
|
|
"Add any missing files for THIS by creating them."
|
|
nil)
|
|
|
|
(provide 'ede/pconf)
|
|
|
|
;;; ede/pconf.el ends here
|