X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2FCOMPILE;h=05d22621632b47a6f78bd61f978eefba5f6b4984;hp=f8944ede3894a7c83a3ecf9f5f77711a376049eb;hb=435da3a1ba319a268ed60e38c2910ea5c2932775;hpb=962c527696ba17ee1416951701c236ee6a5dad4f

diff --git a/lisp/COMPILE b/lisp/COMPILE
index f8944ed..05d2262 100644
--- a/lisp/COMPILE
+++ b/lisp/COMPILE
@@ -7,6 +7,7 @@
 		'riece-emacs)
 	      '(riece-globals
 		riece-options
+		riece-debug
 		riece-version
 		riece-coding
 		riece-complete
@@ -71,18 +72,43 @@
 		riece-hangman
 		riece-biff
 		riece-kakasi
-		riece-yank))))
+		riece-yank
+		riece-toolbar
+		riece-eval
+		riece-google
+		riece-keepalive))))
+
+(defvar riece-icons
+  '(riece-command-quit
+    riece-command-join
+    riece-command-part
+    riece-command-previous-channel
+    riece-command-next-channel
+    riece-command-change-layout
+    riece-submit-bug-report))
 
 (defun riece-compile-modules (modules)
-  (let ((load-path (cons nil load-path)))
+  (let ((load-path (cons nil load-path))
+	error-modules)
     (while modules
       (let ((source (expand-file-name
 		     (concat (symbol-name (car modules)) ".el"))))
 	(if (file-newer-than-file-p source (concat source "c"))
 	    (condition-case error
 		(byte-compile-file source)
-	      (error))))
-      (setq modules (cdr modules)))))
+	      (error
+	       (setq error-modules (cons (car modules) error-modules))))))
+      (setq modules (cdr modules)))
+    (if error-modules
+	(princ (concat "\n\
+  WARNING: ---------------------------------------------------------
+  WARNING: Couldn't compile following modules:
+  WARNING: 
+  WARNING:   " (mapconcat #'symbol-name error-modules ", ") "\n\
+  WARNING: 
+  WARNING: You should probably stop here, try \"make distclean\" to clear
+  WARNING: the last build, and then reconfigure.
+  WARNING: ---------------------------------------------------------\n\n")))))
 
 (defun riece-install-modules (modules dest just-print)
   (unless (or just-print (file-exists-p dest))
@@ -104,6 +130,19 @@
 			 name)))))
     (setq modules (cdr modules))))
 
+(defun riece-install-icons (icons dest just-print)
+  (unless (or just-print (file-exists-p dest))
+    (make-directory dest t))
+  (while icons
+    (let ((name (symbol-name (car icons))))
+      (when (file-exists-p (expand-file-name (concat name ".xpm")))
+	(princ (format "%s.xpm -> %s\n" name dest))
+	(unless just-print
+	  (copy-file (expand-file-name (concat name ".xpm"))
+		     (expand-file-name (concat name ".xpm") dest)
+		     t t))))
+    (setq icons (cdr icons))))
+
 (defun riece-install-just-print-p ()
   (let ((flag (getenv "MAKEFLAGS"))
 	case-fold-search)
@@ -117,6 +156,10 @@
   (riece-install-modules
    riece-modules
    (expand-file-name "riece" (car command-line-args-left))
+   (riece-install-just-print-p))
+  (riece-install-icons
+   riece-icons
+   (expand-file-name "riece" (car command-line-args-left))
    (riece-install-just-print-p)))
 
 (defun riece-compile-package ()
@@ -133,6 +176,11 @@
   (riece-install-modules
    (append riece-modules
 	   '(auto-autoloads custom-load))
+   (expand-file-name "riece"
+		     (expand-file-name "lisp" (car command-line-args-left)))
+   (riece-install-just-print-p))
+  (riece-install-icons
+   riece-icons
    (expand-file-name "riece"
 		     (expand-file-name "lisp" (car command-line-args-left)))
    (riece-install-just-print-p)))
@@ -141,7 +189,7 @@
   (let ((load-path (cons (expand-file-name "test") (cons nil load-path)))
 	(files (directory-files "test" t "^test-.*\\.el$"))
         suite)
-    (require 'lunit)
+    (require 'lunit-report)
     (setq suite (lunit-make-test-suite))
     (while files
       (when (file-regular-p (car files))