CVS update by michaels packages/xemacs-packages ...

[xemacs-cvs at xemacs.org]

  User: michaels
  Date: 07/11/26 16:25:50

  Modified:    packages/xemacs-packages Makefile
Log:
2007-10-30  Mike Sperber  <mike at xemacs.org>

	* package-compile.el (package-directory-map):
	* xemacs-packages/Makefile (PACKAGES): Add cedet-common,
	cogre, ede.

Revision  Changes    Path
1.718     +6 -0      XEmacs/packages/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.717
retrieving revision 1.718
diff -u -p -r1.717 -r1.718
--- ChangeLog	2007/11/11 19:21:42	1.717
+++ ChangeLog	2007/11/26 15:25:49	1.718
@@ -1,3 +1,9 @@
+2007-10-30  Mike Sperber  <mike at xemacs.org>
+
+	* package-compile.el (package-directory-map):
+	* xemacs-packages/Makefile (PACKAGES): Add cedet-common,
+	cogre, ede.
+
 2007-11-11  Norbert Koch  <viteno at xemacs.org>
 
 	* Packages released: dired.



1.73      +27 -17    XEmacs/packages/package-compile.el

Index: package-compile.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/package-compile.el,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- package-compile.el	2007/08/14 21:23:08	1.72
+++ package-compile.el	2007/11/26 15:25:49	1.73
@@ -103,7 +103,9 @@
     ("calc" . "xemacs-packages")
     ("calendar" . "xemacs-packages")
     ("cc-mode" . "xemacs-packages")
+    ("cedet-common" . "xemacs-packages")
     ("clearcase" . "xemacs-packages")
+    ("cogre" . "xemacs-packages")
     ("cookie" . "xemacs-packages")
     ("crisp" . "xemacs-packages")
     ("debug" . "xemacs-packages")
@@ -112,6 +114,7 @@
     ("dired" . "xemacs-packages")
     ("ecb" . "xemacs-packages")
     ("ecrypto" . "xemacs-packages")
+    ("ede" . "xemacs-packages")
     ("edebug" . "xemacs-packages")
     ("ediff" . "xemacs-packages")
     ("edit-utils" . "xemacs-packages")
@@ -226,7 +229,7 @@
     (setq defdir (expand-file-name (concat defdir "/.."))))
   (setq package-source-root defdir))
 
-(defun package-name-to-directory (package)
+(defun package-name-to-directories (package)
   "Map `package' to a source directory."
   (let* ((area (or (cdr (assoc package package-directory-map))
 		   (error (concat "%s is not in `package-directory-map'.  "
@@ -244,12 +247,16 @@
 	       (equal package "x-symbol")
 	       (equal package "xlib")
 	       (equal package "xwem"))
-	   (expand-file-name "lisp" (file-name-as-directory dir)))
+	   (list (expand-file-name "lisp" (file-name-as-directory dir))))
 	  ((equal package "mew")
-	   (expand-file-name "mew" (file-name-as-directory dir)))
+	   (list (expand-file-name "mew" (file-name-as-directory dir))))
 	  ((equal package "zenirc")
-	   (expand-file-name "src" (file-name-as-directory dir)))
-	  (t dir))))
+	   (list (expand-file-name "src" (file-name-as-directory dir))))
+	  ((equal package "semantic")
+	   (list dir
+		 (expand-file-name "bovine" (file-name-as-directory dir))
+		 (expand-file-name "wisent" (file-name-as-directory dir))))
+	  (t (list dir)))))
 
 (defvar depends nil)
 (defvar command-line-args-left)
@@ -264,19 +271,22 @@
 
 ;; Setup load-path, data-directory-list and load necessary auto-autoloads
 (while depends
-  (let* ((dir (package-name-to-directory (car depends)))
-	 (etc-dir (expand-file-name "etc" dir)))
-    (when (null dir)
+  (let ((dirs (package-name-to-directories (car depends))))
+    (when (null dirs)
       (error "%s is not in `package-directory-map'.  See: package-compile.el"
-	     dir))
-    (push dir load-path)
-    ;; This assumes package has layout *-packages/package/etc/package
-    ;; This is the case for the only package it matters at the time or writing
-    ;; which is ps-print
-    (if (file-directory-p (expand-file-name (car depends) etc-dir))
-	(push (file-name-as-directory etc-dir) data-directory-list))
-    (load (expand-file-name "auto-autoloads" dir))
-    (pop depends)))
+	     (car depends)))
+    (let* ((dir (car dirs))
+	   (etc-dir (expand-file-name "etc" dir)))
+      (while dirs
+	(push (car dirs) load-path)
+	(setq dirs (cdr dirs)))
+      ;; This assumes package has layout *-packages/package/etc/package
+      ;; This is the case for the only package it matters at the time or writing
+      ;; which is ps-print
+      (if (file-directory-p (expand-file-name (car depends) etc-dir))
+	  (push (file-name-as-directory etc-dir) data-directory-list))
+      (load (expand-file-name "auto-autoloads" dir))
+      (pop depends))))
 
 ;; Lastly, add the current directory
 (push default-directory load-path)



1.42      +1 -1      XEmacs/packages/xemacs-packages/Makefile

Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/Makefile,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- Makefile	2007/09/16 19:39:28	1.41
+++ Makefile	2007/11/26 15:25:50	1.42
@@ -41,7 +41,7 @@ PACKAGES := xemacs-base fsf-compat mail-
 	apel cc-mode debug dired ecrypto edit-utils elib eterm ispell \
 	os-utils sh-script texinfo text-modes xlib \
 	\
-	edebug efs eieio net-utils xemacs-devel \
+	edebug efs cedet-common cogre eieio ede net-utils xemacs-devel \
 	\
 	Sun ada auctex bbdb build c-support calc calendar clearcase \
 	cookie crisp dictionary docbookide easypg ecb ediff edt emerge \