Mercurial > hg > xemacs-beta
view lisp/make-docfile.el @ 4916:a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* configure:
* configure.ac (TAB):
USE_XFT* -> HAVE_XFT*.
lwlib/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* lwlib-colors.c:
* lwlib-colors.h:
* lwlib-fonts.c:
* lwlib-fonts.h:
* xlwmenu.c:
* xlwmenu.c (xlwMenuResources):
* xlwmenu.c (x_xft_text_width):
* xlwmenu.c (label_button_draw):
* xlwmenu.c (push_button_size):
* xlwmenu.c (push_button_draw):
* xlwmenu.c (make_drawing_gcs):
* xlwmenu.c (extract_font_extents):
* xlwmenu.c (default_font_of_font_list):
* xlwmenu.c (XlwMenuInitialize):
* xlwmenu.c (XlwMenuDestroy):
* xlwmenu.c (XlwMenuSetValues):
* xlwmenuP.h:
* xlwmenuP.h (_XlwMenu_part):
* xlwtabs.c:
* xlwtabs.c (TabsInit):
* xlwtabs.c (TabsDestroy):
* xlwtabs.c (TabsSetValues):
* xlwtabs.c (DrawTab):
* xlwtabs.c (TabWidth):
* xlwtabs.c (TabsAllocFgGC):
* xlwtabs.c (TabsAllocGreyGC):
* xlwtabsP.h:
USE_XFT* -> HAVE_XFT*.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* Makefile.in.in:
* compiler.h:
* config.h.in:
* console-x-impl.h:
* console-x-impl.h (struct x_frame):
* console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P):
* console-x.h:
* console-xlike-inc.h:
* emacs.c (main_1):
* faces.c (complex_vars_of_faces):
* font-mgr.h:
* frame-x.c (x_delete_frame):
* frame-x.c (x_update_frame_external_traits):
* glyphs-x.c (update_widget_face):
* inline.c:
* objects-x-impl.h:
* objects-x-impl.h (struct x_color_instance_data):
* objects-x-impl.h (struct x_font_instance_data):
* objects-x.c:
* objects-x.c (x_initialize_color_instance):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_print_font_instance):
* objects-x.c (x_finalize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (vars_of_objects_x):
* objects-x.h:
USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and
redisplay-xlike-inc.c, continue to use USE_XFT, and define
it appropriately in console-xlike-inc.h when both HAVE_XFT
and THIS_IS_X -- even if HAVE_XFT, we don't want to enable
XFT code when included in a *-gtk.c file.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 22:00:29 -0600 |
parents | ab9e8f0fb295 |
children | 788c38f20376 |
line wrap: on
line source
;;; make-docfile.el --- Cache docstrings in external file ;; Copyright (C) 1985, 1986, 1992-1995, 1997 Free Software Foundation, Inc. ;; Copyright (C) 2002, 2003 Ben Wing. ;; Author: Unknown ;; Maintainer: XEmacs Development Team ;; Keywords: internal ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the Free ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ;; 02111-1307, USA. ;;; Synched up with: Not in FSF ;;; Commentary: ;; This is a front-end to the make-docfile program that gathers up all the ;; lisp files that will be dumped with XEmacs. It would probably be best ;; to just move make-docfile.c completely to lisp and be done with it. ;;; Code: ;; Help debug problems. (setq stack-trace-on-error t load-always-display-messages t) (defvar options nil) (defvar processed nil) (defvar docfile nil) (defvar docfile-buffer nil) (defvar site-file-list nil) (defvar docfile-out-of-date nil) (defvar build-directory (expand-file-name ".." invocation-directory)) (defvar build-lib-src (expand-file-name "lib-src" build-directory)) (defvar source-lisp (file-name-directory (expand-file-name (nth 2 command-line-args)))) (defvar source-src (expand-file-name "../src" source-lisp)) (defun message (fmt &rest args) (princ (apply #'format fmt args)) (terpri)) ;; Gobble up the stuff we don't wish to pass on. (setq command-line-args (cdr (cdr (cdr (cdr command-line-args))))) ;; First gather up the command line options. (let (done) (while (and (null done) command-line-args) (let ((arg (car command-line-args))) (cond ((or (string-equal arg "-o") ; Specify DOC file name (string-equal arg "-a") ; Append to DOC file (string-equal arg "-d")) ; Set working directory (if (string-equal arg "-o") (setq docfile (expand-file-name (car (cdr command-line-args))))) (setq options (cons arg options)) (setq options (cons (expand-file-name (car (cdr command-line-args))) options))) ((string-equal arg "-i") ; Set site files to scan (setq site-file-list (car (cdr command-line-args)))) (t (setq done t))) (if (null done) (setq command-line-args (cdr (cdr command-line-args))))))) (setq options (nreverse options)) ;; (message (concat "Options: " (prin1-to-string options))) ;; insert-file-contents-internal calls out to `format-decode' afterwards, ;; so it must be defined. if non-zero, it tries to do a bunch more stuff ;; so say, "NOOOOOOOOOOOOO! Basta! Ca soufit! Enough, already, OK?" (defun format-decode (fuck me harder) 0) ;; Next process the list of C files. (defun process-args (args) (while args (let ((arg (car args))) ;; When called from xemacs.mak, we need to do some frobbing on the ;; args given to us -- remove NEEDTODUMP and make-docfile.exe, ;; convert .obj files into .c files in the source directory, ;; handle response files (beginning with @, specifying arguments), ;; due to line-length limitations in the shell. (if (string-match "^@" arg) ;; MS Windows response file ;; no generate-new-buffer so use its implementation. (let ((buf (get-buffer-create (generate-new-buffer-name "foo")))) (set-buffer buf) (insert-file-contents-internal (substring arg 1)) ;; now majorly grind up the response file. ;; backslashes get doubled, quotes around strings, ;; get rid of pesky CR's and NL's, and put parens around ;; the whole thing so we have a valid list of strings. (goto-char (point-max)) (insert "\")") (goto-char (point-min)) (insert "(\"") (while (search-forward "\\" nil t) (replace-match "\\\\" nil t)) (goto-char (point-min)) (while (search-forward "\n" nil t) (replace-match "" nil t)) (goto-char (point-min)) (while (search-forward "\r" nil t) (replace-match "" nil t)) (goto-char (point-min)) (while (search-forward " " nil t) (replace-match "\" \"" nil t)) (goto-char (point-min)) (process-args (read buf))) ;; remove NEEDTODUMP and make-docfile.exe, convert .obj files into ;; .c files in the source directory. (when (and (not (string-match "\\(NEEDTODUMP\\|\\.exe$\\)" arg)) (not (member arg processed))) (when (string-match "\\(.*\\)\\.obj$" arg) (setq arg (expand-file-name (concat (file-name-nondirectory ;; no match-string so use its implementation. (substring arg (match-beginning 1) (match-end 1))) ".c") source-src))) (if (and (null docfile-out-of-date) (file-newer-than-file-p arg docfile)) (setq docfile-out-of-date t)) (setq processed (cons arg processed)))) (setq args (cdr args))))) ;; Then process the list of Lisp files. (process-args command-line-args) (setq load-path (list source-lisp)) ;; Then process the autoloads (setq autoload-file-name "auto-autoloads.elc") (defvar custom-declare-variable-list nil) ; unclean (load "find-paths.el") (load "packages.el") (load "setup-paths.el") (load "raw-process.el") (let (preloaded-file-list arg0 arg package-preloaded-file-list absolute) (load (expand-file-name "dumped-lisp.el" source-lisp)) (setq package-preloaded-file-list (packages-collect-package-dumped-lisps late-package-load-path) preloaded-file-list (append package-preloaded-file-list preloaded-file-list packages-hardcoded-lisp) processed (cons "-d" processed) processed (cons source-lisp processed) ;; Include loadup.el, which is never in preloaded-file-list: processed (cons "loadup.el" processed)) (while preloaded-file-list (setq arg0 (packages-add-suffix (car preloaded-file-list)) arg (locate-library arg0) absolute arg) (if (null arg) (progn (message "Error: dumped file %s does not exist" arg0) ;; Uncomment in case of difficulties ;(message "late-package-hierarchies: %S" ; late-package-hierarchies) ;(message "guessed-roots: %S" (paths-find-emacs-roots ; invocation-directory ; invocation-name ; #'paths-emacs-root-p)) ;(message "guessed-data-roots: %S" (paths-find-emacs-roots ; invocation-directory ; invocation-name ; #'paths-emacs-data-root-p)) ) (when (equal arg (expand-file-name arg0 source-lisp)) ;; Use relative paths where possible, since this makes file lookup ;; in an installed XEmacs easier: (setq arg arg0)) (if (null (member arg processed)) (progn (if (and (null docfile-out-of-date) ;; We need to check the absolute path here: (file-newer-than-file-p absolute docfile)) (setq docfile-out-of-date t)) (setq processed (cons arg processed))))) (setq preloaded-file-list (cdr preloaded-file-list)))) ;; Finally process the list of site-loaded files. (if site-file-list (let (site-load-packages) (load site-file-list t t) (while site-load-packages (let ((arg (car site-load-packages))) (if (null (member arg processed)) (progn (if (and (null docfile-out-of-date) (file-newer-than-file-p arg docfile)) (setq docfile-out-of-date t)) (setq processed (cons arg processed))))) (setq site-load-packages (cdr site-load-packages))))) ;(let ((autoloads (packages-list-autoloads-path))) ; ;; (message (concat "Autoloads: " (prin1-to-string autoloads))) ; (while autoloads ; (let ((arg (car autoloads))) ; (if (null (member arg processed)) ; (progn ; ;; (message arg) ; (if (and (null docfile-out-of-date) ; (file-newer-than-file-p arg docfile)) ; (setq docfile-out-of-date t)) ; (setq processed (cons arg processed)))) ; (setq autoloads (cdr autoloads))))) ;; Now fire up make-docfile and we're done (setq processed (nreverse processed)) (terpri) ;(message (prin1-to-string (append options processed))) (when docfile-out-of-date (condition-case nil (delete-file docfile) (error nil)) (message "Spawning make-docfile ...") ;; (message (prin1-to-string (append options processed))) (setq exec-path (list build-lib-src)) ;; (locate-file-clear-hashing nil) (if (memq system-type '(berkeley-unix next-mach)) ;; Suboptimal, but we have a unresolved bug somewhere in the ;; low-level process code. #### Now that we've switched to using ;; the regular asynch process code, we should try removing this. (call-process-internal "/bin/csh" nil t nil "-fc" (mapconcat #'identity (append (list (expand-file-name "make-docfile" build-lib-src)) options processed) " ")) ;; (message (prin1-to-string (append options processed))) (apply 'call-process-internal ;; exec-path is set. ;; (expand-file-name "make-docfile" build-lib-src) "make-docfile" nil t nil (append options processed))) (message "Spawning make-docfile ...done") ;; (write-region-internal (point-min) (point-max) "/tmp/DOC") ) (kill-emacs) ;;; make-docfile.el ends here