Mercurial > hg > xemacs-beta
view nt/make-nt-depend @ 4745:0c54de4c4b9d
Resolve the unregistered-CCL-programs-get-garbage-collected problem correctly
src/ChangeLog addition:
2009-11-15 Aidan Kehoe <kehoea@parhasard.net>
* mule-ccl.c (CCL_CALL_FOR_MAP_INSTRUCTION): Assert that we always
have a symbol in this macro.
(setup_ccl_program): Ensure we're not allocating unreachable
memory in this function; all symbols must have been resolved in a
given CCL program before this function is called.
(find_ccl_program): New function, return a CCL program with all
its symbols resolved if it is valid (possibly allocating memory),
Qnil otherwise.
(get_ccl_program): New function, exported to other files; call
find_ccl_program, and error if it gives nil.
(Fccl_program_p): Call find_ccl_program from this function instead
of implementing the bulk of it here.
(Fccl_execute): Call get_ccl_program instead of implementing the
bulk of it here.
(Fccl_execute_on_string): Ditto.
* mule-ccl.h (Vfont_ccl_encoder_alist): Remove this declaration,
it hasn't been used in years.
(get_ccl_program): Declare this function.
* mule-coding.c (ccl_putprop): Use get_ccl_program on any
specified encode or decode CCL program property.
(fixed_width_putprop): Ditto.
* mule-charset.c (Fmake_charset): Use get_ccl_program on any
specified ccl-program.
(Fset_charset_ccl_program): Ditto.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 15 Nov 2009 16:53:14 +0000 |
parents | 4542b72c005e |
children | 308d34e9f07d |
line wrap: on
line source
: #-*- Perl -*- # Generate dependency info in a form acceptable to nmake # # Copyright (C) 2000, 2002 Jonathan Harris. # # 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. # # Author: Jonathan Harris <jonathan@xemacs.org> # # Synched up with: Not in FSF. use Getopt::Long; my $optsok = GetOptions ('src=s' => \$src, 'config=s' => \$config, 'obj=s' => \$obj); die "Generates nmake dependencies for the XEmacs src directory. Usage: $0 --src SRCDIR --config CONFIGDIR --obj OBJDIR SRCDIR Location of XEmacs sources CONFIGDIR Location of config.inc OBJDIR Location for compiler-generated object files Expects output from src/make-src-depend on stdin. The dependencies are written to stdout. " if (@ARGV || !$optsok || !defined ($src) || !defined ($config) || !defined ($obj)); while (<>) { # must hack away CRLF junk. wouldn't it be nice if perl handled this # right?? really can't be that hard!!! s/\r\n/\n/g; # rewrite references to generating script s/make-src-depend/make-nt-depend/; # rewrite '#if defined(...)' into nmake syntax s/^#if defined(.+)/!if defined$1/; # rewrite '#else' and '#endif' into nmake syntax s/^#e/!e/; # add src path to source filenames # allow for source filename being used in variable assignment s/([\s=])([\w\d\.\-]+\.[ch])/$1$src\\$2/g; # add obj path to object filenames # rewrite .o to .obj s/^(.+)\.o:(.+)/$obj\\$1.obj:$2/; # add dependency on config.inc wherever config.h is. s/\\config.h/\\config.h $config\\config.inc/; print; }