Skip to content

Commit

Permalink
Merge apel-mcs-2-9_12_2.
Browse files Browse the repository at this point in the history
  • Loading branch information
morioka committed Feb 27, 1999
1 parent 821329f commit 2073495
Show file tree
Hide file tree
Showing 15 changed files with 484 additions and 195 deletions.
70 changes: 49 additions & 21 deletions APEL-MK
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@

;;; Code:

(defun install-just-print-p ()
(let ((flag (getenv "MAKEFLAGS"))
case-fold-search)
(princ (format "%s\n" flag))
(if flag
(string-match "^\\(\\(--[^ ]+ \\)+-\\|[^ =-]\\)*n" flag)
)))

(defun config-apel ()
(let (prefix lisp-dir version-specific-lisp-dir)
(and (setq prefix (car command-line-args-left))
Expand Down Expand Up @@ -41,9 +49,10 @@

(defun install-apel ()
(compile-apel)
(install-elisp-modules emu-modules "." EMU_DIR)
(install-elisp-modules apel-modules "." APEL_DIR)
)
(let ((just-print (install-just-print-p)))
(install-elisp-modules emu-modules "." EMU_DIR just-print)
(install-elisp-modules apel-modules "." APEL_DIR just-print)
))

(defun config-apel-package ()
(let (package-dir)
Expand All @@ -62,25 +71,44 @@
(config-apel-package)
(load "EMU-ELS")

(compile-elisp-modules emu-modules ".")
(compile-elisp-modules apel-modules ".")

(let ((dir (expand-file-name APEL_PREFIX
(expand-file-name "lisp"
PACKAGEDIR))))
(install-elisp-modules emu-modules "." dir)
(install-elisp-modules apel-modules "." dir)
(let ((just-print (install-just-print-p)))
(compile-elisp-modules emu-modules ".")
(compile-elisp-modules apel-modules ".")

(setq autoload-package-name "apel")
(add-to-list 'command-line-args-left dir)
(batch-update-directory)

(add-to-list 'command-line-args-left dir)
(Custom-make-dependencies)

(byte-compile-file (expand-file-name "auto-autoloads.el" dir))
(byte-compile-file (expand-file-name "custom-load.el" dir))
))
(let ((dir (expand-file-name APEL_PREFIX
(expand-file-name "lisp"
PACKAGEDIR))))
(install-elisp-modules emu-modules "." dir just-print)
(install-elisp-modules apel-modules "." dir just-print)

(if just-print
(progn
(princ (format "Updating autoloads in directory %s..\n\n" dir))

(princ (format "Processing %s\n" dir))
(princ "Generating custom-load.el...\n\n")

(princ (format "Compiling %s...\n"
(expand-file-name "auto-autoloads.el" dir)))
(princ (format "Wrote %s\n"
(expand-file-name "auto-autoloads.elc" dir)))

(princ (format "Compiling %s...\n"
(expand-file-name "custom-load.el" dir)))
(princ (format "Wrote %s\n"
(expand-file-name "custom-load.elc" dir)))
)
(setq autoload-package-name "apel")
(add-to-list 'command-line-args-left dir)
(batch-update-directory)

(add-to-list 'command-line-args-left dir)
(Custom-make-dependencies)

(byte-compile-file (expand-file-name "auto-autoloads.el" dir))
(byte-compile-file (expand-file-name "custom-load.el" dir))
)
)))

(defun what-where-apel ()
(config-apel)
Expand Down
117 changes: 116 additions & 1 deletion ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,118 @@
1999-02-26 MORIOKA Tomohiko <morioka@jaist.ac.jp>

* APEL-MK (install-just-print-p): Modify for special option of GNU
make.

1999-02-26 MORIOKA Tomohiko <morioka@jaist.ac.jp>

* APEL-MK (install-just-print-p): New function.
(install-apel): Use `install-just-print-p'.
(install-apel-package): Likewise.

1999-02-25 MORIOKA Tomohiko <morioka@jaist.ac.jp>

* Makefile (install): Add voodoo comment `# $(MAKE)'.
(install-package): Likewise.

* APEL-MK (install-apel): Run installer with `just-print' mode if
environment variable "MAKEFLAGS" matches "^[^ =]*n" option.
(install-apel-package): Likewise.

1999-02-21 Mikio Nakajima <minakaji@osaka.email.ne.jp>

* install.el (install-file): New optional argument JUST-PRINT.
(install-files): Likewise.
(install-elisp-module): Likewise.
(install-elisp-modules): Likewise.

1999-02-18 Keiichi Suzuki <kei-suzu@mail.wbs.ne.jp>

* mcs-e20.el (coding-system-get): New function.
(mime-charset-list): Fix for Emacs 20.2.

1999-02-14 Katsumi Yamaoka <yamaoka@jpl.org>

* mcs-om.el (default-mime-charset-for-write): Delete the remaining
arguments for `defcustom'.

1999-02-13 Tanaka Akira <akr@jaist.ac.jp>

* mcs-e20.el (charsets-mime-charset-alist): Don't set up
`iso-2022-int-1' in default.

1999-02-11 Tanaka Akira <akr@jaist.ac.jp>

* README.en, README.ja, pccl.el: pccl does not support Mule 1.x.

* pccl-20.el: Update broken facility message with Emacs version
it fixes.

1999-02-07 MORIOKA Tomohiko <morioka@jaist.ac.jp>

* install.el (install-prefix): Modify for Meadow.

1999-01-26 MORIOKA Tomohiko <morioka@jaist.ac.jp>

* mcs-20.el (mime-charset-to-coding-system-default-method): New
user option.
(mime-charset-to-coding-system): Call
`mime-charset-to-coding-system-default-method' if suitable
coding-system is not found.

1999-01-21 Keiichi Suzuki <kei-suzu@mail.wbs.ne.jp>

* mcs-xm.el (encode-mime-charset-region): Add new optional
argument `lbt'.
(encode-mime-charset-string): Ditto.

* mcs-nemacs.el (lbt-to-string): New inline function.
(encode-mime-charset-region): Add new optional argument `lbt'.
(encode-mime-charset-string): Ditto.

* mcs-ltn1.el (lbt-to-string): New inline function.
(encode-mime-charset-region): Add new optional argument `lbt'.
(encode-mime-charset-string): Ditto.
(decode-mime-charset-region): Use `lbt-to-string'.

* mcs-e20.el (encode-mime-charset-region): Add new optional
argument `lbt'.
(encode-mime-charset-string): Ditto.

* mcs-om.el (lbt-to-string): New inline function.
(encode-mime-charset-region): Add new optional argument `lbt'.
(encode-mime-charset-string): Ditto.
(decode-mime-charset-region): Use `lbt-to-string'.
(decode-mime-charset-string): Ditto.

1998-12-24 MORIOKA Tomohiko <morioka@jaist.ac.jp>

* mcs-om.el (default-mime-charset-for-write): New variable.
(detect-mime-charset-region): Return
`default-mime-charset-for-write' if suitable mime-charset is not
found.

* mcs-20.el (detect-mime-charset-region): Don't call
`default-mime-charset-detect-method-for-write' if suitable
mime-charset is found.

* mcharset.el (charsets-to-mime-charset): Return nil if suitable
mime-charset is not found; abolish optional argument `default'.

1998-12-23 MORIOKA Tomohiko <morioka@jaist.ac.jp>

* mcs-xm.el (charsets-mime-charset-alist): Don't set up
`iso-2022-int-1' in default.

* mcs-20.el (default-mime-charset-for-write): New user option.
(default-mime-charset-detect-method-for-write): New user option.
(detect-mime-charset-region): Refer
`default-mime-charset-detect-method-for-write' or
`default-mime-charset-for-write' if suitable mime-charset is not
found.

* mcharset.el (charsets-to-mime-charset): Add new optional
argument `default'.

1999-02-26 Katsumi Yamaoka <yamaoka@jpl.org>

* poem-nemacs.el (find-file-noselect-as-coding-system): Bind
Expand Down Expand Up @@ -1299,7 +1414,7 @@
1998-04-27 MORIOKA Tomohiko <morioka@jaist.ac.jp>

* calist.el (ctree-find-calist): Renamed from
'ctree-match-calist-all.
'ctree-match-calist-all.


1998-04-25 MORIOKA Tomohiko <morioka@jaist.ac.jp>
Expand Down
5 changes: 3 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ elc:

install:
$(EMACS) $(FLAGS) -f install-apel $(PREFIX) $(LISPDIR) \
$(VERSION_SPECIFIC_LISPDIR)
$(VERSION_SPECIFIC_LISPDIR) # $(MAKE)


install-package:
$(XEMACS) $(FLAGS) -f install-apel-package $(PACKAGEDIR)
$(XEMACS) $(FLAGS) -f install-apel-package $(PACKAGEDIR) \
# $(MAKE)


what-where:
Expand Down
2 changes: 1 addition & 1 deletion README.en
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ What's APEL?
broken.el --- provide information of broken facilities of Emacs.

pccl.el --- utility to write portable CCL program
pccl-om.el --- for MULE 1.*, 2.*
pccl-om.el --- for MULE 2.*
pccl-20.el --- for Emacs 20/XEmacs-21-MULE

alist.el: utility for Association-list
Expand Down
2 changes: 1 addition & 1 deletion README.ja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ APEL $B$H$O!)(B
broken.el --- Emacs $B$N2u$l$F$$$k5!G=$N>pJs$rDs6!$9$k(B

pccl.el --- $B0\?"2DG=$J(B CCL $B%W%m%0%i%`$r=q$/$?$a$N%f!<%F%#%j%F%#!<(B
pccl-om.el --- MULE 1.*, 2.* $BMQ(B
pccl-om.el --- MULE 2.* $BMQ(B
pccl-20.el --- Emacs 20/XEmacs-21-MULE $BMQ(B

alist.el: $BO"A[%j%9%H$N$?$a$N%f!<%F%#%j%F%#!<(B
Expand Down
78 changes: 43 additions & 35 deletions install.el
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
;;; install.el --- Emacs Lisp package install utility

;; Copyright (C) 1996 Free Software Foundation, Inc.
;; Copyright (C) 1996,1997,1998,1999 Free Software Foundation, Inc.

;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
;; Created: 1996/08/18
;; Version: $Id$
;; Keywords: install, byte-compile, directory detection

;; This file is part of APEL (A Portable Emacs Library).
Expand Down Expand Up @@ -57,59 +56,67 @@

(defvar install-overwritten-file-modes (+ (* 64 6)(* 8 4) 4))

(defun install-file (file src dest &optional move overwrite)
(let ((src-file (expand-file-name file src)))
(if (file-exists-p src-file)
(let ((full-path (expand-file-name file dest)))
(if (and (file-exists-p full-path) overwrite)
(delete-file full-path)
)
(copy-file src-file full-path t t)
(if move
(catch 'tag
(while (and (file-exists-p src-file)
(file-writable-p src-file))
(condition-case err
(progn
(delete-file src-file)
(throw 'tag nil)
)
(error (princ (format "%s\n" (nth 1 err))))
))))
(princ (format "%s -> %s\n" file dest))
))
))
(defun install-file (file src dest &optional move overwrite just-print)
(if just-print
(princ (format "%s -> %s\n" file dest))
(let ((src-file (expand-file-name file src)))
(if (file-exists-p src-file)
(let ((full-path (expand-file-name file dest)))
(if (and (file-exists-p full-path) overwrite)
(delete-file full-path)
)
(copy-file src-file full-path t t)
(if move
(catch 'tag
(while (and (file-exists-p src-file)
(file-writable-p src-file))
(condition-case err
(progn
(delete-file src-file)
(throw 'tag nil)
)
(error (princ (format "%s\n" (nth 1 err))))
))))
(princ (format "%s -> %s\n" file dest))
))
)))

(defun install-files (files src dest &optional move overwrite)
(defun install-files (files src dest &optional move overwrite just-print)
(or (file-exists-p dest)
(make-directory dest t)
)
(mapcar (function (lambda (file)
(install-file file src dest move overwrite)
(install-file file src dest move overwrite just-print)
))
files))


;;; @@ install Emacs Lisp files
;;;

(defun install-elisp-module (module src dest)
(defun install-elisp-module (module src dest &optional just-print)
(let (el-file elc-file)
(let ((name (symbol-name module)))
(setq el-file (concat name ".el"))
(setq elc-file (concat name ".elc"))
)
(let ((src-file (expand-file-name el-file src)))
(if (file-exists-p src-file)
(if (not (file-exists-p src-file))
nil
(if just-print
(princ (format "%s -> %s\n" el-file dest))
(let ((full-path (expand-file-name el-file dest)))
(if (file-exists-p full-path)
(delete-file full-path)
(delete-file full-path)
)
(copy-file src-file full-path t t)
(princ (format "%s -> %s\n" el-file dest))
))
)))
(setq src-file (expand-file-name elc-file src))
(if (file-exists-p src-file)
(if (not (file-exists-p src-file))
nil
(if just-print
(princ (format "%s -> %s\n" elc-file dest))
(let ((full-path (expand-file-name elc-file dest)))
(if (file-exists-p full-path)
(delete-file full-path)
Expand All @@ -125,15 +132,15 @@
(error (princ (format "%s\n" (nth 1 err))))
)))
(princ (format "%s -> %s\n" elc-file dest))
))
)))
)))

(defun install-elisp-modules (modules src dest)
(defun install-elisp-modules (modules src dest &optional just-print)
(or (file-exists-p dest)
(make-directory dest t)
)
(mapcar (function (lambda (module)
(install-elisp-module module src dest)
(install-elisp-module module src dest just-print)
))
modules))

Expand All @@ -142,7 +149,8 @@
;;;

(defvar install-prefix
(if (or running-emacs-18 running-xemacs)
(if (or running-emacs-18 running-xemacs
(string= system-configuration-options "NT")) ; for Meadow
(expand-file-name "../../.." exec-directory)
(expand-file-name "../../../.." data-directory)
)) ; install to shared directory (maybe "/usr/local")
Expand Down
Loading

0 comments on commit 2073495

Please sign in to comment.