view admin/diff-tar-files @ 91137:00323e98bffb

Don't include Freetype headers. Include "ftfont.h". (struct ftfont_info) [HAVE_LIBOTF]: New members maybe_otf and otf. (ftfont_open) [HAVE_LIBOTF]: Initialize the above members. (ftfont_driver) [HAVE_LIBOTF, HAVE_M17N_FLT]: Don't set font_otf_capability and font_drive_otf, set ftfont_shape. (ftfont_list): Adjusted for the change of :otf property value. (struct MFLTFontFT) [HAVE_LIBOTF, HAVE_M17N_FLT]: New struct. (ftfont_get_glyph_id, ftfont_get_metrics, ftfont_check_otf) (adjust_anchor, ftfont_drive_otf, ftfont_shape_by_flt) (ftfont_shape) [HAVE_LIBOTF, HAVE_M17N_FLT]: New function.s (DEVICE_DELTA) [HAVE_LIBOTF, HAVE_M17N_FLT]: New macro. (otf_gstring, gstring, m17n_flt_initialized): New variables.

#! /bin/sh

# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
#   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, 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., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.

if [ $# != 2 ]; then
    cat <<EOF
Usage: $0 OLD-TAR NEW-TAR

Print a diff of the files in OLD-TAR and NEW-TAR.  Used for checking
the contents of Emacs tar files.
EOF
    exit 1;
fi

old_tar=$1
new_tar=$2

old_tmp=/tmp/old.$$
new_tmp=/tmp/new.$$
trap "rm -f $old_tmp $new_tmp; exit 1" 1 2 15

tar tzf $old_tar | sed -e 's,^[^/]*,,' | sort > $old_tmp
tar tzf $new_tar | sed -e 's,^[^/]*,,' | sort > $new_tmp
diff -u $old_tmp $new_tmp
rm -f $new_tmp $old_tmp


# arch-tag: ef2c96e2-ea67-4668-925c-d9a6f3d205cf