2009-09-28 15:15:00 +00:00
|
|
|
|
;;; ede/proj.el --- EDE Generic Project file driver
|
2009-09-20 15:06:05 +00:00
|
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
|
;; Copyright (C) 1998-2003, 2007-2019 Free Software Foundation, Inc.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
|
|
|
|
|
;; Author: Eric M. Ludlam <zappo@gnu.org>
|
|
|
|
|
;; Keywords: project, make
|
|
|
|
|
|
|
|
|
|
;; 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
|
2017-09-13 15:52:52 -07:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
;;
|
|
|
|
|
;; EDE defines a method for managing a project. EDE-PROJ aims to be a
|
|
|
|
|
;; generic project file format based on the EIEIO object stream
|
|
|
|
|
;; methods. Changes in the project structure will require Makefile
|
|
|
|
|
;; rebuild. The targets provided in ede-proj can be augmented with
|
|
|
|
|
;; additional target types inherited directly from `ede-proj-target'.
|
|
|
|
|
|
|
|
|
|
(require 'ede/proj-comp)
|
|
|
|
|
(require 'ede/make)
|
|
|
|
|
|
|
|
|
|
(declare-function ede-proj-makefile-create "ede/pmake")
|
|
|
|
|
(declare-function ede-proj-configure-synchronize "ede/pconf")
|
|
|
|
|
|
|
|
|
|
(autoload 'ede-proj-target-aux "ede/proj-aux"
|
|
|
|
|
"Target class for a group of lisp files." nil nil)
|
|
|
|
|
(autoload 'ede-proj-target-elisp "ede/proj-elisp"
|
|
|
|
|
"Target class for a group of lisp files." nil nil)
|
|
|
|
|
(autoload 'ede-proj-target-elisp-autoloads "ede/proj-elisp"
|
|
|
|
|
"Target class for generating autoload files." nil nil)
|
|
|
|
|
(autoload 'ede-proj-target-scheme "ede/proj-scheme"
|
|
|
|
|
"Target class for a group of lisp files." nil nil)
|
|
|
|
|
(autoload 'ede-proj-target-makefile-miscelaneous "ede/proj-misc"
|
2009-09-30 07:59:42 +00:00
|
|
|
|
"Target class for a group of miscellaneous w/ a special makefile." nil nil)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(autoload 'ede-proj-target-makefile-program "ede/proj-prog"
|
|
|
|
|
"Target class for building a program." nil nil)
|
|
|
|
|
(autoload 'ede-proj-target-makefile-archive "ede/proj-archive"
|
|
|
|
|
"Target class for building an archive of object code." nil nil)
|
|
|
|
|
(autoload 'ede-proj-target-makefile-shared-object "ede/proj-shared"
|
|
|
|
|
"Target class for building a shared object." nil nil)
|
|
|
|
|
(autoload 'ede-proj-target-makefile-info "ede/proj-info"
|
|
|
|
|
"Target class for info files." nil nil)
|
|
|
|
|
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(eieio-defclass-autoload 'ede-proj-target-aux '(ede-proj-target)
|
|
|
|
|
"ede/proj-aux"
|
|
|
|
|
"Target class for a group of lisp files.")
|
|
|
|
|
(eieio-defclass-autoload 'ede-proj-target-elisp '(ede-proj-target-makefile)
|
|
|
|
|
"ede/proj-elisp"
|
|
|
|
|
"Target class for a group of lisp files.")
|
|
|
|
|
(eieio-defclass-autoload 'ede-proj-target-elisp-autoloads '(ede-proj-target-elisp)
|
|
|
|
|
"ede/proj-elisp"
|
|
|
|
|
"Target class for generating autoload files.")
|
|
|
|
|
(eieio-defclass-autoload 'ede-proj-target-scheme '(ede-proj-target)
|
|
|
|
|
"ede/proj-scheme"
|
|
|
|
|
"Target class for a group of lisp files.")
|
|
|
|
|
(eieio-defclass-autoload 'ede-proj-target-makefile-miscelaneous '(ede-proj-target-makefile)
|
|
|
|
|
"ede/proj-misc"
|
|
|
|
|
"Target class for a group of miscellaneous w/ a special makefile.")
|
|
|
|
|
(eieio-defclass-autoload 'ede-proj-target-makefile-program '(ede-proj-target-makefile-objectcode)
|
|
|
|
|
"ede/proj-prog"
|
|
|
|
|
"Target class for building a program.")
|
|
|
|
|
(eieio-defclass-autoload 'ede-proj-target-makefile-archive '(ede-proj-target-makefile-objectcode)
|
|
|
|
|
"ede/proj-archive"
|
|
|
|
|
"Target class for building an archive of object code.")
|
|
|
|
|
(eieio-defclass-autoload 'ede-proj-target-makefile-shared-object '(ede-proj-target-makefile-program)
|
|
|
|
|
"ede/proj-shared"
|
|
|
|
|
"Target class for building a shared object.")
|
|
|
|
|
(eieio-defclass-autoload 'ede-proj-target-makefile-info '(ede-proj-target-makefile)
|
|
|
|
|
"ede/proj-info"
|
|
|
|
|
"Target class for info files.")
|
|
|
|
|
|
|
|
|
|
;; Not in ede/ , but part of semantic.
|
|
|
|
|
(eieio-defclass-autoload 'semantic-ede-proj-target-grammar '(ede-proj-target-elisp)
|
|
|
|
|
"semantic/ede-grammar"
|
|
|
|
|
"Target classfor Semantic grammar files.")
|
|
|
|
|
|
2009-09-20 15:06:05 +00:00
|
|
|
|
;;; Class Definitions:
|
|
|
|
|
(defclass ede-proj-target (ede-target)
|
|
|
|
|
((auxsource :initarg :auxsource
|
|
|
|
|
:initform nil
|
|
|
|
|
:type list
|
|
|
|
|
:custom (repeat (string :tag "File"))
|
|
|
|
|
:label "Auxiliary Source Files"
|
|
|
|
|
:group (default source)
|
2009-10-01 04:10:10 +00:00
|
|
|
|
:documentation "Auxiliary source files included in this target.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
Each of these is considered equivalent to a source file, but it is not
|
|
|
|
|
distributed, and each should have a corresponding rule to build it.")
|
|
|
|
|
(dirty :initform nil
|
|
|
|
|
:type boolean
|
|
|
|
|
:documentation "Non-nil when generated files needs updating.")
|
|
|
|
|
(compiler :initarg :compiler
|
|
|
|
|
:initform nil
|
|
|
|
|
:type (or null symbol)
|
|
|
|
|
:custom (choice (const :tag "None" nil)
|
Merge from CEDET upstream (8564).
* lisp/emacs-lisp:
* emacs-lisp/eieio.el (eieio--defalias, eieio-hook)
(eieio-error-unsupported-class-tags, eieio-skip-typecheck)
(eieio-optimize-primary-methods-flag, eieio-initializing-object)
(eieio-unbound, eieio-default-superclass)
(eieio--define-field-accessors, method-static, method-before)
(method-primary, method-after, method-num-lists)
(method-generic-before, method-generic-primary)
(method-generic-after, method-num-slots)
(eieio-specialized-key-to-generic-key)
(eieio--check-type, class-v, class-p)
(eieio-class-name, define-obsolete-function-alias)
(eieio-class-parents-fast, eieio-class-children-fast)
(same-class-fast-p, class-constructor, generic-p)
(generic-primary-only-p, generic-primary-only-one-p)
(class-option-assoc, class-option, eieio-object-p)
(class-abstract-p, class-method-invocation-order)
(eieio-defclass-autoload-map, eieio-defclass-autoload)
(eieio-class-un-autoload, eieio-defclass)
(eieio-eval-default-p, eieio-perform-slot-validation-for-default)
(eieio-add-new-slot, eieio-copy-parents-into-subclass)
(eieio--defgeneric-init-form, eieio-defgeneric-form)
(eieio-defgeneric-reset-generic-form)
(eieio-defgeneric-form-primary-only)
(eieio-defgeneric-reset-generic-form-primary-only)
(eieio-defgeneric-form-primary-only-one)
(eieio-defgeneric-reset-generic-form-primary-only-one)
(eieio-unbind-method-implementations)
(eieio--defmethod, eieio--typep)
(eieio-perform-slot-validation, eieio-validate-slot-value)
(eieio-validate-class-slot-value, eieio-barf-if-slot-unbound)
(eieio-oref, eieio-oref-default, eieio-default-eval-maybe)
(eieio-oset, eieio-oset-default, eieio-slot-originating-class-p)
(eieio-slot-name-index, eieio-class-slot-name-index)
(eieio-set-defaults, eieio-initarg-to-attribute)
(eieio-attribute-to-initarg, eieio-c3-candidate)
(eieio-c3-merge-lists, eieio-class-precedence-c3)
(eieio-class-precedence-dfs, eieio-class-precedence-bfs)
(eieio-class-precedence-list, eieio-generic-call-methodname)
(eieio-generic-call-arglst, eieio-generic-call-key)
(eieio-generic-call-next-method-list)
(eieio-pre-method-execution-functions, eieio-generic-call)
(eieio-generic-call-primary-only, eieiomt-method-list)
(eieiomt-optimizing-obarray, eieiomt-install)
(eieiomt-add, eieiomt-next, eieiomt-sym-optimize)
(eieio-generic-form, eieio-defmethod, make-obsolete)
(eieio-defgeneric, make-obsolete): Moved to eieio-core.el
(defclass): Remove `eval-and-compile' from macro.
(call-next-method, shared-initialize): Instead of using
`scoped-class' variable, use new eieio--scoped-class, and
eieio--with-scoped-class.
(initialize-instance): Rename local variable 'scoped-class' to
'this-class' to remove ambiguitity from old global.
* emacs-lisp/eieio-core.el: New file. Derived from key parts of
eieio.el.
(eieio--scoped-class-stack): New variable
(eieio--scoped-class): New fcn
(eieio--with-scoped-class): New scoping macro.
(eieio-defclass): Use pushnew instead of add-to-list.
(eieio-defgeneric-form-primary-only-one, eieio-oset-default)
(eieio-slot-name-index, eieio-set-defaults, eieio-generic-call)
(eieio-generic-call-primary-only, eieiomt-add): Instead of using
`scoped-class' variable, use new eieio--scoped-class, and
eieio--with-scoped-class.
* emacs-lisp/eieio-base.el (cl-lib): Require during compile.
* admin/grammars:
* grammars/srecode-template.wy (variable): Accept a single number
as a variable value. Allows the 'priority' to be set to a number.
(wisent-srecode-template-lexer): Move number up so it can be
created.
* etc/srecode:
* srecode/c.srt (header_guard): Add :c parameter so it works
standalone
* lisp/cedet:
* semantic/edit.el (semantic-change-function): Use
`save-match-data' around running hooks.
* semantic/decorate/mode.el
(semantic-decorate-style-predicate-default)
(semantic-decorate-style-highlighter-default): New.
(semantic-decoration-mode): Do not require
`semantic/decorate/include' anymore.
(semantic-toggle-decoration-style): Error if an unknown decoration
style is toggled.
(define-semantic-decoration-style): Add new :load option. When
:load is specified, add autoload tokens for the definition
functions so that code is loaded when the mode is used.
(semantic-decoration-on-includes): New autoload definition for
highlighting includes.
* semantic/bovine/c.el (semantic-lex-c-ifdef): Allow some misc
characters to appear after the tested variable.
* semantic/ede-grammar.el (project-compile-target): Calculate full
src name via ede-expand-filename instead of the crutch of the
current buffer. Enables this target to compile in batch mode.
* semantic/idle.el
(semantic-idle-symbol-maybe-highlight): Wrap highlighting of
remote symbol with `save-excursion'.
(semantic-idle-scheduler-work-parse-neighboring-files): Instead of
using directory-files on each found mode pattern, collect all the
patterns for the current mode, and then for each file, see if it
matches any of them. If it does, parse the file. (Patch
inspiration from Tomasz Gajewski.)
* semantic/ctxt.el (semantic-ctxt-end-of-symbol): New.
(semantic-ctxt-current-symbol-default): New.
* semantic/bovine/el.el (semantic-default-elisp-setup): Add
autoload cookie. Explain existence.
(footer): Add local variable for loaddefs.
* semantic/db.el (semanticdb-file-table-object): Add new filter,
only checking for regular files too.
* semantic/wisent/python.el
(semantic-format-tag-abbreviate): New override. Cuts back on size
of code tags.
* srecode/compile.el (srecode-compile-templates): Fix warning
punctuation. Remove status messages to clean up testing output
* ede/base.el (ede-project-placeholder-cache-file): Update doc to
mention 'nil' value.
(ede-save-cache): Disable cache save if file is nil.
* ede.el (ede-initialize-state-current-buffer): Flush deleted
projects.
(global-ede-mode): Always append our find-file-hook to the end.
(ede-flush-deleted-projects): New command.
* ede/cpp-root.el (ede-preprocessor-map): Protect against init
problems.
* ede/proj.el (ede-proj-target): Added a new "custom" option for
custom symbols representing a compiler or linker instead of
restricting things to only the predefined compilers and linkers.
* semantic.el (semantic-mode-map): To avoid showing showing
Development menu twice, only disable menu item if menu-bar is
actually enabled, otherwise the popup 'global menu' might display
a disabled Development menu.
* semantic/complete.el
(semantic-displayor-show-request): Fix which slot in obj is set to
the max tags.
2013-06-02 15:33:09 +02:00
|
|
|
|
(symbol :tag "Custom Compiler Symbol")
|
2009-09-20 15:06:05 +00:00
|
|
|
|
:slotofchoices availablecompilers)
|
|
|
|
|
:label "Compiler for building sources"
|
|
|
|
|
:group make
|
|
|
|
|
:documentation
|
|
|
|
|
"The compiler to be used to compile this object.
|
|
|
|
|
This should be a symbol, which contains the object defining the compiler.
|
|
|
|
|
This enables save/restore to do so by name, permitting the sharing
|
|
|
|
|
of these compiler resources, and global customization thereof.")
|
|
|
|
|
(linker :initarg :linker
|
|
|
|
|
:initform nil
|
|
|
|
|
:type (or null symbol)
|
|
|
|
|
:custom (choice (const :tag "None" nil)
|
Merge from CEDET upstream (8564).
* lisp/emacs-lisp:
* emacs-lisp/eieio.el (eieio--defalias, eieio-hook)
(eieio-error-unsupported-class-tags, eieio-skip-typecheck)
(eieio-optimize-primary-methods-flag, eieio-initializing-object)
(eieio-unbound, eieio-default-superclass)
(eieio--define-field-accessors, method-static, method-before)
(method-primary, method-after, method-num-lists)
(method-generic-before, method-generic-primary)
(method-generic-after, method-num-slots)
(eieio-specialized-key-to-generic-key)
(eieio--check-type, class-v, class-p)
(eieio-class-name, define-obsolete-function-alias)
(eieio-class-parents-fast, eieio-class-children-fast)
(same-class-fast-p, class-constructor, generic-p)
(generic-primary-only-p, generic-primary-only-one-p)
(class-option-assoc, class-option, eieio-object-p)
(class-abstract-p, class-method-invocation-order)
(eieio-defclass-autoload-map, eieio-defclass-autoload)
(eieio-class-un-autoload, eieio-defclass)
(eieio-eval-default-p, eieio-perform-slot-validation-for-default)
(eieio-add-new-slot, eieio-copy-parents-into-subclass)
(eieio--defgeneric-init-form, eieio-defgeneric-form)
(eieio-defgeneric-reset-generic-form)
(eieio-defgeneric-form-primary-only)
(eieio-defgeneric-reset-generic-form-primary-only)
(eieio-defgeneric-form-primary-only-one)
(eieio-defgeneric-reset-generic-form-primary-only-one)
(eieio-unbind-method-implementations)
(eieio--defmethod, eieio--typep)
(eieio-perform-slot-validation, eieio-validate-slot-value)
(eieio-validate-class-slot-value, eieio-barf-if-slot-unbound)
(eieio-oref, eieio-oref-default, eieio-default-eval-maybe)
(eieio-oset, eieio-oset-default, eieio-slot-originating-class-p)
(eieio-slot-name-index, eieio-class-slot-name-index)
(eieio-set-defaults, eieio-initarg-to-attribute)
(eieio-attribute-to-initarg, eieio-c3-candidate)
(eieio-c3-merge-lists, eieio-class-precedence-c3)
(eieio-class-precedence-dfs, eieio-class-precedence-bfs)
(eieio-class-precedence-list, eieio-generic-call-methodname)
(eieio-generic-call-arglst, eieio-generic-call-key)
(eieio-generic-call-next-method-list)
(eieio-pre-method-execution-functions, eieio-generic-call)
(eieio-generic-call-primary-only, eieiomt-method-list)
(eieiomt-optimizing-obarray, eieiomt-install)
(eieiomt-add, eieiomt-next, eieiomt-sym-optimize)
(eieio-generic-form, eieio-defmethod, make-obsolete)
(eieio-defgeneric, make-obsolete): Moved to eieio-core.el
(defclass): Remove `eval-and-compile' from macro.
(call-next-method, shared-initialize): Instead of using
`scoped-class' variable, use new eieio--scoped-class, and
eieio--with-scoped-class.
(initialize-instance): Rename local variable 'scoped-class' to
'this-class' to remove ambiguitity from old global.
* emacs-lisp/eieio-core.el: New file. Derived from key parts of
eieio.el.
(eieio--scoped-class-stack): New variable
(eieio--scoped-class): New fcn
(eieio--with-scoped-class): New scoping macro.
(eieio-defclass): Use pushnew instead of add-to-list.
(eieio-defgeneric-form-primary-only-one, eieio-oset-default)
(eieio-slot-name-index, eieio-set-defaults, eieio-generic-call)
(eieio-generic-call-primary-only, eieiomt-add): Instead of using
`scoped-class' variable, use new eieio--scoped-class, and
eieio--with-scoped-class.
* emacs-lisp/eieio-base.el (cl-lib): Require during compile.
* admin/grammars:
* grammars/srecode-template.wy (variable): Accept a single number
as a variable value. Allows the 'priority' to be set to a number.
(wisent-srecode-template-lexer): Move number up so it can be
created.
* etc/srecode:
* srecode/c.srt (header_guard): Add :c parameter so it works
standalone
* lisp/cedet:
* semantic/edit.el (semantic-change-function): Use
`save-match-data' around running hooks.
* semantic/decorate/mode.el
(semantic-decorate-style-predicate-default)
(semantic-decorate-style-highlighter-default): New.
(semantic-decoration-mode): Do not require
`semantic/decorate/include' anymore.
(semantic-toggle-decoration-style): Error if an unknown decoration
style is toggled.
(define-semantic-decoration-style): Add new :load option. When
:load is specified, add autoload tokens for the definition
functions so that code is loaded when the mode is used.
(semantic-decoration-on-includes): New autoload definition for
highlighting includes.
* semantic/bovine/c.el (semantic-lex-c-ifdef): Allow some misc
characters to appear after the tested variable.
* semantic/ede-grammar.el (project-compile-target): Calculate full
src name via ede-expand-filename instead of the crutch of the
current buffer. Enables this target to compile in batch mode.
* semantic/idle.el
(semantic-idle-symbol-maybe-highlight): Wrap highlighting of
remote symbol with `save-excursion'.
(semantic-idle-scheduler-work-parse-neighboring-files): Instead of
using directory-files on each found mode pattern, collect all the
patterns for the current mode, and then for each file, see if it
matches any of them. If it does, parse the file. (Patch
inspiration from Tomasz Gajewski.)
* semantic/ctxt.el (semantic-ctxt-end-of-symbol): New.
(semantic-ctxt-current-symbol-default): New.
* semantic/bovine/el.el (semantic-default-elisp-setup): Add
autoload cookie. Explain existence.
(footer): Add local variable for loaddefs.
* semantic/db.el (semanticdb-file-table-object): Add new filter,
only checking for regular files too.
* semantic/wisent/python.el
(semantic-format-tag-abbreviate): New override. Cuts back on size
of code tags.
* srecode/compile.el (srecode-compile-templates): Fix warning
punctuation. Remove status messages to clean up testing output
* ede/base.el (ede-project-placeholder-cache-file): Update doc to
mention 'nil' value.
(ede-save-cache): Disable cache save if file is nil.
* ede.el (ede-initialize-state-current-buffer): Flush deleted
projects.
(global-ede-mode): Always append our find-file-hook to the end.
(ede-flush-deleted-projects): New command.
* ede/cpp-root.el (ede-preprocessor-map): Protect against init
problems.
* ede/proj.el (ede-proj-target): Added a new "custom" option for
custom symbols representing a compiler or linker instead of
restricting things to only the predefined compilers and linkers.
* semantic.el (semantic-mode-map): To avoid showing showing
Development menu twice, only disable menu item if menu-bar is
actually enabled, otherwise the popup 'global menu' might display
a disabled Development menu.
* semantic/complete.el
(semantic-displayor-show-request): Fix which slot in obj is set to
the max tags.
2013-06-02 15:33:09 +02:00
|
|
|
|
(symbol :tag "Custom Linker Symbol")
|
2009-09-20 15:06:05 +00:00
|
|
|
|
:slotofchoices availablelinkers)
|
|
|
|
|
:label "Linker for combining intermediate object files."
|
|
|
|
|
:group make
|
|
|
|
|
:documentation
|
|
|
|
|
"The linker to be used to link compiled sources for this object.
|
|
|
|
|
This should be a symbol, which contains the object defining the linker.
|
|
|
|
|
This enables save/restore to do so by name, permitting the sharing
|
|
|
|
|
of these linker resources, and global customization thereof.")
|
|
|
|
|
;; Class allocated slots
|
|
|
|
|
(phony :allocation :class
|
|
|
|
|
:initform nil
|
|
|
|
|
:type boolean
|
|
|
|
|
:documentation
|
|
|
|
|
"A phony target is one where the build target does not relate to a file.
|
|
|
|
|
Such targets are always built, but make knows how to deal with them..")
|
|
|
|
|
(availablecompilers :allocation :class
|
|
|
|
|
:initform nil
|
|
|
|
|
:type (or null list)
|
|
|
|
|
:documentation
|
|
|
|
|
"A list of `ede-compiler' objects.
|
|
|
|
|
These are the compilers the user can choose from when setting the
|
|
|
|
|
`compiler' slot.")
|
|
|
|
|
(availablelinkers :allocation :class
|
|
|
|
|
:initform nil
|
|
|
|
|
:type (or null list)
|
|
|
|
|
:documentation
|
|
|
|
|
"A list of `ede-linker' objects.
|
|
|
|
|
These are the linkers the user can choose from when setting the
|
|
|
|
|
`linker' slot.")
|
|
|
|
|
)
|
|
|
|
|
"Abstract class for ede-proj targets.")
|
|
|
|
|
|
|
|
|
|
(defclass ede-proj-target-makefile (ede-proj-target)
|
|
|
|
|
((makefile :initarg :makefile
|
|
|
|
|
:initform "Makefile"
|
|
|
|
|
:type string
|
|
|
|
|
:custom string
|
|
|
|
|
:label "Parent Makefile"
|
|
|
|
|
:group make
|
|
|
|
|
:documentation "File name of generated Makefile.")
|
|
|
|
|
(partofall :initarg :partofall
|
|
|
|
|
:initform t
|
|
|
|
|
:type boolean
|
|
|
|
|
:custom boolean
|
2015-08-02 08:27:13 -07:00
|
|
|
|
:label "Part of all: target"
|
2009-09-20 15:06:05 +00:00
|
|
|
|
:group make
|
|
|
|
|
:documentation
|
2015-08-02 08:27:13 -07:00
|
|
|
|
"Non nil means the rule created is part of the all: target.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
Setting this to nil creates the rule to build this item, but does not
|
2015-08-02 08:27:13 -07:00
|
|
|
|
include it in the all: rule.")
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(configuration-variables
|
|
|
|
|
:initarg :configuration-variables
|
|
|
|
|
:initform nil
|
|
|
|
|
:type list
|
|
|
|
|
:custom (repeat (cons (string :tag "Configuration")
|
|
|
|
|
(repeat
|
|
|
|
|
(cons (string :tag "Name")
|
|
|
|
|
(string :tag "Value")))))
|
|
|
|
|
:label "Environment Variables for configurations"
|
|
|
|
|
:group make
|
|
|
|
|
:documentation "Makefile variables appended to use in different configurations.
|
|
|
|
|
These variables are used in the makefile when a configuration becomes active.
|
|
|
|
|
Target variables are always renamed such as foo_CFLAGS, then included into
|
|
|
|
|
commands where the variable would usually appear.")
|
|
|
|
|
(rules :initarg :rules
|
|
|
|
|
:initform nil
|
|
|
|
|
:type list
|
|
|
|
|
:custom (repeat (object :objecttype ede-makefile-rule))
|
|
|
|
|
:label "Additional Rules"
|
|
|
|
|
:group (make)
|
|
|
|
|
:documentation
|
|
|
|
|
"Arbitrary rules and dependencies needed to make this target.
|
|
|
|
|
It is safe to leave this blank.")
|
|
|
|
|
)
|
|
|
|
|
"Abstract class for Makefile based targets.")
|
|
|
|
|
|
|
|
|
|
(defvar ede-proj-target-alist
|
|
|
|
|
'(("program" . ede-proj-target-makefile-program)
|
|
|
|
|
("archive" . ede-proj-target-makefile-archive)
|
|
|
|
|
("sharedobject" . ede-proj-target-makefile-shared-object)
|
|
|
|
|
("emacs lisp" . ede-proj-target-elisp)
|
|
|
|
|
("emacs lisp autoloads" . ede-proj-target-elisp-autoloads)
|
|
|
|
|
("info" . ede-proj-target-makefile-info)
|
|
|
|
|
("auxiliary" . ede-proj-target-aux)
|
|
|
|
|
("scheme" . ede-proj-target-scheme)
|
|
|
|
|
("miscellaneous" . ede-proj-target-makefile-miscelaneous)
|
|
|
|
|
)
|
|
|
|
|
"Alist of names to class types for available project target classes.")
|
|
|
|
|
|
|
|
|
|
(defun ede-proj-register-target (name class)
|
|
|
|
|
"Register a new target class with NAME and class symbol CLASS.
|
|
|
|
|
This enables the creation of your target type."
|
|
|
|
|
(let ((a (assoc name ede-proj-target-alist)))
|
|
|
|
|
(if a
|
|
|
|
|
(setcdr a class)
|
|
|
|
|
(setq ede-proj-target-alist
|
|
|
|
|
(cons (cons name class) ede-proj-target-alist)))))
|
|
|
|
|
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(defclass ede-proj-project (eieio-persistent ede-project)
|
|
|
|
|
((extension :initform ".ede")
|
|
|
|
|
(file-header-line :initform ";; EDE Project Files are auto generated: Do Not Edit")
|
|
|
|
|
(makefile-type :initarg :makefile-type
|
2009-09-20 15:06:05 +00:00
|
|
|
|
:initform Makefile
|
|
|
|
|
:type symbol
|
|
|
|
|
:custom (choice (const Makefile)
|
|
|
|
|
;(const Makefile.in)
|
|
|
|
|
(const Makefile.am)
|
|
|
|
|
;(const cook)
|
|
|
|
|
)
|
|
|
|
|
:documentation "The type of Makefile to generate.
|
|
|
|
|
Can be one of 'Makefile, 'Makefile.in, or 'Makefile.am.
|
|
|
|
|
If this value is NOT 'Makefile, then that overrides the :makefile slot
|
|
|
|
|
in targets.")
|
|
|
|
|
(variables :initarg :variables
|
|
|
|
|
:initform nil
|
|
|
|
|
:type list
|
|
|
|
|
:custom (repeat (cons (string :tag "Name")
|
|
|
|
|
(string :tag "Value")))
|
|
|
|
|
:group (settings)
|
|
|
|
|
:documentation "Variables to set in this Makefile.")
|
|
|
|
|
(configuration-variables
|
|
|
|
|
:initarg :configuration-variables
|
|
|
|
|
:initform ("debug" (("DEBUG" . "1")))
|
|
|
|
|
:type list
|
|
|
|
|
:custom (repeat (cons (string :tag "Configuration")
|
|
|
|
|
(repeat
|
|
|
|
|
(cons (string :tag "Name")
|
|
|
|
|
(string :tag "Value")))))
|
|
|
|
|
:group (settings)
|
|
|
|
|
:documentation "Makefile variables to use in different configurations.
|
|
|
|
|
These variables are used in the makefile when a configuration becomes active.")
|
|
|
|
|
(inference-rules :initarg :inference-rules
|
|
|
|
|
:initform nil
|
|
|
|
|
:custom (repeat
|
|
|
|
|
(object :objecttype ede-makefile-rule))
|
|
|
|
|
:documentation "Inference rules to add to the makefile.")
|
|
|
|
|
(include-file :initarg :include-file
|
|
|
|
|
:initform nil
|
|
|
|
|
:custom (repeat
|
|
|
|
|
(string :tag "Include File"))
|
|
|
|
|
:documentation "Additional files to include.
|
|
|
|
|
These files can contain additional rules, variables, and customizations.")
|
|
|
|
|
(automatic-dependencies
|
|
|
|
|
:initarg :automatic-dependencies
|
|
|
|
|
:initform t
|
|
|
|
|
:type boolean
|
|
|
|
|
:custom boolean
|
|
|
|
|
:group (default settings)
|
|
|
|
|
:documentation
|
|
|
|
|
"Non-nil to do implement automatic dependencies in the Makefile.")
|
|
|
|
|
(menu :initform
|
|
|
|
|
(
|
|
|
|
|
[ "Regenerate Makefiles" ede-proj-regenerate t ]
|
|
|
|
|
[ "Upload Distribution" ede-upload-distribution t ]
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
(metasubproject
|
|
|
|
|
:initarg :metasubproject
|
|
|
|
|
:initform nil
|
|
|
|
|
:type boolean
|
|
|
|
|
:custom boolean
|
|
|
|
|
:group (default settings)
|
|
|
|
|
:documentation
|
|
|
|
|
"Non-nil if this is a metasubproject.
|
|
|
|
|
Usually, a subproject is determined by a parent project. If multiple top level
|
|
|
|
|
projects are grouped into a large project not maintained by EDE, then you need
|
|
|
|
|
to set this to non-nil. The only effect is that the `dist' rule will then avoid
|
|
|
|
|
making a tar file.")
|
|
|
|
|
)
|
|
|
|
|
"The EDE-PROJ project definition class.")
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
(defun ede-proj-load (project &optional rootproj)
|
|
|
|
|
"Load a project file from PROJECT directory.
|
|
|
|
|
If optional ROOTPROJ is provided then ROOTPROJ is the root project
|
|
|
|
|
for the tree being read in. If ROOTPROJ is nil, then assume that
|
|
|
|
|
the PROJECT being read in is the root project."
|
|
|
|
|
(save-excursion
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(let ((ret (eieio-persistent-read (concat project "Project.ede")
|
2015-01-07 23:11:58 -05:00
|
|
|
|
'ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(subdirs (directory-files project nil "[^.].*" nil)))
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(if (not (object-of-class-p ret 'ede-proj-project))
|
|
|
|
|
(error "Corrupt project file"))
|
|
|
|
|
(oset ret directory project)
|
|
|
|
|
(oset ret rootproject rootproj)
|
|
|
|
|
|
|
|
|
|
;; Load the project file of each subdirectory containing a
|
|
|
|
|
;; loadable Project.ede.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(while subdirs
|
|
|
|
|
(let ((sd (file-name-as-directory
|
|
|
|
|
(expand-file-name (car subdirs) project))))
|
|
|
|
|
(if (and (file-directory-p sd)
|
Update from CEDET trunk.
* grammars/c.by (template-type): Add :template-specifier and
:typevar to capture extra details about the template.
(opt-post-fcn-modifiers): Splice in the found symbol into the
return value correctly.
(QUESTION): New punctuation.
(expression): Add ternary conditional support.
* grammars/scheme.by (MODULE): New token.
(scheme): Handle expanding the MODULE tag.
(scheme-list): Remove closeparen required match.
(scheme-in-list): Remove extraneous matches for DEFINE. Add
support for MODULE Simplify matching for code & make work.
(name-args, name-arg-list, name-arg-expand): Make it work.
* semantic.el (semantic-mode): Add/remove 3
completion-at-point-functions.
(semantic-completion-at-point-function): Removed.
(semantic-analyze-completion-at-point-function)
(semantic-analyze-notc-completion-at-point-function)
(semantic-analyze-nolongprefix-completion-at-point-function): New
completion at point functions.
* semantic/doc.el (semantic-doc-snarf-comment-for-tag): Fix case
when comment-end is empty string.
* semantic/debug.el
(semantic-debug-parser-debugger-source): New buffer local
variable.
(semantic-debug-interface): Add 'nil' initform to overlays.
(semantic-debug-mode): Remove read-only tags from buffers on exit.
(semantic-debug): Add autoload cookie. Force the language
specific debugger to load.
* semantic/db.el (generic::semanticdb-full-filename): New generic
method to allow this method to be used on buffer names via an
associated database.
* semantic/symref.el
(semantic-symref-cleanup-recent-buffers-fcn): When cleaning up
buffers, don't clean up buffers that are being used (i.e., in a
window) when the hook fires.
(semantic-symref-recently-opened-buffers): New tracking variable.
(semantic-symref-cleanup-recent-buffers-fcn): New hook fcn.
(semantic-symref-result-get-tags): Move logic into
`semantic-symref-hit-to-tag-via-buffer', and cleanup buffers via
the symref cleanup function in post-command-hook.
(semantic-symref-hit-to-tag-via-buffer): Logic that used to be
from above.
(semantic-symref-hit-to-tag-via-db): New.
* semantic/analyze.el:
(semantic-analyze-find-tag-sequence-default): If first entry in
sequence is the only one, apply tagclass filter.
(semantic-analyze-princ-sequence): Show slot even if empty.
(semantic-analyze-find-tag-sequence)
(semantic-analyze-find-tag-sequence-default): Add flags argument.
Add support for forcing the final entry of the sequence to be of
class variable.
(semantic-analyze-find-tag): Fix bug where input class filter was
ignored if there was a typecache match.
(semantic-analyze-current-context-default): For assignments, the
assignee now must be of class variable.
* semantic/analyze/complete.el
(semantic-analyze-possible-completions-default): Add
'no-longprefix' flag. When used, the prefix and prefixtypes are
shortened to just the last symbol.
* semantic/bovine/c.el (semantic-c-do-lex-if): Catch errors from
'hideif', and push to the parser warning stack.
(semantic-lex-cpp-define): When a comment is at the end of a
macro, do not subtract an extra 1 from the found position. Fixes
bug with: #define foo (a)/**/ adding an extra ')' to the stream.
* semantic/bovine/scm.el (semantic-lex-scheme-symbol): Allow
symbols to be one char long.
* semantic/bovine/grammar.el
(bovine-grammar-calculate-source-on-path): New.
(bovine-grammar-setupcode-builder): Use it.
* ede.el (ede/detect): New require.
(ede-version): Bump version
(ede-initialize-state-current-buffer): Use new
`ede-detect-directory-for-project' to detect projects first
instead of depending on currente dir only.
(ede-delete-project-from-global-list): New.
(ede-flush-deleted-projects): Use above.
(ede-check-project-query-fcn): New variable
(ede-check-project-directory): Use above when querying the user.
Added to support unit testing of this security measure.
(ede-initialize-state-current-buffer): Use
`ede-directory-project-cons' instead of the -detect- fcn to take
advantage of the cache. Pass found project into
`ede-load-project-file'.
(ede-load-project-file): Add new input DETECTIN.
(ede-rescan-toplevel): Get the proj root a better way.
(ede-load-project-file): Return the loaded object. When asking
for existing project, ask for an exact match.
(ede-initialize-state-current-buffer): Simplify some conditional
logic.
(ede-load-project-file): Simplify conditional logic.
(ede-global-list-sanity-check): New Testing fcn.
(ede-parent-project): Replace old code with call to faster
`ede-find-subproject-for-directory'.
(ede-load-project-file): Use
`ede-directory-get-toplevel-open-project' instead of above
deleted. Rename "pfc" to "autoloader". Use
`ede-directory-project-cons' to detect a project. Delete no
project found case where we search up the tree.
* ede/auto.el (ede-project-autoload): Fix doc typo. Add
`:root-only' slot.
(ede-auto-load-project): Doc update: warn to not use.
(ede-dir-to-projectfile): Deleted.
(ede-project-autoload-dirmatch): Add subdir-only slot. Make
configdatastash unbound by default.
(ede-do-dirmatch): If subdir-only is true, then don't allow exact
matches. Account for configdatastash as unbound. Assume value of
nil means no tool installed. Make sure loaded path matches from
beginning. Stash the regexp, not the raw string.
(ede-project-class-files): Note that makefile and automake are not
root only.
(ede-auto-detect-in-dir): New (for use with `ede/detect.el').
(ede-project-dirmatch-p): Deleted.
(ede-project-root-directory): Remove body, return nil.
(ede-project-autoload): :proj-root-dirmatch can be null & doc fix.
(ede-auto-detect-in-dir): If there is no :proj-file, check for a
dirmatch.
* ede/generic.el (ede/config): Replace require of ede.
(ede-generic-new-autoloader): Generic projects are now safe by
default. Note this is NOT a root only project.
(project-rescan, ede-project-root, ede-generic-target-java)
(ede-java-classpath, ede-find-subproject-for-directory): New.
(ede-enable-generic-projects): Add new autoloaders for git, bzr,
hg, sv, CVS.
(ede-generic-vc-project)
(ede-generic-vc-project::ede-generic-setup-configuration): New.
(ede-generic-config): Remove slots: c-include-path,
c-preprocessor-table, c-preprocessor-files, classpath,
build-command, debug-command, run command. Inherit from
ede-extra-config-build, ede-extra-config-program. Make
run-command :value match :custom so only strings are accepted.
Add some more :group slot specifiers.
(ede-generic-project): Add mixins `ede-project-with-config-c' and
`ede-project-with-config-java'. Inherit from
`ede-project-with-config-build',
`ede-project-with-config-program'. Subclass
`ede-project-with-config'. Remove duplication from new baseclass.
(ede-generic-target): Inherit from `ede-target-with-config-build',
`ede-target-with-config-program'. Subclass `ede-target-with-config'.
(ede-generic-target-c-cpp): Add mixin `ede-target-with-config-c'.
(ede-generic-target-java): Add mixin `ede-target-with-config-java'.
(ede-preprocessor-map, ede-system-include-path)
(edejava-classpath): Deleted, moved to config.el.
(project-compile-project, project-compile-target)
(project-debug-target, project-run-target): Deleted.
(ede-generic-get-configuration, ede-generic-setup-configuration)
(ede-commit-project, project-rescan)
(ede-generic-project::ede-customize)
(ede-generic-target::ede-customize)
(ede-generic-config::eieio-done-customizing)
(ede-generic-config::ede-commit): Deleted. Subsumed by new
baseclass.
(ede-preprocessor-map, ede-system-include-path)
(project-debug-target, project-run-target): Call new
`ede-config-get-configuration' instead of old version.
(ede-generic-load): Do not add to global list here.
* ede/files.el (ede-find-project-root)
(ede-files-find-existing)
(ede-directory-get-toplevel-open-project-new): Deleted.
(ede-project-root-directory): Use `ede-project-root' first.
(ede-project-directory-remove-hash)
(ede--directory-project-from-hash)
(ede--directory-project-add-description-to-hash): Rename to make
internal symbols (via --). Expand input dir first.
(ede-directory-project-p): Doc fix (note obsoleted.)
(ede-toplevel-project-or-nil): Alias to `ede-toplevel-project'.
(ede-toplevel-project): Doc Fix. Delete commented out old code.
Simplify returning result from ede-detect-directory-for-project.
(ede-directory-get-open-project): Support when
inodes are disabled. If disabled to str compare on root project.
(ede-directory-get-toplevel-open-project): Enabled nested
projects. When doing directory name matching, save the 'short'
version of an answer (non-exact match) and eventually select the
shortest answer at the end. Expand the filename of tested
projects. Better support for when inodes are disabled. Add
'exact' option so that it will return a project that is an exact
match.
(ede-find-subproject-for-directory): Small optimization to run
`file-truename' less often.
(ede-directory-project-p): Move content, then use
`ede-directory-project-cons'. Use
`ede-detect-directory-for-project', replacing old detection loop.
(ede-directory-project-cons): New, from above.
(ede-toplevel-project): Toss old scanning code. Use
`ede-detect-directory-for-project' instead.
(ede-directory-get-toplevel-open-project-new): New.
* ede/linux.el (ede-linux-project-root): Deleted.
(ede-project-autoload): Remove dirmatch entry - it is no longer
needed.
* lisp/cedet/ede/proj.el (project-rescan): Replace direct
manipulation of `ede-projects' with equivalent and better
functions.
(ede-proj-load): Replace call to test if dir has project to
explicity ask filesystem if Project.ede is there.
* ede/config.el:
* ede/detect.el: New files.
* ede/project-am.el (project-run-target): Add "./" to program to
run for systems where '.' isn't in PATH.
(project-am-load): Remove old code regarding `ede-constructing'.
Just read in the makefiles.
* ede/linux.el (ede-linux-load): Do not add to global list here.
Don't check for existing anymore.
(project-rescan): New.
(ede-linux-project-list, ede-linux-file-existing): Deleted.
(ede-linux-project-root): Delete body. Need symbol for autoloads
for now.
(ede-linux-project): No longer instance tracker.
(ede-project-autoload): Don't provide :proj-root
* ede/emacs.el (ede-emacs-load): Do not add project to global list
here. Don't look for existing first.
(ede-project-autoload): Remove dirmatch entry - it is no longer
needed. Don't provide proj-root anymore.
(ede-emacs-project-list, ede-emacs-file-existing): Delete.
(ede-emacs-project-root): Remove body (need symbol for loaddefs
still).
(ede-emacs-project): Do not instance track anymore.
* ede/cpp-root.el (initialize-instance): Remove commented code.
Add note about why we are adding the project to the master list.
Make sure if we are replacing a prev version, remove from global
list.
(ede-cpp-root-file-existing)
(ede-cpp-root-project-file-for-dir)
(ede-cpp-root-count, ede-cpp-root-project-root, ede-cpp-root-load)
(ede-project-autoload cpp-root): Deleted.
(ede-project-root-directory): Return :directory instead of
calculating from :file.
(project-rescan): New.
* ede/base.el (ede-toplevel): Only use buffer cached value if
subproj not passed in.
* srecode/java.el (srecode-semantic-handle-:java): Fix case when
an EDE project didn't support java paths.
* lisp/cedet/ede/proj-elisp.el
(ede-proj-target-elisp::ede-proj-tweak-autoconf): Kill buffer
after saving modified elisp-comp script, as to avoid "file has
changed on disk; really edit the buffer" questions when script
gets rewritten.
* emacs-lisp/eieio-custom.el (eieio-customize-object): Set
eieio-cog (current group) to g, which is an improved form of input
group.
* srecode/doc-cpp.srt (mode): Set to c mode so this works with
both C and C++.
2014-11-10 01:04:30 +01:00
|
|
|
|
(file-exists-p (expand-file-name "Project.ede" sd)))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(oset ret subproj
|
|
|
|
|
(cons (ede-proj-load sd (or rootproj ret))
|
|
|
|
|
(oref ret subproj))))
|
|
|
|
|
(setq subdirs (cdr subdirs))))
|
|
|
|
|
ret)))
|
|
|
|
|
|
|
|
|
|
(defun ede-proj-save (&optional project)
|
|
|
|
|
"Write out object PROJECT into its file."
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (not project) (setq project (ede-current-project)))
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(let ((cdir (oref project directory)))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(unwind-protect
|
2012-10-02 02:10:29 +08:00
|
|
|
|
(progn
|
|
|
|
|
(slot-makeunbound project :directory)
|
|
|
|
|
(eieio-persistent-save project))
|
|
|
|
|
;; Restore the directory slot
|
|
|
|
|
(oset project directory cdir))) ))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-commit-local-variables ((proj ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Commit change to local variables in PROJ."
|
|
|
|
|
(ede-proj-save proj))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod eieio-done-customizing ((proj ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Call this when a user finishes customizing this object.
|
|
|
|
|
Argument PROJ is the project to save."
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-call-next-method)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(ede-proj-save proj))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod eieio-done-customizing ((target ede-proj-target))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Call this when a user finishes customizing this object.
|
|
|
|
|
Argument TARGET is the project we are completing customization on."
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-call-next-method)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(ede-proj-save (ede-current-project)))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-commit-project ((proj ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Commit any change to PROJ to its file."
|
|
|
|
|
(ede-proj-save proj))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-buffer-mine ((this ede-proj-project) buffer)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Return t if object THIS lays claim to the file in BUFFER."
|
|
|
|
|
(let ((f (ede-convert-path this (buffer-file-name buffer))))
|
|
|
|
|
(or (string= (file-name-nondirectory (oref this file)) f)
|
|
|
|
|
(string= (ede-proj-dist-makefile this) f)
|
|
|
|
|
(string-match "Makefile\\(\\.\\(in\\|am\\)\\)?$" f)
|
Synch EDE to CEDET 1.0.
* 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.
2010-09-20 22:42:53 -04:00
|
|
|
|
(string-match "config\\(ure\\.\\(in\\|ac\\)\\|\\.status\\)?$" f)
|
|
|
|
|
(string-match "config.h\\(\\.in\\)?" f)
|
|
|
|
|
(member f '("AUTHORS" "NEWS" "COPYING" "INSTALL" "README"))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
)))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-buffer-mine ((this ede-proj-target) buffer)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Return t if object THIS lays claim to the file in BUFFER."
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(or (cl-call-next-method)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(ede-target-buffer-in-sourcelist this buffer (oref this auxsource))))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; EDE command functions
|
|
|
|
|
;;
|
|
|
|
|
(defvar ede-proj-target-history nil
|
|
|
|
|
"History when querying for a target type.")
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-new-target ((this ede-proj-project)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
&optional name type autoadd)
|
|
|
|
|
"Create a new target in THIS based on the current buffer."
|
|
|
|
|
(let* ((name (or name (read-string "Name: " "")))
|
|
|
|
|
(type (or type
|
|
|
|
|
(completing-read "Type: " ede-proj-target-alist
|
|
|
|
|
nil t nil '(ede-proj-target-history . 1))))
|
|
|
|
|
(ot nil)
|
|
|
|
|
(src (if (and (buffer-file-name)
|
|
|
|
|
(if (and autoadd (stringp autoadd))
|
|
|
|
|
(string= autoadd "y")
|
|
|
|
|
(y-or-n-p (format "Add %s to %s? " (buffer-name) name))))
|
|
|
|
|
(buffer-file-name)))
|
|
|
|
|
(fcn (cdr (assoc type ede-proj-target-alist)))
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
(when (not fcn)
|
2009-10-01 04:10:10 +00:00
|
|
|
|
(error "Unknown target type %s for EDE Project" type))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
|
|
|
|
|
(setq ot (funcall fcn name :name name
|
|
|
|
|
:path (ede-convert-path this default-directory)
|
|
|
|
|
:source (if src
|
|
|
|
|
(list (file-name-nondirectory src))
|
|
|
|
|
nil)))
|
|
|
|
|
;; If we added it, set the local buffer's object.
|
|
|
|
|
(if src (progn
|
|
|
|
|
(setq ede-object ot)
|
|
|
|
|
(ede-apply-object-keymap)))
|
|
|
|
|
;; Add it to the project object
|
|
|
|
|
;;(oset this targets (cons ot (oref this targets)))
|
|
|
|
|
;; New form: Add to the end using fancy eieio function.
|
|
|
|
|
;; @todone - Some targets probably want to be in the front.
|
|
|
|
|
;; How to do that?
|
|
|
|
|
;; @ans - See elisp autoloads for answer
|
|
|
|
|
(object-add-to-list this 'targets ot t)
|
|
|
|
|
;; And save
|
|
|
|
|
(ede-proj-save this)))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-new-target-custom ((this ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Create a new target in THIS for custom."
|
|
|
|
|
(let* ((name (read-string "Name: " ""))
|
|
|
|
|
(type (completing-read "Type: " ede-proj-target-alist
|
|
|
|
|
nil t nil '(ede-proj-target-history . 1))))
|
|
|
|
|
(funcall (cdr (assoc type ede-proj-target-alist)) name :name name
|
|
|
|
|
:path (ede-convert-path this default-directory)
|
|
|
|
|
:source nil)))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-delete-target ((this ede-proj-target))
|
Synch EDE to CEDET 1.0.
* 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.
2010-09-20 22:42:53 -04:00
|
|
|
|
"Delete the current target THIS from its parent project."
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(let ((p (ede-current-project))
|
|
|
|
|
(ts (oref this source)))
|
|
|
|
|
;; Loop across all sources. If it exists in a buffer,
|
Synch EDE to CEDET 1.0.
* 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.
2010-09-20 22:42:53 -04:00
|
|
|
|
;; clear its object.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(while ts
|
|
|
|
|
(let* ((default-directory (oref this path))
|
|
|
|
|
(b (get-file-buffer (car ts))))
|
|
|
|
|
(if b
|
* cedet/srecode/srt-mode.el (semantic-analyze-possible-completions):
* cedet/semantic/symref/list.el (semantic-symref-rb-toggle-expand-tag):
* cedet/semantic/symref/grep.el (semantic-symref-perform-search):
* cedet/semantic/bovine/gcc.el (semantic-gcc-query):
* cedet/semantic/bovine/c.el (semantic-c-parse-lexical-token):
* cedet/semantic/analyze/debug.el (semantic-analyzer-debug-add-buttons)
(semantic-analyzer-debug-global-symbol)
(semantic-analyzer-debug-missing-innertype)
(semantic-analyzer-debug-insert-include-summary):
* cedet/semantic/util.el (semantic-file-tag-table):
(semantic-describe-buffer-var-helper, semantic-something-to-tag-table)
(semantic-recursive-find-nonterminal-by-name):
* cedet/semantic/tag-ls.el (semantic-tag-calculate-parent-default):
* cedet/semantic/tag-file.el (semantic-prototype-file):
* cedet/semantic/symref.el (semantic-symref-parse-tool-output):
* cedet/semantic/sb.el (semantic-sb-fetch-tag-table):
* cedet/semantic/lex-spp.el (semantic-lex-spp-lex-text-string):
* cedet/semantic/idle.el (semantic-idle-work-for-one-buffer):
(semantic-idle-summary-maybe-highlight):
* cedet/semantic/ia-sb.el (semantic-ia-speedbar)
(semantic-ia-sb-tag-info):
* cedet/semantic/grammar.el (semantic-analyze-possible-completions):
* cedet/semantic/find.el (semantic-brute-find-tag-by-position):
* cedet/semantic/ede-grammar.el (project-compile-target):
(ede-proj-makefile-insert-variables):
* cedet/semantic/debug.el (semantic-debug-set-parser-location):
(semantic-debug-set-source-location, semantic-debug-interface-layout)
(semantic-debug-mode, semantic-debug):
* cedet/semantic/db.el (semanticdb-needs-refresh-p):
* cedet/semantic/db-typecache.el (semanticdb-typecache-refresh-for-buffer):
* cedet/semantic/db-javascript.el (semanticdb-equivalent-mode):
* cedet/semantic/db-find.el (semanticdb-find-log-new-search)
(semanticdb-find-translate-path-includes--internal)
(semanticdb-reset-log, semanticdb-find-log-activity):
* cedet/semantic/db-file.el (object-write):
* cedet/semantic/db-el.el (semanticdb-equivalent-mode):
* cedet/semantic/db-ebrowse.el (semanticdb-ebrowse-C-file-p)
(semanticdb-create-ebrowse-database):
* cedet/semantic/db-debug.el (semanticdb-table-sanity-check):
* cedet/semantic/complete.el (semantic-displayor-focus-request)
(semantic-collector-calculate-completions-raw)
(semantic-complete-read-tag-analyzer):
* cedet/semantic/analyze.el (semantic-analyze-pulse):
* cedet/ede/util.el (ede-update-version-in-source):
* cedet/ede/proj.el (project-delete-target):
* cedet/ede/proj-elisp.el (ede-update-version-in-source)
(ede-proj-flush-autoconf):
* cedet/ede/pconf.el (ede-proj-configure-synchronize)
(ede-proj-configure-synchronize):
* cedet/ede/locate.el (ede-locate-file-in-project-impl):
* cedet/ede/linux.el (ede-linux-version):
* cedet/ede/emacs.el (ede-emacs-version):
* cedet/ede/dired.el (ede-dired-add-to-target):
* cedet/ede.el (ede-buffer-header-file, ede-find-target)
(ede-buffer-documentation-files, ede-project-buffers, ede-set)
(ede-target-buffers, ede-buffers, ede-make-project-local-variable):
* cedet/cedet-idutils.el (cedet-idutils-fnid-call):
(cedet-idutils-lid-call, cedet-idutils-expand-filename)
(cedet-idutils-version-check):
* cedet/cedet-global.el (cedet-gnu-global-call):
(cedet-gnu-global-expand-filename, cedet-gnu-global-root)
(cedet-gnu-global-version-check, cedet-gnu-global-scan-hits):
* cedet/cedet-cscope.el (cedet-cscope-call)
(cedet-cscope-expand-filename, cedet-cscope-version-check):
Use with-current-buffer.
* cedet/ede.el (ede-make-project-local-variable)
(ede-set-project-variables, ede-set): Use dolist.
2009-10-30 02:16:41 +00:00
|
|
|
|
(with-current-buffer b
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(if (eq ede-object this)
|
|
|
|
|
(progn
|
|
|
|
|
(setq ede-object nil)
|
|
|
|
|
(ede-apply-object-keymap))))))
|
|
|
|
|
(setq ts (cdr ts)))
|
Synch EDE to CEDET 1.0.
* 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.
2010-09-20 22:42:53 -04:00
|
|
|
|
;; Remove THIS from its parent.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
;; The two vectors should be pointer equivalent.
|
|
|
|
|
(oset p targets (delq this (oref p targets)))
|
|
|
|
|
(ede-proj-save (ede-current-project))))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-add-file ((this ede-proj-target) file)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Add to target THIS the current buffer represented as FILE."
|
|
|
|
|
(let ((file (ede-convert-path this file))
|
|
|
|
|
(src (ede-target-sourcecode this)))
|
|
|
|
|
(while (and src (not (ede-want-file-p (car src) file)))
|
|
|
|
|
(setq src (cdr src)))
|
|
|
|
|
(when src
|
|
|
|
|
(setq src (car src))
|
|
|
|
|
(cond ((ede-want-file-source-p this file)
|
|
|
|
|
(object-add-to-list this 'source file t))
|
|
|
|
|
((ede-want-file-auxiliary-p this file)
|
|
|
|
|
(object-add-to-list this 'auxsource file t))
|
|
|
|
|
(t (error "`project-add-file(ede-target)' source mismatch error")))
|
|
|
|
|
(ede-proj-save))))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-remove-file ((target ede-proj-target) file)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"For TARGET, remove FILE.
|
|
|
|
|
FILE must be massaged by `ede-convert-path'."
|
|
|
|
|
;; Speedy delete should be safe.
|
|
|
|
|
(object-remove-from-list target 'source (ede-convert-path target file))
|
|
|
|
|
(object-remove-from-list target 'auxsource (ede-convert-path target file))
|
|
|
|
|
(ede-proj-save))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-update-version ((this ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"The :version of project THIS has changed."
|
|
|
|
|
(ede-proj-save))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-make-dist ((this ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Build a distribution for the project based on THIS target."
|
|
|
|
|
(let ((pm (ede-proj-dist-makefile this))
|
|
|
|
|
(df (project-dist-files this)))
|
|
|
|
|
(if (and (file-exists-p (car df))
|
|
|
|
|
(not (y-or-n-p "Dist file already exists. Rebuild? ")))
|
|
|
|
|
(error "Try `ede-update-version' before making a distribution"))
|
|
|
|
|
(ede-proj-setup-buildenvironment this)
|
Synch EDE to CEDET 1.0.
* 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.
2010-09-20 22:42:53 -04:00
|
|
|
|
(if (ede-proj-automake-p this)
|
2009-10-08 22:08:49 +00:00
|
|
|
|
(setq pm (expand-file-name "Makefile"
|
|
|
|
|
(file-name-directory pm))))
|
|
|
|
|
(compile (concat ede-make-command " -f " pm " dist"))))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-dist-files ((this ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Return a list of files that constitutes a distribution of THIS project."
|
|
|
|
|
(list
|
|
|
|
|
;; Note to self, keep this first for the above fn to check against.
|
|
|
|
|
(concat (oref this name) "-" (oref this version) ".tar.gz")
|
|
|
|
|
))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-compile-project ((proj ede-proj-project) &optional command)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Compile the entire current project PROJ.
|
|
|
|
|
Argument COMMAND is the command to use when compiling."
|
|
|
|
|
(let ((pm (ede-proj-dist-makefile proj))
|
|
|
|
|
(default-directory (file-name-directory (oref proj file))))
|
|
|
|
|
(ede-proj-setup-buildenvironment proj)
|
Synch EDE to CEDET 1.0.
* 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.
2010-09-20 22:42:53 -04:00
|
|
|
|
(if (ede-proj-automake-p proj)
|
2009-10-08 22:13:42 +00:00
|
|
|
|
(setq pm (expand-file-name "Makefile"
|
|
|
|
|
(file-name-directory pm))))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(compile (concat ede-make-command" -f " pm " all"))))
|
|
|
|
|
|
|
|
|
|
;;; Target type specific compilations/debug
|
|
|
|
|
;;
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-compile-target ((obj ede-proj-target) &optional command)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Compile the current target OBJ.
|
|
|
|
|
Argument COMMAND is the command to use for compiling the target."
|
|
|
|
|
(project-compile-project (ede-current-project) command))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-compile-target ((obj ede-proj-target-makefile)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
&optional command)
|
|
|
|
|
"Compile the current target program OBJ.
|
|
|
|
|
Optional argument COMMAND is the s the alternate command to use."
|
|
|
|
|
(ede-proj-setup-buildenvironment (ede-current-project))
|
|
|
|
|
(compile (concat ede-make-command " -f " (oref obj makefile) " "
|
|
|
|
|
(ede-proj-makefile-target-name obj))))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-debug-target ((obj ede-proj-target))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Run the current project target OBJ in a debugger."
|
Merge with CEDET upstream (rev. 8499).
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.
2013-03-21 23:11:03 +01:00
|
|
|
|
(error "Debug-target not supported by %s" (eieio-object-name obj)))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-run-target ((obj ede-proj-target))
|
2009-10-17 04:18:31 +00:00
|
|
|
|
"Run the current project target OBJ."
|
Merge with CEDET upstream (rev. 8499).
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.
2013-03-21 23:11:03 +01:00
|
|
|
|
(error "Run-target not supported by %s" (eieio-object-name obj)))
|
2009-10-17 04:18:31 +00:00
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-proj-makefile-target-name ((this ede-proj-target))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Return the name of the main target for THIS target."
|
|
|
|
|
(ede-name this))
|
|
|
|
|
|
|
|
|
|
;;; Compiler and source code generators
|
|
|
|
|
;;
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-want-file-auxiliary-p ((this ede-target) file)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Return non-nil if THIS target wants FILE."
|
|
|
|
|
;; By default, all targets reference the source object, and let it decide.
|
|
|
|
|
(let ((src (ede-target-sourcecode this)))
|
|
|
|
|
(while (and src (not (ede-want-file-auxiliary-p (car src) file)))
|
|
|
|
|
(setq src (cdr src)))
|
|
|
|
|
src))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-proj-compilers ((obj ede-proj-target))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"List of compilers being used by OBJ.
|
|
|
|
|
If the `compiler' slot is empty, concoct one on a first match found
|
|
|
|
|
basis for any given type from the `availablecompilers' slot.
|
|
|
|
|
Otherwise, return the `compiler' slot.
|
|
|
|
|
Converts all symbols into the objects to be used."
|
|
|
|
|
(when (slot-exists-p obj 'compiler)
|
|
|
|
|
(let ((comp (oref obj compiler)))
|
|
|
|
|
(if comp
|
|
|
|
|
;; Now that we have a pre-set compilers to use, convert tye symbols
|
|
|
|
|
;; into objects for ease of use
|
|
|
|
|
(if (listp comp)
|
|
|
|
|
(setq comp (mapcar 'symbol-value comp))
|
|
|
|
|
(setq comp (list (symbol-value comp))))
|
|
|
|
|
(let* ((acomp (oref obj availablecompilers))
|
|
|
|
|
(avail (mapcar 'symbol-value acomp))
|
|
|
|
|
(st (oref obj sourcetype))
|
|
|
|
|
(sources (oref obj source)))
|
|
|
|
|
;; COMP is not specified, so generate a list from the available
|
|
|
|
|
;; compilers list.
|
|
|
|
|
(while st
|
|
|
|
|
(if (ede-want-any-source-files-p (symbol-value (car st)) sources)
|
|
|
|
|
(let ((c (ede-proj-find-compiler avail (car st))))
|
|
|
|
|
(if c (setq comp (cons c comp)))))
|
Synch EDE to CEDET 1.0.
* 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.
2010-09-20 22:42:53 -04:00
|
|
|
|
(setq st (cdr st)))
|
|
|
|
|
;; Provide a good error msg.
|
|
|
|
|
(unless comp
|
|
|
|
|
(error "Could not find compiler match for source code extension \"%s\".
|
|
|
|
|
You may need to add support for this type of file."
|
|
|
|
|
(if sources
|
|
|
|
|
(file-name-extension (car sources))
|
|
|
|
|
"")))
|
|
|
|
|
))
|
2011-11-26 20:43:11 -08:00
|
|
|
|
;; Return the discovered compilers.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
comp)))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-proj-linkers ((obj ede-proj-target))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"List of linkers being used by OBJ.
|
|
|
|
|
If the `linker' slot is empty, concoct one on a first match found
|
|
|
|
|
basis for any given type from the `availablelinkers' slot.
|
|
|
|
|
Otherwise, return the `linker' slot.
|
|
|
|
|
Converts all symbols into the objects to be used."
|
|
|
|
|
(when (slot-exists-p obj 'linker)
|
|
|
|
|
(let ((link (oref obj linker)))
|
|
|
|
|
(if link
|
|
|
|
|
;; Now that we have a pre-set linkers to use, convert type symbols
|
|
|
|
|
;; into objects for ease of use
|
|
|
|
|
(if (symbolp link)
|
|
|
|
|
(setq link (list (symbol-value link)))
|
|
|
|
|
(error ":linker is not a symbol. Howd you do that?"))
|
|
|
|
|
(let* ((alink (oref obj availablelinkers))
|
|
|
|
|
(avail (mapcar 'symbol-value alink))
|
|
|
|
|
(st (oref obj sourcetype))
|
|
|
|
|
(sources (oref obj source)))
|
|
|
|
|
;; LINKER is not specified, so generate a list from the available
|
|
|
|
|
;; compilers list.
|
|
|
|
|
(while st
|
|
|
|
|
(if (ede-want-any-source-files-p (symbol-value (car st)) sources)
|
|
|
|
|
(let ((c (ede-proj-find-linker avail (car st))))
|
|
|
|
|
(if c (setq link (cons c link)))))
|
|
|
|
|
(setq st (cdr st)))
|
|
|
|
|
(unless link
|
|
|
|
|
;; No linker stands out! Loop over our linkers and pull out
|
|
|
|
|
;; the first that has no source type requirement.
|
|
|
|
|
(while (and avail (not (eieio-instance-inheritor-slot-boundp (car avail) 'sourcetype)))
|
|
|
|
|
(setq avail (cdr avail)))
|
|
|
|
|
(setq link (cdr avail)))))
|
2011-11-26 20:43:11 -08:00
|
|
|
|
;; Return the discovered linkers.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
link)))
|
|
|
|
|
|
|
|
|
|
|
2011-11-18 00:31:02 -08:00
|
|
|
|
;;; Target type specific autogenerating gobbledygook.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
;;
|
|
|
|
|
|
|
|
|
|
(defun ede-proj-makefile-type (&optional proj)
|
|
|
|
|
"Makefile type of the current project PROJ."
|
|
|
|
|
(oref (or proj (ede-current-project)) makefile-type))
|
|
|
|
|
|
|
|
|
|
(defun ede-proj-automake-p (&optional proj)
|
|
|
|
|
"Return non-nil if the current project PROJ is automake mode."
|
|
|
|
|
(eq (ede-proj-makefile-type proj) 'Makefile.am))
|
|
|
|
|
|
|
|
|
|
(defun ede-proj-autoconf-p (&optional proj)
|
|
|
|
|
"Return non-nil if the current project PROJ is automake mode."
|
|
|
|
|
(eq (ede-proj-makefile-type proj) 'Makefile.in))
|
|
|
|
|
|
|
|
|
|
(defun ede-proj-make-p (&optional proj)
|
|
|
|
|
"Return non-nil if the current project PROJ is automake mode."
|
|
|
|
|
(eq (ede-proj-makefile-type proj) 'Makefile))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-proj-dist-makefile ((this ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Return the name of the Makefile with the DIST target in it for THIS."
|
|
|
|
|
(cond ((eq (oref this makefile-type) 'Makefile.am)
|
|
|
|
|
(concat (file-name-directory (oref this file))
|
|
|
|
|
"Makefile.am"))
|
|
|
|
|
((eq (oref this makefile-type) 'Makefile.in)
|
2009-10-08 22:08:49 +00:00
|
|
|
|
(expand-file-name "Makefile.in"
|
|
|
|
|
(file-name-directory (oref this file))))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
((object-assoc "Makefile" 'makefile (oref this targets))
|
2009-10-08 22:08:49 +00:00
|
|
|
|
(expand-file-name "Makefile"
|
|
|
|
|
(file-name-directory (oref this file))))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
(t
|
|
|
|
|
(let ((targets (oref this targets)))
|
|
|
|
|
(while (and targets
|
|
|
|
|
(not (obj-of-class-p
|
|
|
|
|
(car targets)
|
|
|
|
|
'ede-proj-target-makefile)))
|
|
|
|
|
(setq targets (cdr targets)))
|
|
|
|
|
(if targets (oref (car targets) makefile)
|
2009-10-08 22:08:49 +00:00
|
|
|
|
(expand-file-name "Makefile"
|
|
|
|
|
(file-name-directory (oref this file))))))))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
|
|
|
|
|
(defun ede-proj-regenerate ()
|
|
|
|
|
"Regenerate Makefiles for and edeproject project."
|
|
|
|
|
(interactive)
|
|
|
|
|
(ede-proj-setup-buildenvironment (ede-current-project) t))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-proj-makefile-create-maybe ((this ede-proj-project) mfilename)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Create a Makefile for all Makefile targets in THIS if needed.
|
|
|
|
|
MFILENAME is the makefile to generate."
|
|
|
|
|
;; For now, pass through until dirty is implemented.
|
|
|
|
|
(require 'ede/pmake)
|
|
|
|
|
(if (or (not (file-exists-p mfilename))
|
|
|
|
|
(file-newer-than-file-p (oref this file) mfilename))
|
|
|
|
|
(ede-proj-makefile-create this mfilename)))
|
|
|
|
|
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod ede-proj-setup-buildenvironment ((this ede-proj-project)
|
2009-09-20 15:06:05 +00:00
|
|
|
|
&optional force)
|
|
|
|
|
"Setup the build environment for project THIS.
|
2012-07-08 21:52:49 -07:00
|
|
|
|
Handles the Makefile, or a Makefile.am configure.ac combination.
|
2009-09-20 15:06:05 +00:00
|
|
|
|
Optional argument FORCE will force items to be regenerated."
|
|
|
|
|
(if (not force)
|
|
|
|
|
(ede-proj-makefile-create-maybe this (ede-proj-dist-makefile this))
|
|
|
|
|
(require 'ede/pmake)
|
|
|
|
|
(ede-proj-makefile-create this (ede-proj-dist-makefile this)))
|
|
|
|
|
;; Rebuild all subprojects
|
|
|
|
|
(ede-map-subprojects
|
|
|
|
|
this (lambda (sproj) (ede-proj-setup-buildenvironment sproj force)))
|
|
|
|
|
;; Autoconf projects need to do other kinds of initializations.
|
|
|
|
|
(when (and (ede-proj-automake-p this)
|
|
|
|
|
(eq this (ede-toplevel this)))
|
|
|
|
|
(require 'ede/pconf)
|
|
|
|
|
;; If the user wants to force this, do it some other way?
|
|
|
|
|
(ede-proj-configure-synchronize this)
|
|
|
|
|
;; Now run automake to fill in the blanks, autoconf, and other
|
|
|
|
|
;; auto thingies so that we can just say "make" when done.
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Lower level overloads
|
|
|
|
|
;;
|
2015-02-04 13:49:49 -05:00
|
|
|
|
(cl-defmethod project-rescan ((this ede-proj-project))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
"Rescan the EDE proj project THIS."
|
|
|
|
|
(let ((root (or (ede-project-root this) this))
|
|
|
|
|
)
|
Update from CEDET trunk.
* grammars/c.by (template-type): Add :template-specifier and
:typevar to capture extra details about the template.
(opt-post-fcn-modifiers): Splice in the found symbol into the
return value correctly.
(QUESTION): New punctuation.
(expression): Add ternary conditional support.
* grammars/scheme.by (MODULE): New token.
(scheme): Handle expanding the MODULE tag.
(scheme-list): Remove closeparen required match.
(scheme-in-list): Remove extraneous matches for DEFINE. Add
support for MODULE Simplify matching for code & make work.
(name-args, name-arg-list, name-arg-expand): Make it work.
* semantic.el (semantic-mode): Add/remove 3
completion-at-point-functions.
(semantic-completion-at-point-function): Removed.
(semantic-analyze-completion-at-point-function)
(semantic-analyze-notc-completion-at-point-function)
(semantic-analyze-nolongprefix-completion-at-point-function): New
completion at point functions.
* semantic/doc.el (semantic-doc-snarf-comment-for-tag): Fix case
when comment-end is empty string.
* semantic/debug.el
(semantic-debug-parser-debugger-source): New buffer local
variable.
(semantic-debug-interface): Add 'nil' initform to overlays.
(semantic-debug-mode): Remove read-only tags from buffers on exit.
(semantic-debug): Add autoload cookie. Force the language
specific debugger to load.
* semantic/db.el (generic::semanticdb-full-filename): New generic
method to allow this method to be used on buffer names via an
associated database.
* semantic/symref.el
(semantic-symref-cleanup-recent-buffers-fcn): When cleaning up
buffers, don't clean up buffers that are being used (i.e., in a
window) when the hook fires.
(semantic-symref-recently-opened-buffers): New tracking variable.
(semantic-symref-cleanup-recent-buffers-fcn): New hook fcn.
(semantic-symref-result-get-tags): Move logic into
`semantic-symref-hit-to-tag-via-buffer', and cleanup buffers via
the symref cleanup function in post-command-hook.
(semantic-symref-hit-to-tag-via-buffer): Logic that used to be
from above.
(semantic-symref-hit-to-tag-via-db): New.
* semantic/analyze.el:
(semantic-analyze-find-tag-sequence-default): If first entry in
sequence is the only one, apply tagclass filter.
(semantic-analyze-princ-sequence): Show slot even if empty.
(semantic-analyze-find-tag-sequence)
(semantic-analyze-find-tag-sequence-default): Add flags argument.
Add support for forcing the final entry of the sequence to be of
class variable.
(semantic-analyze-find-tag): Fix bug where input class filter was
ignored if there was a typecache match.
(semantic-analyze-current-context-default): For assignments, the
assignee now must be of class variable.
* semantic/analyze/complete.el
(semantic-analyze-possible-completions-default): Add
'no-longprefix' flag. When used, the prefix and prefixtypes are
shortened to just the last symbol.
* semantic/bovine/c.el (semantic-c-do-lex-if): Catch errors from
'hideif', and push to the parser warning stack.
(semantic-lex-cpp-define): When a comment is at the end of a
macro, do not subtract an extra 1 from the found position. Fixes
bug with: #define foo (a)/**/ adding an extra ')' to the stream.
* semantic/bovine/scm.el (semantic-lex-scheme-symbol): Allow
symbols to be one char long.
* semantic/bovine/grammar.el
(bovine-grammar-calculate-source-on-path): New.
(bovine-grammar-setupcode-builder): Use it.
* ede.el (ede/detect): New require.
(ede-version): Bump version
(ede-initialize-state-current-buffer): Use new
`ede-detect-directory-for-project' to detect projects first
instead of depending on currente dir only.
(ede-delete-project-from-global-list): New.
(ede-flush-deleted-projects): Use above.
(ede-check-project-query-fcn): New variable
(ede-check-project-directory): Use above when querying the user.
Added to support unit testing of this security measure.
(ede-initialize-state-current-buffer): Use
`ede-directory-project-cons' instead of the -detect- fcn to take
advantage of the cache. Pass found project into
`ede-load-project-file'.
(ede-load-project-file): Add new input DETECTIN.
(ede-rescan-toplevel): Get the proj root a better way.
(ede-load-project-file): Return the loaded object. When asking
for existing project, ask for an exact match.
(ede-initialize-state-current-buffer): Simplify some conditional
logic.
(ede-load-project-file): Simplify conditional logic.
(ede-global-list-sanity-check): New Testing fcn.
(ede-parent-project): Replace old code with call to faster
`ede-find-subproject-for-directory'.
(ede-load-project-file): Use
`ede-directory-get-toplevel-open-project' instead of above
deleted. Rename "pfc" to "autoloader". Use
`ede-directory-project-cons' to detect a project. Delete no
project found case where we search up the tree.
* ede/auto.el (ede-project-autoload): Fix doc typo. Add
`:root-only' slot.
(ede-auto-load-project): Doc update: warn to not use.
(ede-dir-to-projectfile): Deleted.
(ede-project-autoload-dirmatch): Add subdir-only slot. Make
configdatastash unbound by default.
(ede-do-dirmatch): If subdir-only is true, then don't allow exact
matches. Account for configdatastash as unbound. Assume value of
nil means no tool installed. Make sure loaded path matches from
beginning. Stash the regexp, not the raw string.
(ede-project-class-files): Note that makefile and automake are not
root only.
(ede-auto-detect-in-dir): New (for use with `ede/detect.el').
(ede-project-dirmatch-p): Deleted.
(ede-project-root-directory): Remove body, return nil.
(ede-project-autoload): :proj-root-dirmatch can be null & doc fix.
(ede-auto-detect-in-dir): If there is no :proj-file, check for a
dirmatch.
* ede/generic.el (ede/config): Replace require of ede.
(ede-generic-new-autoloader): Generic projects are now safe by
default. Note this is NOT a root only project.
(project-rescan, ede-project-root, ede-generic-target-java)
(ede-java-classpath, ede-find-subproject-for-directory): New.
(ede-enable-generic-projects): Add new autoloaders for git, bzr,
hg, sv, CVS.
(ede-generic-vc-project)
(ede-generic-vc-project::ede-generic-setup-configuration): New.
(ede-generic-config): Remove slots: c-include-path,
c-preprocessor-table, c-preprocessor-files, classpath,
build-command, debug-command, run command. Inherit from
ede-extra-config-build, ede-extra-config-program. Make
run-command :value match :custom so only strings are accepted.
Add some more :group slot specifiers.
(ede-generic-project): Add mixins `ede-project-with-config-c' and
`ede-project-with-config-java'. Inherit from
`ede-project-with-config-build',
`ede-project-with-config-program'. Subclass
`ede-project-with-config'. Remove duplication from new baseclass.
(ede-generic-target): Inherit from `ede-target-with-config-build',
`ede-target-with-config-program'. Subclass `ede-target-with-config'.
(ede-generic-target-c-cpp): Add mixin `ede-target-with-config-c'.
(ede-generic-target-java): Add mixin `ede-target-with-config-java'.
(ede-preprocessor-map, ede-system-include-path)
(edejava-classpath): Deleted, moved to config.el.
(project-compile-project, project-compile-target)
(project-debug-target, project-run-target): Deleted.
(ede-generic-get-configuration, ede-generic-setup-configuration)
(ede-commit-project, project-rescan)
(ede-generic-project::ede-customize)
(ede-generic-target::ede-customize)
(ede-generic-config::eieio-done-customizing)
(ede-generic-config::ede-commit): Deleted. Subsumed by new
baseclass.
(ede-preprocessor-map, ede-system-include-path)
(project-debug-target, project-run-target): Call new
`ede-config-get-configuration' instead of old version.
(ede-generic-load): Do not add to global list here.
* ede/files.el (ede-find-project-root)
(ede-files-find-existing)
(ede-directory-get-toplevel-open-project-new): Deleted.
(ede-project-root-directory): Use `ede-project-root' first.
(ede-project-directory-remove-hash)
(ede--directory-project-from-hash)
(ede--directory-project-add-description-to-hash): Rename to make
internal symbols (via --). Expand input dir first.
(ede-directory-project-p): Doc fix (note obsoleted.)
(ede-toplevel-project-or-nil): Alias to `ede-toplevel-project'.
(ede-toplevel-project): Doc Fix. Delete commented out old code.
Simplify returning result from ede-detect-directory-for-project.
(ede-directory-get-open-project): Support when
inodes are disabled. If disabled to str compare on root project.
(ede-directory-get-toplevel-open-project): Enabled nested
projects. When doing directory name matching, save the 'short'
version of an answer (non-exact match) and eventually select the
shortest answer at the end. Expand the filename of tested
projects. Better support for when inodes are disabled. Add
'exact' option so that it will return a project that is an exact
match.
(ede-find-subproject-for-directory): Small optimization to run
`file-truename' less often.
(ede-directory-project-p): Move content, then use
`ede-directory-project-cons'. Use
`ede-detect-directory-for-project', replacing old detection loop.
(ede-directory-project-cons): New, from above.
(ede-toplevel-project): Toss old scanning code. Use
`ede-detect-directory-for-project' instead.
(ede-directory-get-toplevel-open-project-new): New.
* ede/linux.el (ede-linux-project-root): Deleted.
(ede-project-autoload): Remove dirmatch entry - it is no longer
needed.
* lisp/cedet/ede/proj.el (project-rescan): Replace direct
manipulation of `ede-projects' with equivalent and better
functions.
(ede-proj-load): Replace call to test if dir has project to
explicity ask filesystem if Project.ede is there.
* ede/config.el:
* ede/detect.el: New files.
* ede/project-am.el (project-run-target): Add "./" to program to
run for systems where '.' isn't in PATH.
(project-am-load): Remove old code regarding `ede-constructing'.
Just read in the makefiles.
* ede/linux.el (ede-linux-load): Do not add to global list here.
Don't check for existing anymore.
(project-rescan): New.
(ede-linux-project-list, ede-linux-file-existing): Deleted.
(ede-linux-project-root): Delete body. Need symbol for autoloads
for now.
(ede-linux-project): No longer instance tracker.
(ede-project-autoload): Don't provide :proj-root
* ede/emacs.el (ede-emacs-load): Do not add project to global list
here. Don't look for existing first.
(ede-project-autoload): Remove dirmatch entry - it is no longer
needed. Don't provide proj-root anymore.
(ede-emacs-project-list, ede-emacs-file-existing): Delete.
(ede-emacs-project-root): Remove body (need symbol for loaddefs
still).
(ede-emacs-project): Do not instance track anymore.
* ede/cpp-root.el (initialize-instance): Remove commented code.
Add note about why we are adding the project to the master list.
Make sure if we are replacing a prev version, remove from global
list.
(ede-cpp-root-file-existing)
(ede-cpp-root-project-file-for-dir)
(ede-cpp-root-count, ede-cpp-root-project-root, ede-cpp-root-load)
(ede-project-autoload cpp-root): Deleted.
(ede-project-root-directory): Return :directory instead of
calculating from :file.
(project-rescan): New.
* ede/base.el (ede-toplevel): Only use buffer cached value if
subproj not passed in.
* srecode/java.el (srecode-semantic-handle-:java): Fix case when
an EDE project didn't support java paths.
* lisp/cedet/ede/proj-elisp.el
(ede-proj-target-elisp::ede-proj-tweak-autoconf): Kill buffer
after saving modified elisp-comp script, as to avoid "file has
changed on disk; really edit the buffer" questions when script
gets rewritten.
* emacs-lisp/eieio-custom.el (eieio-customize-object): Set
eieio-cog (current group) to g, which is an improved form of input
group.
* srecode/doc-cpp.srt (mode): Set to c mode so this works with
both C and C++.
2014-11-10 01:04:30 +01:00
|
|
|
|
;; @TODO - VERIFY THE BELOW WORKS
|
|
|
|
|
(ede-project-directory-remove-hash
|
|
|
|
|
(file-name-directory (ede-project-root-directory root)))
|
|
|
|
|
(ede-delete-project-from-global-list root)
|
2012-10-02 02:10:29 +08:00
|
|
|
|
;; NOTE : parent function double-checks that this dir was
|
|
|
|
|
;; already in memory once.
|
Synch EDE to CEDET 1.0.
* 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.
2010-09-20 22:42:53 -04:00
|
|
|
|
(ede-load-project-file (ede-project-root-directory root))
|
2009-09-20 15:06:05 +00:00
|
|
|
|
))
|
|
|
|
|
|
|
|
|
|
(provide 'ede/proj)
|
|
|
|
|
|
|
|
|
|
;;; ede/proj.el ends here
|