diff options
author | Stephen Leake <stephen_leake@stephe-leake.org> | 2015-08-31 10:32:26 -0500 |
---|---|---|
committer | Stephen Leake <stephen_leake@stephe-leake.org> | 2015-08-31 10:35:34 -0500 |
commit | 0ff60ec82f98032375e8569a98c08b72d879bce4 (patch) | |
tree | c909654f1073053ef4f160c739e021ef08196dbd /lisp/cedet/ede/generic.el | |
parent | e634dacce7ee3bcb4d8aba9e6ad125b6b875c179 (diff) | |
download | emacs-0ff60ec82f98032375e8569a98c08b72d879bce4.tar.gz |
Fix some byte-compiler warnings in EDE
This fixes a bug that caused ede-generic-new-autoloader to overwrite the
existing autoloader list, rather than add to it.
* lisp/cedet/ede/auto.el (ede-project-class-files): Delete obsolete name
argument to eieio class constructor.
(ede-show-supported-projects): New.
(ede-add-project-autoload): Replace obsolete `eieio-object-name-string'
with (oref ... name).
(ede-auto-load-project): Use slot name, not initarg key.
* lisp/cedet/ede/generic.el (ede-generic-load,
ede-generic-find-matching-target): Use slot name, not initarg key.
(ede-find-target): Use oref-default on class name.
(ede-generic-new-autoloader): Delete obsolete name argument to eieio
class constructor.
(ede-enable-generic-projects): Make project type names unique.
Diffstat (limited to 'lisp/cedet/ede/generic.el')
-rw-r--r-- | lisp/cedet/ede/generic.el | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el index 9e6fc978376..8d013245bb6 100644 --- a/lisp/cedet/ede/generic.el +++ b/lisp/cedet/ede/generic.el @@ -74,7 +74,7 @@ ;; The ede-generic-target-c-cpp has some example methods setting up ;; the pre-processor map and system include path. ;; -;; NOTE: It is not necessary to modify ede-generic.el to add any of +;; NOTE: It is not necessary to modify ede/generic.el to add any of ;; the above described support features. (require 'eieio-opt) @@ -102,14 +102,14 @@ ROOTPROJ is nil, since there is only one project." (let* ((alobj ede-constructing)) (when (not alobj) (error "Cannot load generic project without the autoload instance")) ;;; - ;; TODO - find the root dir. + ;; TODO - find the root dir. (let ((rootdir dir)) (funcall (oref alobj class-sym) (symbol-name (oref alobj class-sym)) :name (file-name-nondirectory (directory-file-name dir)) :version "1.0" :directory (file-name-as-directory rootdir) - :file (expand-file-name (oref alobj :proj-file) + :file (expand-file-name (oref alobj proj-file) rootdir))) )) @@ -211,7 +211,7 @@ All directories need at least one target.") (let ((match nil)) (dolist (T targets) (when (and (object-of-class-p T class) - (string= (oref T :path) dir)) + (string= (oref T path) dir)) (setq match T) )) match)) @@ -241,7 +241,7 @@ If one doesn't exist, create a new one for this directory." (when (not ans) (setq ans (make-instance cls - :name (oref cls shortname) + :name (oref-default cls shortname) :path dir :source nil)) (object-add-to-list proj :targets ans) @@ -252,18 +252,18 @@ If one doesn't exist, create a new one for this directory." ;; ;; Derived projects need an autoloader so that EDE can find the ;; different projects on disk. -(defun ede-generic-new-autoloader (internal-name external-name - projectfile class) +(defun ede-generic-new-autoloader (_internal-name external-name + projectfile class) "Add a new EDE Autoload instance for identifying a generic project. -INTERNAL-NAME is a long name that identifies this project type. -EXTERNAL-NAME is a shorter human readable name to describe the project. +INTERNAL-NAME is obsolete and ignored. +EXTERNAL-NAME is a human readable name to describe the project; it +must be unique among all autoloaded projects. PROJECTFILE is a file name that identifies a project of this type to EDE, such as a Makefile, or SConstruct file. CLASS is the EIEIO class that is used to track this project. It should subclass -the class `ede-generic-project' project." +`ede-generic-project'." (ede-add-project-autoload - (ede-project-autoload internal-name - :name external-name + (ede-project-autoload :name external-name :file 'ede/generic :proj-file projectfile :root-only nil @@ -284,29 +284,29 @@ the class `ede-generic-project' project." (defun ede-enable-generic-projects () "Enable generic project loaders." (interactive) - (ede-generic-new-autoloader "generic-makefile" "Make" + (ede-generic-new-autoloader "generic-makefile" "Generic Make" "Makefile" 'ede-generic-makefile-project) - (ede-generic-new-autoloader "generic-scons" "SCons" + (ede-generic-new-autoloader "generic-scons" "Generic SCons" "SConstruct" 'ede-generic-scons-project) - (ede-generic-new-autoloader "generic-cmake" "CMake" + (ede-generic-new-autoloader "generic-cmake" "Generic CMake" "CMakeLists" 'ede-generic-cmake-project) ;; Super Generic found via revision control tags. - (ede-generic-new-autoloader "generic-git" "Git" + (ede-generic-new-autoloader "generic-git" "Generic Git" ".git" 'ede-generic-vc-project) - (ede-generic-new-autoloader "generic-bzr" "Bazaar" + (ede-generic-new-autoloader "generic-bzr" "Generic Bazaar" ".bzr" 'ede-generic-vc-project) - (ede-generic-new-autoloader "generic-hg" "Mercurial" + (ede-generic-new-autoloader "generic-hg" "Generic Mercurial" ".hg" 'ede-generic-vc-project) - (ede-generic-new-autoloader "generic-svn" "Subversions" + (ede-generic-new-autoloader "generic-svn" "Generic Subversions" ".svn" 'ede-generic-vc-project) - (ede-generic-new-autoloader "generic-cvs" "CVS" + (ede-generic-new-autoloader "generic-cvs" "Generic CVS" "CVS" 'ede-generic-vc-project) ;; Take advantage of existing 'projectile' based projects. ;; @TODO - if projectile supports compile commands etc, can we ;; read that out? Howto if projectile is not part of core emacs. - (ede-generic-new-autoloader "generic-projectile" ".projectile" + (ede-generic-new-autoloader "generic-projectile" "Generic .projectile" ".projectile" 'ede-generic-vc-project) ) |