Re: [CEDET-devel] beta1 branch merged with head
Brought to you by:
zappo
Menu
▾
▴
Re: [CEDET-devel] beta1 branch merged with head
|
From: David P. <dav...@wa...> - 2003-11-20 08:01:35
|
Hi Eric,
> I'm going to call beta1 done and successful! Thanks everyone who
> reported bugs and contributed patches to the cedet-1p0beta1
> branch.
Hurray!
> I have joined the changes from beta1 into HEAD. I'll start the
> slow process of merging that with my working changes and start on
> beta2.
It seems that some changes made in beta1 branch haven't been merged
in the trunk. Following is a cvs rdiff report of the relevant files,
that is:
- common/cedet-autogen.el
- semantic/Makefile
- semantic/wisent/Makefile
- semantic/wisent/Project.ede
Anyway thanks Eric!
David
Index: cedet/common/cedet-autogen.el
diff -c cedet/common/cedet-autogen.el:1.3 cedet/common/cedet-autogen.el:1.3=
.2.2
*** cedet/common/cedet-autogen.el:1.3=09Sat Sep 6 12:40:24 2003
--- cedet/common/cedet-autogen.el=09Mon Nov 17 00:56:13 2003
***************
*** 5,11 ****
;; Author: David Ponce <da...@dp...>
;; Created: 22 Aug 2003
;; Keywords: maint
! ;; X-CVS: $Id: cedet-autogen.el,v 1.3 2003/09/06 19:40:24 zappo Exp $
=20
;; This file is not part of GNU Emacs.
=20
--- 5,11 ----
;; Author: David Ponce <da...@dp...>
;; Created: 22 Aug 2003
;; Keywords: maint
! ;; X-CVS: $Id: cedet-autogen.el,v 1.3.2.2 2003/11/17 08:56:13 ponced Exp =
$
=20
;; This file is not part of GNU Emacs.
=20
***************
*** 107,113 ****
"Remove Xemacs autoloads feature from this buffer."
(save-excursion
(goto-char (point-min))
! (while (re-search-forward "cedet-autoloads" nil t)
(condition-case nil
(while t (up-list -1))
(error nil))
--- 107,113 ----
"Remove Xemacs autoloads feature from this buffer."
(save-excursion
(goto-char (point-min))
! (while (re-search-forward "(\\(featurep\\|provide\\) '\\sw+-autoloads=
" nil t)
(condition-case nil
(while t (up-list -1))
(error nil))
***************
*** 155,160 ****
--- 155,186 ----
(setq dirs (nconc dirs subdirs)))))
dirs))
=20
+ (defun cedet-autogen-ensure-default-file (file)
+ "Make sure that the autoload file FILE exists and if not create it."
+ ;; If file don't exist, and is not automatically created...
+ (unless (or (file-exists-p file)
+ (fboundp 'autoload-ensure-default-file))
+ ;; Create a file buffer.
+ (find-file file)
+ ;; Use Unix EOLs, so that the file is portable to all platforms.
+ (setq buffer-file-coding-system 'raw-text-unix)
+ (unless (featurep 'xemacs)
+ ;; Insert a GNU Emacs loaddefs skeleton.
+ (insert ";;; " (file-name-nondirectory file)
+ " --- automatically extracted autoloads\n"
+ ";;\n"
+ ";;; Code:\n\n"
+ "=0C\n;; Local" " Variables:\n"
+ ";; version-control: never\n"
+ ";; no-byte-compile: t\n"
+ ";; no-update-autoloads: t\n"
+ ";; End:\n"
+ ";;; " (file-name-nondirectory file)
+ " ends here\n"))
+ ;; Insert the header so that the buffer is not empty.
+ (cedet-autogen-update-header))
+ file)
+=20
;;;###autoload
(defun cedet-update-autoloads (loaddefs &optional directory &rest directo=
ries)
"Update autoloads in file LOADDEFS from sources.
***************
*** 174,188 ****
(write-contents-hooks '(cedet-autogen-update-header))
(command-line-args-left (cons default-directory extra-dirs))
)
! ;; If file don't exist, and is not automatically created...
! (unless (or (file-exists-p generated-autoload-file)
! (fboundp 'autoload-ensure-default-file))
! ;; Create a file buffer.
! (find-file generated-autoload-file)
! ;; Use Unix EOLs, so that the file is portable to all platforms.
! (setq buffer-file-coding-system 'raw-text-unix)
! ;; Insert the header so that the buffer is not empty.
! (cedet-autogen-update-header))
(batch-update-autoloads)))
=20
(defun cedet-batch-update-autoloads ()
--- 200,206 ----
(write-contents-hooks '(cedet-autogen-update-header))
(command-line-args-left (cons default-directory extra-dirs))
)
! (cedet-autogen-ensure-default-file generated-autoload-file)
(batch-update-autoloads)))
=20
(defun cedet-batch-update-autoloads ()
Index: cedet/semantic/Makefile
diff -c cedet/semantic/Makefile:1.27 cedet/semantic/Makefile:1.27.2.2
*** cedet/semantic/Makefile:1.27=09Wed Oct 1 18:39:43 2003
--- cedet/semantic/Makefile=09Mon Nov 10 00:11:17 2003
***************
*** 9,23 ****
top=3D
ede_FILES=3DProject.ede Makefile
=20
EMACS=3Demacs
! LOADPATH=3D../common/ ../eieio/ ../ede/ wisent/ bovine/\
! ../common/ ../speedbar/ ../ede/ ../eieio/\
=20
LOADDEFS=3Dsemantic-loaddefs.el
LOADDIRS=3D. bovine wisent
maintenance_LISP=3Dsemantic-ede-grammar.el
EMACS=3Demacs
- wy_MISC=3Dsemantic-grammar.wy
scripts_MISC=3Dsemanticdb.sh
example_MISC=3Dsemantic-example.el
init_LISP=3Dsemantic-load.el
--- 9,25 ----
top=3D
ede_FILES=3DProject.ede Makefile
=20
+ metagrammar_SEMANTIC_GRAMMAR=3Dsemantic-grammar.wy
EMACS=3Demacs
! LOADPATH=3D../common/ ./ ../eieio/ ../common/\
! ../eieio/ ../ede/ wisent/ bovine/ ../common/ ../speedbar/ ../ede/ ../e=
ieio/\
=20
+ metagrammar_SAMENATIC_GRAMMAR_EL=3Dsemantic-grammar-wy.el
+ EMACS=3Demacs
LOADDEFS=3Dsemantic-loaddefs.el
LOADDIRS=3D. bovine wisent
maintenance_LISP=3Dsemantic-ede-grammar.el
EMACS=3Demacs
scripts_MISC=3Dsemanticdb.sh
example_MISC=3Dsemantic-example.el
init_LISP=3Dsemantic-load.el
***************
*** 31,37 ****
=20
=20
=20
! all: autoloads wy scripts example init semantic Languages tools senator w=
isent Tests Documentation bovinator
=20
.PHONY: autoloads
autoloads:=20
--- 33,49 ----
=20
=20
=20
! all: metagrammar autoloads scripts example init semantic Languages tools =
senator wisent Tests Documentation bovinator
!=20
! .PHONY: metagrammar
! metagrammar: autoloads $(metagrammar_SEMANTIC_GRAMMAR)
! =09@echo "(add-to-list 'load-path nil)" > grammar-make-script
! =09@for loadpath in . ${LOADPATH}; do \
! =09 echo "(add-to-list 'load-path \"$$loadpath\")" >> grammar-make-scri=
pt; \
! =09done;
! =09@echo "(require 'semantic-load)" >> grammar-make-script
! =09@echo "(require 'semantic-grammar)" >> grammar-make-script
! =09${EMACS} -batch -q -l grammar-make-script -f semantic-grammar-batch-bu=
ild-packages $(metagrammar_SEMANTIC_GRAMMAR)
=20
.PHONY: autoloads
autoloads:=20
***************
*** 51,59 ****
=09@echo "(setq debug-on-error t)" >> $@-compile-script
=09$(EMACS) -batch -l $@-compile-script -f batch-byte-compile $^
=20
- wy:=20
- =09@
-=20
scripts:=20
=09@
=20
--- 63,68 ----
***************
*** 133,141 ****
=20
.PHONY: dist
=20
! dist:
=09mkdir $(DISTDIR)
! =09cp $(LOADDEFS) $(maintenance_LISP) $(wy_MISC) $(scripts_MISC) $(exampl=
e_MISC) $(init_LISP) $(semantic_LISP) $(Languages_LISP) $(tools_LISP) $(sen=
ator_LISP) $(misc_AUX) $(ede_FILES) $(DISTDIR)
=09cd wisent; $(MAKE) $(MFLAGS) DISTDIR=3D$(DISTDIR)/wisent dist
=09cd tests; $(MAKE) $(MFLAGS) DISTDIR=3D$(DISTDIR)/tests dist
=09cd doc; $(MAKE) $(MFLAGS) DISTDIR=3D$(DISTDIR)/doc dist
--- 142,150 ----
=20
.PHONY: dist
=20
! dist: $(metagrammar_SAMENATIC_GRAMMAR_EL)
=09mkdir $(DISTDIR)
! =09cp $(metagrammar_SEMANTIC_GRAMMAR) $(metagrammar_SAMENATIC_GRAMMAR_EL)=
$(LOADDEFS) $(maintenance_LISP) $(scripts_MISC) $(example_MISC) $(init_LIS=
P) $(semantic_LISP) $(Languages_LISP) $(tools_LISP) $(senator_LISP) $(misc_=
AUX) $(ede_FILES) $(DISTDIR)
=09cd wisent; $(MAKE) $(MFLAGS) DISTDIR=3D$(DISTDIR)/wisent dist
=09cd tests; $(MAKE) $(MFLAGS) DISTDIR=3D$(DISTDIR)/tests dist
=09cd doc; $(MAKE) $(MFLAGS) DISTDIR=3D$(DISTDIR)/doc dist
Index: cedet/semantic/wisent/Makefile
diff -c cedet/semantic/wisent/Makefile:1.12 cedet/semantic/wisent/Makefile:=
1.12.2.1
*** cedet/semantic/wisent/Makefile:1.12=09Wed Oct 1 18:40:36 2003
--- cedet/semantic/wisent/Makefile=09Wed Oct 22 08:55:07 2003
***************
*** 13,19 ****
EMACS=3Demacs
LOADPATH=3D../../common/ ../bovine/ ../ ../../common/ ../ ../../eieio/\
=20
! wisent_LISP=3Dwisent.el wisent-bovine.el wisent-comp.el wisent-expr.el wi=
sent-grammar.el wisent-debug.el
taggers_SEMANTIC_GRAMMAR=3Dwisent-java-tags.wy wisent-awk.wy wisent-calc.=
wy wisent-cim.wy wisent-java.wy wisent-python.wy
EMACS=3Demacs
taggers_SAMENATIC_GRAMMAR_EL=3Dwisent-java-tags-wy.el wisent-awk-wy.el wi=
sent-calc-wy.el wisent-cim-wy.el wisent-java-wy.el wisent-python-wy.el
--- 13,19 ----
EMACS=3Demacs
LOADPATH=3D../../common/ ../bovine/ ../ ../../common/ ../ ../../eieio/\
=20
! wisent_LISP=3Dwisent.el wisent-bovine.el wisent-comp.el wisent-expr.el wi=
sent-grammar.el wisent-debug.el wisent-grammar-macros.el
taggers_SEMANTIC_GRAMMAR=3Dwisent-java-tags.wy wisent-awk.wy wisent-calc.=
wy wisent-cim.wy wisent-java.wy wisent-python.wy
EMACS=3Demacs
taggers_SAMENATIC_GRAMMAR_EL=3Dwisent-java-tags-wy.el wisent-awk-wy.el wi=
sent-calc-wy.el wisent-cim-wy.el wisent-java-wy.el wisent-python-wy.el
Index: cedet/semantic/wisent/Project.ede
diff -c cedet/semantic/wisent/Project.ede:1.10 cedet/semantic/wisent/Projec=
t.ede:1.10.2.1
*** cedet/semantic/wisent/Project.ede:1.10=09Tue Sep 16 10:45:16 2003
--- cedet/semantic/wisent/Project.ede=09Wed Oct 22 08:54:48 2003
***************
*** 12,18 ****
(ede-proj-target-elisp "wisent"
:name "wisent"
:path ""
! :source '("wisent.el" "wisent-bovine.el" "wisent-comp.el" "wisent-exp=
r.el" "wisent-grammar.el" "wisent-debug.el")
:aux-packages '("semantic" "semantic-java" "inversion")
)
(semantic-ede-proj-target-grammar "taggers"
--- 12,18 ----
(ede-proj-target-elisp "wisent"
:name "wisent"
:path ""
! :source '("wisent.el" "wisent-bovine.el" "wisent-comp.el" "wisent-exp=
r.el" "wisent-grammar.el" "wisent-debug.el" "wisent-grammar-macros.el")
:aux-packages '("semantic" "semantic-java" "inversion")
)
(semantic-ede-proj-target-grammar "taggers"
|