
lisp/ * eieio/eieio-datadebug.el (data-debug/eieio-insert-slots): Inhibit read only while inserting objects. lisp/cedet/ * semantic.el (navigate-menu): Yank Tag :enable. Make sure `senator-tag-ring' is bound. (semantic-parse-region-default): Stop reversing the output of parse-whole-stream. (semantic-repeat-parse-whole-stream): Append returned tags differently, so they come out in the right order. * semantic/sb.el (semantic-sb-filter-tags-of-class): New option. (semantic-sb-fetch-tag-table): Filter tags being bucketed to exclude tags belonging to above filtered classes. * semantic/find.el (semantic-filter-tags-by-class): New function. * semantic/tag-ls.el (semantic-tag-similar-p-default): Add short-circuit in case tag1 and 2 are identical. * semantic/analyze/fcn.el (semantic-analyze-dereference-metatype-stack): Use `semantic-tag-similar-p' instead of 'eq' when comparing two tags during metatype evaluation in case they are the same, but not the same node. (Tweaked patch from Tomasz Gajewski) (Tiny change) * semantic/db-find.el (semanticdb-partial-synchronize): Fix require to semantic/db-typecache to be correct. (semanticdb-find-tags-external-children-of-type): Make this a brutish search by default. * semantic/sort.el (semantic-tag-external-member-children-default): When calling `semanticdb-find-tags-external-children-of-type', pass in the input tag as the place to start searching for externally defined methods. * semantic/db-file.el (semanticdb-default-save-directory): Doc fix: Add ref to default value. * semantic/complete.el (semantic-complete-post-command-hook): When detecting if cursor is outside completion area, do so if cursor moves before start of overlay, or the original starting location of the overlay (i.e., if user deletes past beginning of the overlay region). (semantic-complete-inline-tag-engine): Initialize original start of `semantic-complete-inline-overlay'. * semantic/bovine/c.el (semantic-c-describe-environment): Update some section titles. Test semanticdb table before printing it. (semantic-c-reset-preprocessor-symbol-map): Update `semantic-lex-spp-macro-symbol-obarray' outside the loop over all the files contributing to its value. (semantic-c-describe-environment): If there is an EDE project but no spp symbols from it, say so. * srecode/args.el (srecode-semantic-handle-:project): New argument handler. Provide variable values if not in an EDE project. * srecode/srt-mode.el (srecode-template-mode): Fix typo on srecode name. * srecode/cpp.el (srecode-semantic-handle-:c): Replace all characters in FILENAME_SYMBOL that aren't valid CPP symbol chars. * srecode/map.el (srecode-map-validate-file-for-mode): Force semantic to load if it is not active in the template being added to the map. * srecode/srt.el: Add local variables for setting the autoload file name. (srecode-semantic-handle-:srt): New autoload cookie * ede.el (ede-apply-preprocessor-map): Apply map to `semantic-lex-spp-project-macro-symbol-obarray' instead of the system one. Add require for semantic. * ede/proj-elisp.el (ede-update-version-in-source): In case a file has both a version variable and a Version: comment, always use `call-next-method'. * ede/cpp-root.el (ede-set-project-variables): Deleted. `ede-preprocessor-map' does the job this function was attempting to do with :spp-table. (ede-preprocessor-map): Update file tests to provide better messages. Do not try to get symbols from a file that is the file in the current buffer. * ede/base.el (ede-project-placeholder): Add more documentation to :file slot. (ede-load-cache): Use `insert-file-contents' instead of `find-file-noselect' in order to avoid activating other tools. * semantic/bovine/c.el (semantic-get-local-variables): Also add a new variable 'this' if we are in an inline member function. For detecting this, we check overlays at point if there is a class spanning the current function. Also, the variable 'this' has to be a pointer. * semantic/bovine/gcc.el (semantic-gcc-setup): Fail gracefully when querying g++ for defines returns an error. * srecode/srt-mode.el: * srecode/compile.el: * semantic/elp.el: * semantic/db-el.el: * semantic/complete.el: * ede.el: * cogre.el: * srecode/table.el: * srecode/mode.el: * srecode/insert.el: * srecode/compile.el: * semantic/decorate/include.el: * semantic/db.el: * semantic/adebug.el: * ede/auto.el: * srecode/dictionary.el: * semantic/ede-grammar.el: * semantic/db.el: * semantic/db-find.el: * semantic/db-file.el: * semantic/complete.el: * semantic/bovine/c.el: * semantic/analyze.el: * ede/util.el: * ede/proj.el: * ede/proj-elisp.el: * ede/pconf.el: * ede/locate.el: * ede.el: Adapt to EIEIO namespace cleanup: Rename `object-name' to `eieio-object-name', `object-set-name-string' to `eieio-object-set-name-string', `object-class' to `eieio-object-class', `class-parent' to `eieio-class-parent', `class-parents' to `eieio-class-parents', `class-children' to `eieio-class-children', `object-name-string' to `eieio-object-name-string', `object-class-fast' to `eieio--object-class'. Also replace direct access with new accessor functions. * ede/cpp-root.el (ede-project-autoload, initialize-instance): Fix EDE file symbol to match rename. Fix ede-cpp-root symbol to include -project in name. * cedet-files.el (cedet-files-list-recursively): New function. Recursively find files whose names are matching to given regex * ede.el (ede-current-project): Rewrite to avoid imperative style. * ede/files.el (ede-find-file): Simplify code. * ede/base.el (ede-normalize-file/directory): Add function to normalize :file or :directory slots if they are missing. * ede/cpp-root.el (ede-cpp-root-project): Add compile-command slot. (project-compile-project): Compiles project using value specified in :compule-command slot or in compile-command local variable. Value of slot or local variable could be string or function that receives project and should return string that will be invoked as command. (project-compile-target): Invokes compilation of whole project * ede/files.el (ede-find-project-root): New function to find root of project that contains specific file. (ede-files-find-existing): New function which checks presence of given directory in the list of registered projects. etc/ * srecode/ede-autoconf.srt: Change Copyright to FSF. (ede-empty): Change AC_INIT to use PROJECT_NAME, and PROJECT_VERSION. * srecode/ede-make.srt (ede-empty): Add a dependency on :project. Add header comment specifying the project's relative path. * srecode/c.srt (header_guard): Upcase the filename symbol. * srecode/java.srt (empty-main): New. (class-tag): Decapitalize class.
317 lines
9.7 KiB
EmacsLisp
317 lines
9.7 KiB
EmacsLisp
;;; ede/emacs.el --- Special project for Emacs
|
|
|
|
;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
|
|
|
|
;; Author: Eric M. Ludlam <eric@siege-engine.com>
|
|
|
|
;; 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:
|
|
;;
|
|
;; Provide a special project type just for Emacs, cause Emacs is special.
|
|
;;
|
|
;; Identifies an Emacs project automatically.
|
|
;; Speedy ede-expand-filename based on extension.
|
|
;; Pre-populates the preprocessor map from lisp.h
|
|
;;
|
|
;; ToDo :
|
|
;; * Add "build" options.
|
|
;; * Add texinfo lookup options.
|
|
;; * Add website
|
|
|
|
(require 'ede)
|
|
(declare-function semanticdb-file-table-object "semantic/db")
|
|
(declare-function semanticdb-needs-refresh-p "semantic/db")
|
|
(declare-function semanticdb-refresh-table "semantic/db")
|
|
|
|
;;; Code:
|
|
(defvar ede-emacs-project-list nil
|
|
"List of projects created by option `ede-emacs-project'.")
|
|
|
|
(defun ede-emacs-file-existing (dir)
|
|
"Find a Emacs project in the list of Emacs projects.
|
|
DIR is the directory to search from."
|
|
(let ((projs ede-emacs-project-list)
|
|
(ans nil))
|
|
(while (and projs (not ans))
|
|
(let ((root (ede-project-root-directory (car projs))))
|
|
(when (string-match (concat "^" (regexp-quote root))
|
|
(file-name-as-directory dir))
|
|
(setq ans (car projs))))
|
|
(setq projs (cdr projs)))
|
|
ans))
|
|
|
|
;;;###autoload
|
|
(defun ede-emacs-project-root (&optional dir)
|
|
"Get the root directory for DIR."
|
|
(when (not dir) (setq dir default-directory))
|
|
(let ((case-fold-search t)
|
|
(proj (ede-files-find-existing dir ede-emacs-project-list)))
|
|
(if proj
|
|
(ede-up-directory (file-name-directory
|
|
(oref proj :file)))
|
|
;; No pre-existing project. Let's take a wild-guess if we have
|
|
;; an Emacs project here.
|
|
(when (string-match "emacs[^/]*" dir)
|
|
(let ((base (substring dir 0 (match-end 0))))
|
|
(when (file-exists-p (expand-file-name "src/emacs.c" base))
|
|
base))))))
|
|
|
|
(defun ede-emacs-version (dir)
|
|
"Find the Emacs version for the Emacs src in DIR.
|
|
Return a tuple of ( EMACSNAME . VERSION )."
|
|
(let ((buff (get-buffer-create " *emacs-query*"))
|
|
(configure_ac "configure.ac")
|
|
(emacs "Emacs")
|
|
(ver ""))
|
|
(with-current-buffer buff
|
|
(erase-buffer)
|
|
(setq default-directory (file-name-as-directory dir))
|
|
(or (file-exists-p configure_ac)
|
|
(setq configure_ac "configure.in"))
|
|
;(call-process "egrep" nil buff nil "-n" "-e" "^version=" "Makefile")
|
|
(call-process "egrep" nil buff nil "-n" "-e" "AC_INIT" configure_ac)
|
|
(goto-char (point-min))
|
|
;(re-search-forward "version=\\([0-9.]+\\)")
|
|
(cond
|
|
;; Maybe XEmacs?
|
|
((file-exists-p "version.sh")
|
|
(setq emacs "XEmacs")
|
|
(insert-file-contents "version.sh")
|
|
(goto-char (point-min))
|
|
(re-search-forward "emacs_major_version=\\([0-9]+\\)
|
|
emacs_minor_version=\\([0-9]+\\)
|
|
emacs_beta_version=\\([0-9]+\\)")
|
|
(setq ver (concat (match-string 1) "."
|
|
(match-string 2) "."
|
|
(match-string 3)))
|
|
)
|
|
((file-exists-p "sxemacs.pc.in")
|
|
(setq emacs "SXEmacs")
|
|
(insert-file-contents "sxemacs_version.m4")
|
|
(goto-char (point-min))
|
|
(re-search-forward "m4_define(\\[SXEM4CS_MAJOR_VERSION\\], \\[\\([0-9]+\\)\\])
|
|
m4_define(\\[SXEM4CS_MINOR_VERSION\\], \\[\\([0-9]+\\)\\])
|
|
m4_define(\\[SXEM4CS_BETA_VERSION\\], \\[\\([0-9]+\\)\\])")
|
|
(setq ver (concat (match-string 1) "."
|
|
(match-string 2) "."
|
|
(match-string 3)))
|
|
)
|
|
;; Insert other Emacs here...
|
|
|
|
;; Vaguely recent version of GNU Emacs?
|
|
(t
|
|
(insert-file-contents configure_ac)
|
|
(goto-char (point-min))
|
|
(re-search-forward "AC_INIT(emacs,\\s-*\\([0-9.]+\\)\\s-*)")
|
|
(setq ver (match-string 1))
|
|
)
|
|
)
|
|
;; Return a tuple
|
|
(cons emacs ver))))
|
|
|
|
(defclass ede-emacs-project (ede-project eieio-instance-tracker)
|
|
((tracking-symbol :initform 'ede-emacs-project-list)
|
|
)
|
|
"Project Type for the Emacs source code."
|
|
:method-invocation-order :depth-first)
|
|
|
|
(defun ede-emacs-load (dir &optional rootproj)
|
|
"Return an Emacs Project object if there is a match.
|
|
Return nil if there isn't one.
|
|
Argument DIR is the directory it is created for.
|
|
ROOTPROJ is nil, since there is only one project."
|
|
(or (ede-files-find-existing dir ede-emacs-project-list)
|
|
;; Doesn't already exist, so let's make one.
|
|
(let* ((vertuple (ede-emacs-version dir))
|
|
(proj (ede-emacs-project
|
|
(car vertuple)
|
|
:name (car vertuple)
|
|
:version (cdr vertuple)
|
|
:directory (file-name-as-directory dir)
|
|
:file (expand-file-name "src/emacs.c"
|
|
dir))))
|
|
(ede-add-project-to-global-list proj))))
|
|
|
|
;;;###autoload
|
|
(ede-add-project-autoload
|
|
(ede-project-autoload "emacs"
|
|
:name "EMACS ROOT"
|
|
:file 'ede/emacs
|
|
:proj-file "src/emacs.c"
|
|
:proj-root-dirmatch "emacs[^/]*"
|
|
:proj-root 'ede-emacs-project-root
|
|
:load-type 'ede-emacs-load
|
|
:class-sym 'ede-emacs-project
|
|
:new-p nil
|
|
:safe-p t)
|
|
'unique)
|
|
|
|
(defclass ede-emacs-target-c (ede-target)
|
|
()
|
|
"EDE Emacs Project target for C code.
|
|
All directories need at least one target.")
|
|
|
|
(defclass ede-emacs-target-el (ede-target)
|
|
()
|
|
"EDE Emacs Project target for Emacs Lisp code.
|
|
All directories need at least one target.")
|
|
|
|
(defclass ede-emacs-target-misc (ede-target)
|
|
()
|
|
"EDE Emacs Project target for Misc files.
|
|
All directories need at least one target.")
|
|
|
|
(defmethod initialize-instance ((this ede-emacs-project)
|
|
&rest fields)
|
|
"Make sure the targets slot is bound."
|
|
(call-next-method)
|
|
(unless (slot-boundp this 'targets)
|
|
(oset this :targets nil)))
|
|
|
|
;;; File Stuff
|
|
;;
|
|
(defmethod ede-project-root-directory ((this ede-emacs-project)
|
|
&optional file)
|
|
"Return the root for THIS Emacs project with file."
|
|
(ede-up-directory (file-name-directory (oref this file))))
|
|
|
|
(defmethod ede-project-root ((this ede-emacs-project))
|
|
"Return my root."
|
|
this)
|
|
|
|
(defmethod ede-find-subproject-for-directory ((proj ede-emacs-project)
|
|
dir)
|
|
"Return PROJ, for handling all subdirs below DIR."
|
|
proj)
|
|
|
|
;;; TARGET MANAGEMENT
|
|
;;
|
|
(defun ede-emacs-find-matching-target (class dir targets)
|
|
"Find a target that is a CLASS and is in DIR in the list of TARGETS."
|
|
(let ((match nil))
|
|
(dolist (T targets)
|
|
(when (and (object-of-class-p T class)
|
|
(string= (oref T :path) dir))
|
|
(setq match T)
|
|
))
|
|
match))
|
|
|
|
(defmethod ede-find-target ((proj ede-emacs-project) buffer)
|
|
"Find an EDE target in PROJ for BUFFER.
|
|
If one doesn't exist, create a new one for this directory."
|
|
(let* ((ext (file-name-extension (buffer-file-name buffer)))
|
|
(cls (cond ((not ext)
|
|
'ede-emacs-target-misc)
|
|
((string-match "c\\|h" ext)
|
|
'ede-emacs-target-c)
|
|
((string-match "elc?" ext)
|
|
'ede-emacs-target-el)
|
|
(t 'ede-emacs-target-misc)))
|
|
(targets (oref proj targets))
|
|
(dir default-directory)
|
|
(ans (ede-emacs-find-matching-target cls dir targets))
|
|
)
|
|
(when (not ans)
|
|
(setq ans (make-instance
|
|
cls
|
|
:name (file-name-nondirectory
|
|
(directory-file-name dir))
|
|
:path dir
|
|
:source nil))
|
|
(object-add-to-list proj :targets ans)
|
|
)
|
|
ans))
|
|
|
|
;;; UTILITIES SUPPORT.
|
|
;;
|
|
(defmethod ede-preprocessor-map ((this ede-emacs-target-c))
|
|
"Get the pre-processor map for Emacs C code.
|
|
All files need the macros from lisp.h!"
|
|
(require 'semantic/db)
|
|
(let* ((proj (ede-target-parent this))
|
|
(root (ede-project-root proj))
|
|
(table (semanticdb-file-table-object
|
|
(ede-expand-filename root "lisp.h")))
|
|
(config (semanticdb-file-table-object
|
|
(ede-expand-filename root "config.h")))
|
|
filemap
|
|
)
|
|
(when table
|
|
(when (semanticdb-needs-refresh-p table)
|
|
(semanticdb-refresh-table table))
|
|
(setq filemap (append filemap (oref table lexical-table)))
|
|
)
|
|
(when config
|
|
(when (semanticdb-needs-refresh-p config)
|
|
(semanticdb-refresh-table config))
|
|
(setq filemap (append filemap (oref config lexical-table)))
|
|
)
|
|
filemap
|
|
))
|
|
|
|
(defun ede-emacs-find-in-directories (name base dirs)
|
|
"Find NAME is BASE directory sublist of DIRS."
|
|
(let ((ans nil))
|
|
(while (and dirs (not ans))
|
|
(let* ((D (car dirs))
|
|
(ed (expand-file-name D base))
|
|
(ef (expand-file-name name ed)))
|
|
(if (file-exists-p ef)
|
|
(setq ans ef)
|
|
;; Not in this dir? How about subdirs?
|
|
(let ((dirfile (directory-files ed t))
|
|
(moredirs nil)
|
|
)
|
|
;; Get all the subdirs.
|
|
(dolist (DF dirfile)
|
|
(when (and (file-directory-p DF)
|
|
(not (string-match "\\.$" DF)))
|
|
(push DF moredirs)))
|
|
;; Try again.
|
|
(setq ans (ede-emacs-find-in-directories name ed moredirs))
|
|
))
|
|
(setq dirs (cdr dirs))))
|
|
ans))
|
|
|
|
(defmethod ede-expand-filename-impl ((proj ede-emacs-project) name)
|
|
"Within this project PROJ, find the file NAME.
|
|
Knows about how the Emacs source tree is organized."
|
|
(let* ((ext (file-name-extension name))
|
|
(root (ede-project-root proj))
|
|
(dir (ede-project-root-directory root))
|
|
(dirs (cond
|
|
((not ext) nil)
|
|
((string-match "h\\|c" ext)
|
|
'("src" "lib-src" "lwlib"))
|
|
((string-match "elc?" ext)
|
|
'("lisp"))
|
|
((string-match "texi" ext)
|
|
'("doc"))
|
|
(t nil)))
|
|
)
|
|
(if (not dirs) (call-next-method)
|
|
(ede-emacs-find-in-directories name dir dirs))
|
|
))
|
|
|
|
(provide 'ede/emacs)
|
|
|
|
;; Local variables:
|
|
;; generated-autoload-file: "loaddefs.el"
|
|
;; generated-autoload-load-name: "ede/emacs"
|
|
;; End:
|
|
|
|
;;; ede/emacs.el ends here
|