
* 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.
95 lines
3.3 KiB
EmacsLisp
95 lines
3.3 KiB
EmacsLisp
;;; ede/srecode.el --- EDE utilities on top of SRecoder
|
|
|
|
;; Copyright (C) 2008, 2009, 2010 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:
|
|
;;
|
|
;; EDE utilities for using SRecode to generate project files, such as
|
|
;; Makefiles.
|
|
|
|
(require 'srecode)
|
|
|
|
(declare-function srecode-create-dictionary "srecode/dictionary")
|
|
(declare-function srecode-dictionary-set-value "srecode/dictionary")
|
|
(declare-function srecode-load-tables-for-mode "srecode/find")
|
|
(declare-function srecode-table "srecode/find")
|
|
(declare-function srecode-template-get-table "srecode/find")
|
|
(declare-function srecode-insert-fcn "srecode/insert")
|
|
(declare-function srecode-resolve-arguments "srecode/insert")
|
|
(declare-function srecode-map-update-map "srecode/map")
|
|
|
|
;;; Code:
|
|
(defun ede-srecode-setup ()
|
|
"Initialize Srecode for EDE."
|
|
(require 'srecode/map)
|
|
(require 'srecode/find)
|
|
(srecode-map-update-map t)
|
|
;; We don't call this unless we need it. Load in the templates.
|
|
(srecode-load-tables-for-mode 'makefile-mode)
|
|
(srecode-load-tables-for-mode 'makefile-mode 'ede)
|
|
(srecode-load-tables-for-mode 'autoconf-mode)
|
|
(srecode-load-tables-for-mode 'autoconf-mode 'ede))
|
|
|
|
(defmacro ede-srecode-insert-with-dictionary (template &rest forms)
|
|
"Insert TEMPLATE after executing FORMS with a dictionary.
|
|
TEMPLATE should specify a context by using a string format of:
|
|
context:templatename
|
|
Locally binds the variable DICT to a dictionary which can be
|
|
updated in FORMS."
|
|
`(let* ((dict (srecode-create-dictionary))
|
|
(temp (srecode-template-get-table (srecode-table)
|
|
,template
|
|
nil
|
|
'ede))
|
|
)
|
|
(when (not temp)
|
|
(error "EDE template %s for %s not found!"
|
|
,template major-mode))
|
|
(srecode-resolve-arguments temp dict)
|
|
|
|
;; Now execute forms for updating DICT.
|
|
(progn ,@forms)
|
|
|
|
(srecode-insert-fcn temp dict)
|
|
))
|
|
|
|
(defun ede-srecode-insert (template &rest dictionary-entries)
|
|
"Insert at the current point TEMPLATE.
|
|
TEMPLATE should specify a context by using a string format of:
|
|
context:templatename
|
|
Add DICTIONARY-ENTRIES into the dictionary before insertion.
|
|
Note: Just like `srecode-insert', but templates found in 'ede app."
|
|
(require 'srecode/insert)
|
|
(ede-srecode-insert-with-dictionary template
|
|
|
|
;; Add in optional dictionary entries.
|
|
(while dictionary-entries
|
|
(srecode-dictionary-set-value dict
|
|
(car dictionary-entries)
|
|
(car (cdr dictionary-entries)))
|
|
(setq dictionary-entries
|
|
(cdr (cdr dictionary-entries))))
|
|
|
|
))
|
|
|
|
(provide 'ede/srecode)
|
|
|
|
;; arch-tag: 75bec542-7cc8-41a4-b5a0-8fb247609f03
|
|
;;; ede/srecode.el ends here
|