I hope that this is the right place for this. If not, please accept my apologies and let me know where I should send it.
I've cleaned up the build under XEmacs a bit. Build the auto-autoloads properly, got rid of all of the undefined function warnings, and a couple of bound but not referenced variable warnings. My archive is at... [EMAIL PROTECTED] http://www.youngs.au.com/archives/2004 And here is the patch... Revision: xtla--xemacs--0.1--patch-1 Archive: [EMAIL PROTECTED] Creator: Steve Youngs <[EMAIL PROTECTED]> Date: Thu Nov 4 15:24:22 EST 2004 Standard-date: 2004-11-04 05:24:22 GMT New-files: lisp/xtlahack.el Modified-files: lisp/Makefile.in lisp/xtla-browse.el lisp/xtla.el texinfo/Makefile.in New-patches: [EMAIL PROTECTED] Summary: XEmacs related build fixes Keywords: xemacs, compile * lisp/Makefile.in (EMACS_PROG): Use `-batch -no-autoloads' when building with XEmacs to ensure a cleaner build environment. (XSRCS): Remove `auto-autoloads.el' because we handle it slightly differently in XEmacs. (PRELOADS): New. (AUTOLOAD_PACKAGE_NAME): New. (AUTOLOAD_FILE): New. (all): Remove `$(INSTALL_FILES)', add XEmacs specific targets `xemacs-autoloads', `$(XSRCS)', `xemacs-compile'. (custom-load.el): load `cus-dep' and byte-compile `custom-load.el'. (xemacs-autoloads): New. (xemacs-compile): New. * lisp/xtla.el: Don't span a sexp across multiple lines in `Local Variables', XEmacs throws an error otherwise. * lisp/xtla-browse.el (tla--widget-node-refresh): Use `tla--widget-get-ancestor' instead of `tla--widget-get-parent'. * lisp/xtlahack.el: New. * texinfo/Makefile.in (ARCH_DIR_EXISTS): Use [EMAIL PROTECTED]@' instead of [EMAIL PROTECTED]@' (xtla-version.texinfo): Ditto. * added files lisp/xtlahack.el {arch}/xtla/xtla--xemacs/xtla--xemacs--0.1/[EMAIL PROTECTED] * modified files --- orig/lisp/Makefile.in +++ mod/lisp/Makefile.in @@ -12,10 +12,15 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ -EMACS_PROG = @EMACS_PROG@ -no-site-file -no-init-file EMACS_FLAVOR = @EMACS_FLAVOR@ EMACS_VERSION = @EMACS_VERSION@ +ifeq (@EMACS_FLAVOR@,emacs) +EMACS_PROG = @EMACS_PROG@ -no-site-file -no-init-file +else +EMACS_PROG = @EMACS_PROG@ -batch -no-autoloads +endif + # Other settings OTHERDIRS = contrib @OTHERDIRS@ SYMLINKS = @SYMLINKS@ @@ -28,8 +33,11 @@ else SRCS = xtla.el xtla-core.el xtla-defs.el xtla-tips.el xtla-xemacs.el xtla-tests.el \ contrib/ewoc.el -XSRCS = auto-autoloads.el custom-load.el xtla-version.el +XSRCS = custom-load.el xtla-version.el PACKAGEDIR = @lispdir@ +PRELOADS = -eval \("push default-directory load-path"\) -l xtlahack +AUTOLOAD_PACKAGE_NAME = (setq autoload-package-name \"xtla\") +AUTOLOAD_FILE = (setq generated-autoload-file \"./auto-autoloads.el\") endif ifeq (@HAS_TREE_WIDGET@,yes) @@ -42,7 +50,7 @@ ifeq (@EMACS_FLAVOR@,emacs) all: Makefile $(INSTALL_FILES) else -all: Makefile $(INSTALL_FILES) +all: Makefile xemacs-autoloads $(XSRCS) xemacs-compile endif Makefile: @[EMAIL PROTECTED] ../config.status @@ -158,8 +166,23 @@ ############################################################################## +# XEmacs targets custom-load.el: $(SRCS:[EMAIL PROTECTED]@/%) - $(EMACS_PROG) -batch -q -f Custom-make-dependencies . + $(EMACS_PROG) -l cus-dep -f Custom-make-dependencies . + $(EMACS_PROG) -l bytecomp \ + -f batch-byte-compile ./custom-load.el + +xemacs-autoloads: $(SRCS:[EMAIL PROTECTED]@/%) + $(EMACS_PROG) \ + -eval "$(AUTOLOAD_PACKAGE_NAME)" \ + -eval "$(AUTOLOAD_FILE)" \ + -l autoload -f batch-update-autoloads $^ + $(EMACS_PROG) -l bytecomp \ + -f batch-byte-compile ./auto-autoloads.el + +xemacs-compile: $(SRCS:[EMAIL PROTECTED]@/%) + $(EMACS_PROG) $(PRELOADS) -l bytecomp \ + -f batch-byte-compile $^ ############################################################################## ARCH_DIR_EXISTS=${shell if [ -r '@[EMAIL PROTECTED]' ]; then printf "%s" yes; else printf "%s" no; fi } --- orig/lisp/xtla-browse.el +++ mod/lisp/xtla-browse.el @@ -372,7 +372,7 @@ t) (tla--archive-tree-build-archives nil t)))) (let* ((widget (tla--widget-node-get-at point)) - (tree (tla--widget-get-parent widget level))) + (tree (tla--widget-get-ancestor widget level))) (widget-put tree :args nil) (widget-value-set tree (widget-value tree)) (widget-setup))) --- orig/lisp/xtla.el +++ mod/lisp/xtla.el @@ -9180,9 +9180,7 @@ ;; (reporting bugs should be easy ;-) ;; Local Variables: -;; eval: (when (featurep 'checkdoc) -;; (delete '("changes" . "change") -;; checkdoc-common-verbs-wrong-voice)) +;; eval: (when (featurep 'checkdoc) (delete '("changes" . "change") checkdoc-common-verbs-wrong-voice)) ;; eval: (setq checkdoc-common-verbs-regexp nil) ;; End: --- orig/texinfo/Makefile.in +++ mod/texinfo/Makefile.in @@ -103,10 +103,10 @@ .PHONY: pdf dvi html info clean distclean install-pkg uninstall-pkg all -ARCH_DIR_EXISTS=${shell if [ -r '@[EMAIL PROTECTED]' ]; then printf "%s" yes; else printf "%s" no; fi } +ARCH_DIR_EXISTS=${shell if [ -r '@[EMAIL PROTECTED]' ]; then printf "%s" yes; else printf "%s" no; fi } ifeq ($(ARCH_DIR_EXISTS),yes) -xtla-version.texinfo: @[EMAIL PROTECTED] +xtla-version.texinfo: @[EMAIL PROTECTED] $(RM) -f $@ printf "%s" "@verbatim " >> $@ if [ "x$(RELEASE_ID)" != "x" ]; then \ --- /dev/null 1994-07-18 09:46:18.000000000 +1000 +++ lisp/xtlahack.el 2004-11-04 14:48:00.000000000 +1000 @@ -0,0 +1,34 @@ +;; Things needed to ensure a clean build for XEmacs. +(when (featurep 'xemacs) + (if (emacs-version>= 21 5) + (autoload 'setenv "process" nil t) + (autoload 'setenv "env" nil t)) + (autoload 'ad-add-advice "advice") + (autoload 'customize-group "cus-edit" nil t) + (autoload 'dired "dired" nil t) + (autoload 'dired-other-window "dired" nil t) + (autoload 'easy-mmode-define-keymap "easy-mmode") + (autoload 'minibuffer-prompt-end "completer") + (autoload 'mouse-avoidance-point-position "avoid") + (autoload 'read-passwd "passwd") + (autoload 'regexp-opt "regexp-opt") + (autoload 'reporter-submit-bug-report "reporter") + (autoload 'tla--flash-line "xtla") + (autoload 'tla-tree-root "xtla") + (autoload 'view-file-other-window "view-less" nil t) + (autoload 'view-mode "view-less" nil t) + (autoload 'with-electric-help "ehelp") + (defalias 'compute-motion 'ignore) + (defalias 'define-key-after 'ignore) + (defalias 'easy-menu-create-menu 'ignore) + (defalias 'event-basic-type 'ignore) + (defalias 'help-setup-xref 'ignore) + (defalias 'hl-line-mode 'ignore) + (defalias 'smerge-find-conflict 'ignore) + (defalias 'smerge-mode 'ignore) + (defalias 'tla--mouse-avoidance-point-position 'mouse-avoidance-point-position) + (defalias 'window-edges 'ignore) + (defvar smerge-mode)) + +;;; xtlahack.el ends here +;; arch-tag: dfc914ba-8da6-470b-995b-03b09cd66592 -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | Te audire no possum. | | Musa sapientum fixa est in aure. | |----------------------------------<[EMAIL PROTECTED]>---|
pgpyOFK4bAEgN.pgp
Description: PGP signature
