
* cedet-idutils.el (cedet-idutils-make-command): New option. (cedet-idutils-mkid-call): (cedet-idutils-create/update-database): New functions. * cedet-cscope.el (cedet-cscope-create): (cedet-cscope-create/update-database): New functions. (cedet-cscope-support-for-directory): Make interactive. * cedet-global.el (cedet-global-gtags-command): New option. (cedet-gnu-global-gtags-call) (cedet-gnu-global-create/update-database): New functions. * ede.el (ede-save-cache): Fix recentf-exclude expression. (ede-make-dist): Always use toplevel project. (ede-buffer-object): If we fail to find an object in the current project, loop upward looking for a match. If no target is found, use most local project. (ede-buffer-belongs-to-target-p) (ede-buffer-belongs-to-project-p): New functions. (ede-initialize-state-current-buffer): New function. (ede-target-forms-menu, ede-project-buffers): Use them. (ede-minor-mode, ede-reset-all-buffers): Use it. (project-interactive-select-target, project-add-file): Don't use ede-project-force-load. (ede-buffer-object): New arg PROJSYM. (ede-minor-mode): Remove ede-directory-project-p test. (ede-initialize-state-current-buffer): Don't test for ede-directory-project-p if there is a matching open project. (ede-customize-forms-menu): Prevent error if there is no project. (ede-load-project-file): Set ede-constructing to the thing being constructed, instead of t. (ede-project-force-load): Deleted. * ede/base.el: * ede/auto.el: * ede/custom.el: New files. * ede/autoconf-edit.el (autoconf-find-last-macro) (autoconf-parameters-for-macro): Parse multiline parameters of macros. Optionally ignore case and at bol for macro. (autoconf-parameter-strip): Use greedy match for newlines. (autoconf-new-automake-string): Deleted. (autoconf-new-program): Use SRecode to fill an empty file. * ede/cpp-root.el (ede-create-lots-of-projects-under-dir): New function. * ede/files.el (ede-flush-project-hash): New command. (ede-convert-path): Add optional PROJECT arg. (ede-directory-project-p): Obey ".ede-ignore". (ede-expand-filename-local) (ede-expand-filename-impl-via-subproj): New methods. (ede-expand-filename-impl): Use them. (ede-project-root, ede-project-root-directory): Move to ede/auto.el. * ede/locate.el (ede-locate-flush-hash): (ede-locate-create/update-root-database): New methods. (initialize-instance): Use ede-locate-flush-hash. * ede/pmake.el (ede-proj-makefile-insert-variables): If this is the top project and not a metasubproject, set TOP to CURDIR. (ede-proj-makefile-insert-variables): Output a target's object list whether or not the vars are already in the Makefile. (ede-pmake-insert-variable-once): New macro. * ede/project-am.el (project-am-with-makefile-current): Add recentf-exclude. (project-am-load-makefile): Obey an optional suggested name. (project-am-expand-subdirlist): New function. (project-am-makefile::project-rescan): Use it. Combine SUBDIRS and DIST_SUBDIRS. (project-am-meta-type-alist): A list to scan better Makefile.am (project-am-scan-for-targets): Scan also over project-am-meta-type-alist. (ede-system-include-path): Simple implementation. (ede-find-target): Deleted. EDE core takes care of this. (ede-buffer-mine): Create the searched filename as relative. (project-am-load): Simplify, using autoconf-edit. (project-am-extract-package-info): Fix separators. * ede/proj.el (project-run-target): New method. (project-make-dist, project-compile-project): Use ede-proj-automake-p to determine which kind of compile to use. (project-rescan): Call ede-load-project-file. (ede-buffer-mine): Add more file names that belong to the project. (ede-proj-compilers): Improve error message. * ede/proj-obj.el (ede-ld-linker): Use the LDDEPS variable. (ede-source-c++): Add more C++ extensions. (ede-proj-target-makefile-objectcode): Quote initforms. Support lex and yacc. * ede/proj-prog.el (ede-proj-makefile-insert-rules): Removed. (ede-proj-makefile-insert-variables): New, add LDDEPS. (ede-proj-makefile-insert-automake-post-variables): Add LDADD variable. Use ldlibs-local slot. Add a -l to ldlibs strings. (ede-proj-target-makefile-program): Swap order of two slots so they show up in the same order as in the command line. (ede-proj-target-makefile-program): Add ldlibs-local slot. * ede/proj-shared.el (ede-g++-libtool-shared-compiler): Fix inference rule to use cpp files. (ede-proj-target-makefile-shared-object): Quote initforms. * ede/proj-misc.el (ede-proj-target-makefile-miscelaneous): * ede/proj-info.el (ede-proj-target-makefile-info): * ede/proj-aux.el (ede-proj-target-aux): * ede/proj-archive.el (ede-proj-target-makefile-archive): * ede/proj-elisp.el (ede-proj-target-elisp) (ede-proj-target-elisp-autoloads): Quote initforms. * ede/srecode.el (ede-srecode-setup): Load autoconf templates. * ede/shell.el (ede-shell-buffer): Fix buffer name. * ede/pconf.el (ede-proj-configure-synchronize): If user events occur while waiting for the compile process to finish, pull them in and discard those events.
203 lines
6.5 KiB
EmacsLisp
203 lines
6.5 KiB
EmacsLisp
;;; cedet-idutils.el --- ID Utils support for CEDET.
|
|
|
|
;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <eric@siege-engine.com>
|
|
;; Version: 0.2
|
|
;; Keywords: OO, lisp
|
|
|
|
;; 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 <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
;;
|
|
;; Basic support calling ID Utils functions, and checking version
|
|
;; numbers.
|
|
|
|
;;; Code:
|
|
|
|
(declare-function inversion-check-version "inversion")
|
|
|
|
(defvar cedet-idutils-min-version "4.0"
|
|
"Minimum version of ID Utils required.")
|
|
|
|
(defcustom cedet-idutils-file-command "fnid"
|
|
"Command name for the ID Utils executable for searching file names."
|
|
:type 'string
|
|
:group 'cedet)
|
|
|
|
(defcustom cedet-idutils-token-command "lid"
|
|
"Command name for the ID Utils executable for searching for tokens."
|
|
:type 'string
|
|
:group 'cedet)
|
|
|
|
(defcustom cedet-idutils-make-command "mkid"
|
|
"Command name for the ID Utils executable for creating token databases."
|
|
:type 'string
|
|
:group 'cedet)
|
|
|
|
(defun cedet-idutils-search (searchtext texttype type scope)
|
|
"Perform a search with ID Utils, return the created buffer.
|
|
SEARCHTEXT is text to find.
|
|
TEXTTYPE is the type of text, such as 'regexp, 'string, 'tagname,
|
|
'tagregexp, or 'tagcompletions.
|
|
TYPE is the type of search, meaning that SEARCHTEXT is compared to
|
|
filename, tagname (tags table), references (uses of a tag) , or
|
|
symbol (uses of something not in the tag table.)
|
|
SCOPE is the scope of the search, such as 'project or 'subdirs.
|
|
Note: Scope is not yet supported."
|
|
(if (eq type 'file)
|
|
;; Calls for file stuff is very simple.
|
|
(cedet-idutils-fnid-call (list searchtext))
|
|
;; Calls for text searches is more complex.
|
|
(let* ((resultflg (if (eq texttype 'tagcompletions)
|
|
(list "--key=token")
|
|
(list "--result=grep")))
|
|
(scopeflgs nil) ; (cond ((eq scope 'project) "" ) ((eq scope 'target) "l")))
|
|
(stflag (cond ((or (eq texttype 'tagname)
|
|
(eq texttype 'tagregexp))
|
|
(list "-r" "-w"))
|
|
((eq texttype 'tagcompletions)
|
|
;; Add regex to search text for beginning of char.
|
|
(setq searchtext (concat "^" searchtext))
|
|
(list "-r" "-s" ))
|
|
((eq texttype 'regexp)
|
|
(list "-r"))
|
|
;; t means 'symbol
|
|
(t (list "-l" "-w"))))
|
|
)
|
|
(cedet-idutils-lid-call (append resultflg scopeflgs stflag
|
|
(list searchtext))))))
|
|
|
|
(defun cedet-idutils-fnid-call (flags)
|
|
"Call ID Utils fnid with the list of FLAGS.
|
|
Return the created buffer with with program output."
|
|
(let ((b (get-buffer-create "*CEDET fnid*"))
|
|
(cd default-directory)
|
|
)
|
|
(with-current-buffer b
|
|
(setq default-directory cd)
|
|
(erase-buffer))
|
|
(apply 'call-process cedet-idutils-file-command
|
|
nil b nil
|
|
flags)
|
|
b))
|
|
|
|
(defun cedet-idutils-lid-call (flags)
|
|
"Call ID Utils lid with the list of FLAGS.
|
|
Return the created buffer with with program output."
|
|
(let ((b (get-buffer-create "*CEDET lid*"))
|
|
(cd default-directory)
|
|
)
|
|
(with-current-buffer b
|
|
(setq default-directory cd)
|
|
(erase-buffer))
|
|
(apply 'call-process cedet-idutils-token-command
|
|
nil b nil
|
|
flags)
|
|
b))
|
|
|
|
(defun cedet-idutils-mkid-call (flags)
|
|
"Call ID Utils mkid with the list of FLAGS.
|
|
Return the created buffer with with program output."
|
|
(let ((b (get-buffer-create "*CEDET mkid*"))
|
|
(cd default-directory)
|
|
)
|
|
(with-current-buffer b
|
|
(setq default-directory cd)
|
|
(erase-buffer))
|
|
(apply 'call-process cedet-idutils-make-command
|
|
nil b nil
|
|
flags)
|
|
b))
|
|
|
|
;;; UTIL CALLS
|
|
;;
|
|
(defun cedet-idutils-expand-filename (filename)
|
|
"Expand the FILENAME with ID Utils.
|
|
Return a filename relative to the default directory."
|
|
(interactive "sFile: ")
|
|
(let ((ans (with-current-buffer (cedet-idutils-fnid-call (list filename))
|
|
(goto-char (point-min))
|
|
(if (looking-at "[^ \n]*fnid: ")
|
|
(error "ID Utils not available")
|
|
(split-string (buffer-string) "\n" t)))))
|
|
(setq ans (mapcar 'expand-file-name ans))
|
|
(when (called-interactively-p 'interactive)
|
|
(if ans
|
|
(if (= (length ans) 1)
|
|
(message "%s" (car ans))
|
|
(message "%s + %d others" (car ans)
|
|
(length (cdr ans))))
|
|
(error "No file found")))
|
|
ans))
|
|
|
|
(defun cedet-idutils-support-for-directory (&optional dir)
|
|
"Return non-nil if ID Utils has a support file for DIR.
|
|
If DIR is not supplied, use the current default directory.
|
|
This works by running lid on a bogus symbol, and looking for
|
|
the error code."
|
|
(save-excursion
|
|
(let ((default-directory (or dir default-directory)))
|
|
(condition-case nil
|
|
(progn
|
|
(set-buffer (cedet-idutils-fnid-call '("moose")))
|
|
(goto-char (point-min))
|
|
(if (looking-at "[^ \n]*fnid: ")
|
|
nil
|
|
t))
|
|
(error nil)))))
|
|
|
|
(defun cedet-idutils-version-check (&optional noerror)
|
|
"Check the version of the installed ID Utils command.
|
|
If optional programatic argument NOERROR is non-nil, then
|
|
instead of throwing an error if Global isn't available, then
|
|
return nil."
|
|
(interactive)
|
|
(require 'inversion)
|
|
(let ((b (condition-case nil
|
|
(cedet-idutils-fnid-call (list "--version"))
|
|
(error nil)))
|
|
(rev nil))
|
|
(if (not b)
|
|
(progn
|
|
(when (called-interactively-p 'interactive)
|
|
(message "ID Utils not found."))
|
|
nil)
|
|
(with-current-buffer b
|
|
(goto-char (point-min))
|
|
(re-search-forward "fnid - \\([0-9.]+\\)" nil t)
|
|
(setq rev (match-string 1))
|
|
(if (inversion-check-version rev nil cedet-idutils-min-version)
|
|
(if noerror
|
|
nil
|
|
(error "Version of ID Utils is %s. Need at least %s"
|
|
rev cedet-idutils-min-version))
|
|
;; Else, return TRUE, as in good enough.
|
|
(when (called-interactively-p 'interactive)
|
|
(message "ID Utils %s - Good enough for CEDET." rev))
|
|
t)))))
|
|
|
|
(defun cedet-idutils-create/update-database (&optional dir)
|
|
"Create an IDUtils database in DIR.
|
|
IDUtils must start from scratch when updating a database."
|
|
(interactive "DDirectory: ")
|
|
(let ((default-directory dir))
|
|
(cedet-idutils-mkid-call nil)))
|
|
|
|
(provide 'cedet-idutils)
|
|
|
|
;; arch-tag: 663ca082-5b3d-4384-8710-cc74f990b501
|
|
;;; cedet-idutils.el ends here
|