Mercurial > emacs

comparison lisp/cedet/ede/proj-obj.el @ 110526:b150a06c6999

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 20 Sep 2010 22:42:53 -0400
parents 1d1d5d9bd884
children 376148b31b5e
comparison
equal deleted inserted replaced
110525:e950143ab9e0 110526:b150a06c6999
37 (defclass ede-proj-target-makefile-objectcode (ede-proj-target-makefile) 37 (defclass ede-proj-target-makefile-objectcode (ede-proj-target-makefile)
38 (;; Give this a new default 38 (;; Give this a new default
39 (configuration-variables :initform ("debug" . (("CFLAGS" . "-g") 39 (configuration-variables :initform ("debug" . (("CFLAGS" . "-g")
40 ("LDFLAGS" . "-g")))) 40 ("LDFLAGS" . "-g"))))
41 ;; @TODO - add an include path. 41 ;; @TODO - add an include path.
42 (availablecompilers :initform (ede-gcc-compiler 42 (availablecompilers :initform '(ede-gcc-compiler
43 ede-g++-compiler 43 ede-g++-compiler
44 ede-gfortran-compiler 44 ede-gfortran-compiler
45 ede-gfortran-module-compiler 45 ede-gfortran-module-compiler
46 ;; More C and C++ compilers, plus 46 ede-lex-compiler
47 ;; fortran or pascal can be added here 47 ede-yacc-compiler
48 )) 48 ;; More C and C++ compilers, plus
49 (availablelinkers :initform (ede-g++-linker 49 ;; fortran or pascal can be added here
50 ede-cc-linker 50 ))
51 ede-gfortran-linker 51 (availablelinkers :initform '(ede-g++-linker
52 ede-ld-linker 52 ede-cc-linker
53 ;; Add more linker thingies here. 53 ede-ld-linker
54 )) 54 ede-gfortran-linker
55 (sourcetype :initform (ede-source-c 55 ;; Add more linker thingies here.
56 ede-source-c++ 56 ))
57 ede-source-f77 57 (sourcetype :initform '(ede-source-c
58 ede-source-f90 58 ede-source-c++
59 ;; ede-source-other 59 ede-source-f77
60 ;; This object should take everything that 60 ede-source-f90
61 ;; gets compiled into objects like fortran 61 ede-source-lex
62 ;; and pascal. 62 ede-source-yacc
63 )) 63 ;; ede-source-other
64 ;; This object should take everything that
65 ;; gets compiled into objects like fortran
66 ;; and pascal.
67 ))
64 ) 68 )
65 "Abstract class for Makefile based object code generating targets. 69 "Abstract class for Makefile based object code generating targets.
66 Belonging to this group assumes you could make a .o from an element source 70 Belonging to this group assumes you could make a .o from an element source
67 file.") 71 file.")
68 72
113 (ede-linker 117 (ede-linker
114 "ede-cc-linker" 118 "ede-cc-linker"
115 :name "cc" 119 :name "cc"
116 :sourcetype '(ede-source-c) 120 :sourcetype '(ede-source-c)
117 :variables '(("C_LINK" . "$(CC) $(CFLAGS) $(LDFLAGS) -L.")) 121 :variables '(("C_LINK" . "$(CC) $(CFLAGS) $(LDFLAGS) -L."))
118 :commands '("$(C_LINK) -o $@ $^") 122 :commands '("$(C_LINK) -o $@ $^ $(LDDEPS)")
119 :objectextention "") 123 :objectextention "")
120 "Linker for C sourcecode.") 124 "Linker for C sourcecode.")
121 125
122 (defvar ede-source-c++ 126 (defvar ede-source-c++
123 (ede-sourcecode "ede-source-c++" 127 (ede-sourcecode "ede-source-c++"
124 :name "C++" 128 :name "C++"
125 :sourcepattern "\\.\\(cpp\\|cc\\|cxx\\)$" 129 :sourcepattern "\\.\\(c\\(pp?\\|c\\|xx\\|++\\)\\|C\\\(PP\\)?\\)$"
126 :auxsourcepattern "\\.\\(hpp\\|hh?\\|hxx\\)$" 130 :auxsourcepattern "\\.\\(hpp?\\|hh?\\|hxx\\|H\\)$"
127 :garbagepattern '("*.o" "*.obj" ".deps/*.P" ".lo")) 131 :garbagepattern '("*.o" "*.obj" ".deps/*.P" ".lo"))
128 "C++ source code definition.") 132 "C++ source code definition.")
129 133
130 (defvar ede-g++-compiler 134 (defvar ede-g++-compiler
131 (ede-object-compiler 135 (ede-object-compiler
156 "ede-g++-linker" 160 "ede-g++-linker"
157 :name "g++" 161 :name "g++"
158 ;; Only use this linker when c++ exists. 162 ;; Only use this linker when c++ exists.
159 :sourcetype '(ede-source-c++) 163 :sourcetype '(ede-source-c++)
160 :variables '(("CXX_LINK" . "$(CXX) $(CFLAGS) $(LDFLAGS) -L.")) 164 :variables '(("CXX_LINK" . "$(CXX) $(CFLAGS) $(LDFLAGS) -L."))
161 :commands '("$(CXX_LINK) -o $@ $^") 165 :commands '("$(CXX_LINK) -o $@ $^ $(LDDEPS)")
162 :autoconf '("AC_PROG_CXX") 166 :autoconf '("AC_PROG_CXX")
163 :objectextention "") 167 :objectextention "")
164 "Linker needed for c++ programs.") 168 "Linker needed for c++ programs.")
169
170 ;;; LEX
171 (defvar ede-source-lex
172 (ede-sourcecode "ede-source-lex"
173 :name "lex"
174 :sourcepattern "\\.l\\(l\\|pp\\|++\\)")
175 "Lex source code definition.
176 No garbage pattern since it creates C or C++ code.")
177
178 (defvar ede-lex-compiler
179 (ede-object-compiler
180 "ede-lex-compiler"
181 ;; Can we support regular makefiles too??
182 :autoconf '("AC_PROG_LEX")
183 :sourcetype '(ede-source-lex))
184 "Compiler used for Lexical source.")
185
186 ;;; YACC
187 (defvar ede-source-yacc
188 (ede-sourcecode "ede-source-yacc"
189 :name "yacc"
190 :sourcepattern "\\.y\\(y\\|pp\\|++\\)")
191 "Yacc source code definition.
192 No garbage pattern since it creates C or C++ code.")
193
194 (defvar ede-yacc-compiler
195 (ede-object-compiler
196 "ede-yacc-compiler"
197 ;; Can we support regular makefiles too??
198 :autoconf '("AC_PROG_YACC")
199 :sourcetype '(ede-source-yacc))
200 "Compiler used for yacc/bison grammar files source.")
165 201
166 ;;; Fortran Compiler/Linker 202 ;;; Fortran Compiler/Linker
167 ;; 203 ;;
168 ;; Contributed by David Engster 204 ;; Contributed by David Engster
169 (defvar ede-source-f90 205 (defvar ede-source-f90
231 (ede-linker 267 (ede-linker
232 "ede-ld-linker" 268 "ede-ld-linker"
233 :name "ld" 269 :name "ld"
234 :variables '(("LD" . "ld") 270 :variables '(("LD" . "ld")
235 ("LD_LINK" . "$(LD) $(LDFLAGS) -L.")) 271 ("LD_LINK" . "$(LD) $(LDFLAGS) -L."))
236 :commands '("$(LD_LINK) -o $@ $^") 272 :commands '("$(LD_LINK) -o $@ $^ $(LDDEPS)")
237 :objectextention "") 273 :objectextention "")
238 "Linker needed for c++ programs.") 274 "Linker needed for c++ programs.")
239 275
240 ;;; The EDE object compiler 276 ;;; The EDE object compiler
241 ;; 277 ;;