Mercurial > emacs
view admin/make-emacs @ 51195:3cbf29813eea
(struct frame): Rename members height to text_lines,
width to text_cols, window_height to total_lines, window_width to
total_cols, new_height to new_text_lines, new_width to
new_text_cols. All uses changed.
(struct frame): New members which consolidate common members of
x_output, w32_output, and mac_output structures: left_pos,
top_pos, pixel_height, pixel_width, x_pixels_diff, y_pixels_diff,
win_gravity, size_hint_flags, border_width, internal_border_width,
line_height, fringe_cols, left_fringe_width, right_fringe_width,
want_fullscreen. All uses changed.
(struct frame): New member column_width contaning the canonical
column width, analogue to line_height. All uses changed.
(struct frame): Rename members scroll_bar_pixel_width to
config_scroll_bar_width, and scroll_bar_cols to
config_scroll_bar_cols. All uses changed.
(struct frame): New member scroll_bar_actual_width which
consolidates and renames the vertical_scroll_bar_extra member of
x_output, w32_output, and mac_output structures. All uses changed.
(FRAME_PIXEL_HEIGHT): Renamed from PIXEL_HEIGHT and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_height.
(FRAME_PIXEL_WIDTH): Renamed from PIXEL_WIDTH and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_width.
(FRAME_LINES): Renamed from FRAME_HEIGHT. All uses changed.
Also change code which referred to f->height.
(FRAME_COLS): Renamed from FRAME_WIDTH. All uses changed.
Also change code which referred to f->width.
(FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses
to update new_text_lines and new_text_cols members directly.
(FRAME_CONFIG_SCROLL_BAR_WIDTH): Renamed from
FRAME_SCROLL_BAR_PIXEL_WIDTH. All uses changed.
(FRAME_CONFIG_SCROLL_BAR_COLS): Renamed from
FRAME_SCROLL_BAR_COLS. All uses changed.
(FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS):
Renamed from FRAME_LEFT_SCROLL_BAR_WIDTH and
FRAME_RIGHT_SCROLL_BAR_WIDTH, resp. All uses changed.
(FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros.
(FRAME_TOTAL_COLS): Renamed from FRAME_WINDOW_WIDTH.
(SET_FRAME_COLS): Renamed from SET_FRAME_WIDTH.
(FRAME_TOTAL_COLS_ARG): Renamed from FRAME_WINDOW_WIDTH_ARG.
(WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro.
(WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro.
(FRAME_LINE_HEIGHT): Renamed from CANON_Y_UNIT. Unconditionally
return line_height member (it now has proper value also for
non-window frames).
(FRAME_COLUMN_WIDTH): Renamed from CANON_X_UNIT. Unconditionally
return new column_width member (rather than the default font width).
(FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH)
(FRAME_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_... and moved
from x/w32/macterm.h files. Unconditionally return corresponding
member of frame structure (they now have proper values also for
non-window frames).
(FRAME_TOTAL_FRINGE_WIDTH): Renamed from FRAME_FRINGE_WIDTH.
Calculate return value from left and right widths.
(FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return
internal_border_width member (has proper value for non-window frame).
(FRAME_PIXEL_X_FROM_CANON_X): Renamed from PIXEL_X_FROM_CANON_X.
(FRAME_PIXEL_Y_FROM_CANON_Y): Renamed from PIXEL_Y_FROM_CANON_Y.
(FRAME_CANON_X_FROM_PIXEL_X): Renamed from CANON_X_FROM_PIXEL_X.
(FRAME_CANON_Y_FROM_PIXEL_Y): Renamed from CANON_Y_FROM_PIXEL_Y.
(FRAME_LINE_TO_PIXEL_Y): Renamed from CHAR_TO_PIXEL_ROW,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_COL_TO_PIXEL_X): Renamed from CHAR_TO_PIXEL_COL,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Renamed from
CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h.
(FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Renamed from
CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h.
(FRAME_PIXEL_Y_TO_LINE): Renamed from PIXEL_TO_CHAR_ROW
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_X_TO_COL): Renamed from PIXEL_TO_CHAR_COL
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Renamed from
PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h.
(FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Renamed from
PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 21:58:07 +0000 |
parents | 23a1cea22d13 |
children | 695cf19ef79e d7ddb3e565de |
line wrap: on
line source
#! /usr/bin/perl # Copyright (C) 2001 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 2, 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; see the file COPYING. If not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. # Build Emacs with various options for profiling, debugging, # with and without warnings enabled etc. 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 (implies Lisp union type) --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: