Mercurial > hg > xemacs-beta
annotate nt/make-build-dir @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 09 Jul 2008 20:46:22 +0200 |
| parents | 4542b72c005e |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 1330 | 1 : #-*- Perl -*- |
| 2 | |
| 3 # Create skeleton build tree | |
| 4 # | |
| 5 # Copyright (C) 2003 Ben Wing. | |
| 6 # | |
| 7 # This file is part of XEmacs. | |
| 8 # | |
| 9 # XEmacs is free software; you can redistribute it and/or modify it | |
| 10 # under the terms of the GNU General Public License as published by the | |
| 11 # Free Software Foundation; either version 2, or (at your option) any | |
| 12 # later version. | |
| 13 # | |
| 14 # XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 # for more details. | |
| 18 # | |
| 19 # You should have received a copy of the GNU General Public License | |
| 20 # along with XEmacs; see the file COPYING. If not, write to | |
| 21 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 # Boston, MA 02111-1307, USA. | |
| 23 # | |
| 24 # Author: Ben Wing <ben@xemacs.org> | |
| 25 # | |
| 26 # Synched up with: Not in FSF. | |
| 27 | |
| 28 eval 'exec perl -w -S $0 ${1+"$@"}' | |
| 29 if 0; | |
| 30 | |
| 31 use File::Copy; | |
| 32 use File::Basename; | |
| 33 use Cwd; | |
| 34 | |
| 35 die "Creates a skeleton build tree for use with SOURCE_DIR in config.inc. | |
| 36 | |
| 37 Usage: $0 PATH | |
| 38 " if ($#ARGV); | |
| 39 | |
| 40 my $path = $ARGV[0]; | |
| 41 # Sometimes perl sucks, too. To get the equivalent of expand-file-name | |
| 42 # in a reliable way, you have to do really weird shit, it seems. | |
| 43 my $cwd = cwd (); | |
| 44 $0 =~ s|\\|/|g; | |
| 45 chdir (dirname ($0)); | |
| 46 my $srcroot = dirname (cwd ()); | |
| 47 | |
| 48 # Convert the path to MS Windows format if we're running Cygwin Perl. | |
| 49 chomp ($srcroot = `cygpath -w $srcroot`) if ($^O eq "cygwin"); | |
| 50 $srcroot =~ s|/|\\|g; | |
| 51 | |
| 52 chdir ($cwd); | |
| 53 | |
| 54 print "Creating skeleton build tree in $path\n"; | |
| 55 mkdir $path if ! -e $path; | |
| 56 mkdir "$path/nt" if ! -e "$path/nt"; | |
| 57 copy("$srcroot/nt/xemacs.mak", "$path/nt/xemacs.mak") if ! -e "$path/nt/xemacs.mak"; | |
| 58 | |
| 59 &HackFile ("config.inc.samp"); | |
| 60 &HackFile ("config.inc") if -e "$srcroot/nt/config.inc"; | |
| 61 | |
| 62 sub HackFile | |
| 63 { | |
| 64 my $file = $_[0]; | |
| 65 if (! -e "$path/nt/$file") | |
| 66 { | |
| 67 open IN, "<$srcroot/nt/$file"; | |
| 68 open OUT, ">$path/nt/$file"; | |
| 69 | |
| 70 while (<IN>) | |
| 71 { | |
| 72 # Must hack away CRLF junk. Perl sucks again. Wouldn't it be | |
| 73 # nice if perl handled this right?? Really can't be that hard!!! | |
| 74 s/\r\n/\n/g; | |
| 75 | |
| 76 # hack the SOURCE_DIR line to point back to the source. | |
| 77 s!^# SOURCE_DIR=.*!SOURCE_DIR=$srcroot!; | |
| 78 | |
| 79 print OUT; | |
| 80 } | |
| 81 | |
| 82 close IN; | |
| 83 close OUT; | |
| 84 } | |
| 85 } |