Mercurial > emacs
view admin/make-emacs @ 94938:5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
conditionals. Don't check enable_font_backend. Delete all codes
used only when USE_FONT_BACKEND is not defined. Use
FONT_XXX_NAME_NUMERIC instead of face_numeric_xxx.
(QCfoundry, QCadstyle, QCregistry, QCspacing, QCsize, QCavgwidth)
(Qp): Extern them.
(clear_font_table, load_face_font, xlfd_lookup_field_contents):
Deleted.
(struct font_name): Deleted.
(xlfd_numeric_value, xlfd_symbolic_value): Deleted.
(compare_fonts_by_sort_order): New function.
(xlfd_numeric_slant, xlfd_symbolic_slant, xlfd_numeric_weight)
(xlfd_symbolic_weight, xlfd_numeric_swidth, xlfd_symbolic_swidth):
Deleted.
(Fx_family_fonts): Use font_list_entities, and sort fonts by
compare_fonts_by_sort_order.
(Fx_font_family_list): Call Ffont_family_list.
(face_numeric_value, face_numeric_weight, face_numeric_slant)
(face_numeric_swidth, face_symbolic_value, face_symbolic_weight)
(face_symbolic_slant, face_symbolic_swidth)
(split_font_name_into_vector, build_font_name_from_vector)
(xlfd_fixed_p, xlfd_point_size, pixel_point_size)
(font_rescale_ratio, split_font_name, build_font_name)
(free_font_names, sort_fonts, x_face_list_fonts)
(face_font_available_p, sorted_font_list, cmp_font_names)
(font_list_1, concat_font_list, font_list, remove_duplicates):
Deleted.
(Fx_list_fonts): Use Ffont_list.
(LFACE_AVGWIDTH): Deleted.
(check_lface_attrs): Don't check LFACE_AVGWIDTH. Check LFACE_FONT
by FONTP.
(lface_fully_specified_p): Don't check LFACE_AVGWIDTH.
(set_lface_from_font_name): Delete it.
(set_lface_from_font): Renamed from
set_lface_from_font_and_fontset. Caller changed. Don't set
LFACE_AVGWIDTH. Use FONT_XXX_FOR_FACE to get a symbol suitable
for face.
(merge_face_vectors): Copy font-spec if necessary. Clear
properties of the font-spec if necessary.
(merge_face_ref): Clear properties of the font-spec if necessary.
(Finternal_set_lisp_face_attribute): Likewise.
(set_font_frame_param): Use font_load_for_lface to load a
font-object, and call Fmodify_frame_parameters with it.
(x_update_menu_appearance): Don't check LFACE_AVGWIDTH. Get XLFD
font name by Ffont_xlfd_name.
(Finternal_lisp_face_attribute_values): Don't check QCweight,
QCslant, and QCwidth.
(Fface_font): Get a font name from font->props[FONT_NAME_INDEX].
(lface_same_font_attributes_p): Don't check LFACE_AVGWIDTH.
Compare fonts by EQ.
(lookup_non_ascii_face): Deleted.
(face_for_font): The 2nd argument changed.
(x_supports_face_attributes_p): Don't check LFACE_AVGWIDTH. Check
atomic font properties by case insensitive.
(realize_non_ascii_face): Set face->overstrike correctly.
(realize_x_face): Likewise. Check if LFACE_FONT is a font_object.
(dump_realized_face): Get font name from
font->props[FONT_NAME_INDEX]. Don't print font_info_id.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 14 May 2008 01:41:52 +0000 |
parents | e6db9ee945b8 |
children | ef8a2f248fb6 |
line wrap: on
line source
#! /usr/bin/perl # Build Emacs with various options for profiling, debugging, # with and without warnings enabled etc. # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. # This file is part of GNU Emacs. # GNU Emacs 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 3 of the License, or # (at your option) any later version. # GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. require 5; use Getopt::Long; use File::Basename; use Cwd; # Default CVS sandbox directory. Only used when called from outside # of the sandbox. $root = $ENV{"EMACS_ROOT"}; $root = "/gd/gnu/emacs" unless $root; # Default make command. $make = $ENV{"EMACS_MAKE"}; $make = "gmake" unless $make; $rc = GetOptions ("help" => \$help, "enable-checking" => \$enable_checking, "no-warn" => \$no_warn, "check-marked" => \$check_marked, "all" => \$all, "no-optim" => \$no_optim, "union-type" => \$union_type, "gprof" => \$profile, "malloc-check" => \$malloc_check, "no-mcheck" => \$no_mcheck, "alias" => \$aliasing, "boot" => \$boot, "wall" => \$wall, "gcc3" => \$gcc3, "trace-selection" => \$trace_selection, "trace-move" => \$trace_move, "stabs" => \$use_stabs, "optim" => \$optim); if ($rc == 0 || $help) { print <<USAGE; make-emacs [options] ... Build Emacs. --help show this help --all make clean versionclean first --boot make boostrap, log to boot.log --enable-checking ENABLE_CHECKING=1 --no-warn disable warnings --check-marked GC_CHECK_MARKED_OBJECTS=1 --optim no debug defines --gprof make Emacs for profiling --union-type define USE_LISP_UNION_TYPE (bad for GDB) --malloc-check define GC_MALLOC_CHECK --no-mcheck dont define GC_MCHECK --wall compile with -Wall --gcc3 use GCC 3.0 (30% slower compilation, slower code) --trace-selection print traces in xselect.c --trace-move print traces for move_it* functions --stabs use -gstabs instead -g Default is to compile with warnings, with -DGC_MCHECK=1, and with -DGLYPH_DEBUG=1. USAGE exit 1; } # Chdir to the top-level directory of the tree. If not in a tree # containing Emacs, use the default. while (! -f "src/emacs.c" && cwd () ne "/") { chdir ".."; } chdir $root if cwd () eq "/"; chdir "./src"; print "Build in ", cwd (), "\n"; # If first arg is `all' or if `--all' specified, ensure a clean # build. if (@ARGV && $ARGV[0] eq "all") { $all = 1; shift @ARGV; } system ("$make clean versionclean") if $all; if ($wall) { $warn = "-Wall"; } elsif (!$no_warn) { $warn = "-Wpointer-arith -Wchar-subscripts -Wformat -Wimplicit-int"; $warn = "$warn -Wreturn-type -Wswitch -Wuninitialized"; } $defs = "-DGLYPH_DEBUG=1" unless $optim; $defs = "$defs -DGC_CHECK_MARKED_OBJECTS=1" if $check_marked; $defs = "$defs -DENABLE_CHECKING=1" if $enable_checking; if ($profile) { $opts = "-pg"; $defs = "$defs -DPROFILING=1"; } else { if ($use_stabs) { $opts = "-gstabs"; } else { $opts = "-g"; } } $defs = "$defs -DUSE_LISP_UNION_TYPE" if $union_type; $defs = "$defs -DGC_MALLOC_CHECK=1 -DGC_PROTECT_MALLOC_STATE=1" if $malloc_check; $defs = "$defs -DGC_MCHECK=1" unless $no_mcheck; $defs = "$defs -DTRACE_SELECTION" if $trace_selection; $defs = "$defs -DDEBUG_TRACE_MOVE" if $trace_move; # arch=pentium leads to slightly faster code than without. $opts = "$opts -march=pentiumpro"; if ($optim) { $opts = "$opts -pipe -O3"; } elsif ($no_optim) { $opts = "$opts -pipe -fno-inline"; } else { $opts = "$opts -O -pipe -fno-inline"; } $opts = "$opts -fstrict-aliasing" if $aliasing; $opts = "$opts $defs" if $defs; $opts = "$opts $warn" if $warn; $cc = "/usr/bin/gcc"; $cc = "/gd/local/bin/gcc" if $gcc3; if ($boot) { chdir ".."; system "mv boot.log boot.log.old" if -f "boot.log"; exit system "script boot.log $make CC=\"$cc\" CFLAGS=\"$opts\" bootstrap"; } exit system "$make CC=\"$cc\" CFLAGS=\"$opts\" @ARGV"; # Local Variables: # mode: cperl # End: # arch-tag: 5c3f9713-9ece-4a12-b3f8-deaff15974ba