Mercurial > hg > xemacs-beta
view build-msw-release.sh @ 5776:65d65b52d608
Pass character count from coding systems to buffer insertion code.
src/ChangeLog addition:
2014-01-16 Aidan Kehoe <kehoea@parhasard.net>
Pass character count information from the no-conversion and
unicode coding systems to the buffer insertion code, making
#'find-file on large buffers a little snappier (if
ERROR_CHECK_TEXT is not defined).
* file-coding.c:
* file-coding.c (coding_character_tell): New.
* file-coding.c (conversion_coding_stream_description): New.
* file-coding.c (no_conversion_convert):
Update characters_seen when decoding.
* file-coding.c (no_conversion_character_tell): New.
* file-coding.c (lstream_type_create_file_coding): Create the
no_conversion type with data.
* file-coding.c (coding_system_type_create):
Make the character_tell method available here.
* file-coding.h:
* file-coding.h (struct coding_system_methods):
Add a new character_tell() method, passing charcount information
from the coding systems to the buffer code, avoiding duplicate
bytecount-to-charcount work especially with large buffers.
* fileio.c (Finsert_file_contents_internal):
Update this to pass charcount information to
buffer_insert_string_1(), if that is available from the lstream code.
* insdel.c:
* insdel.c (buffer_insert_string_1):
Add a new CCLEN argument, giving the character count of the string
to insert. It can be -1 to indicate that te function should work
it out itself using bytecount_to_charcount(), as it used to.
* insdel.c (buffer_insert_raw_string_1):
* insdel.c (buffer_insert_lisp_string_1):
* insdel.c (buffer_insert_ascstring_1):
* insdel.c (buffer_insert_emacs_char_1):
* insdel.c (buffer_insert_from_buffer_1):
* insdel.c (buffer_replace_char):
Update these functions to use the new calling convention.
* insdel.h:
* insdel.h (buffer_insert_string):
Update this header to reflect the new buffer_insert_string_1()
argument.
* lstream.c (Lstream_character_tell): New.
Return the number of characters *read* and seen by the consumer so
far, taking into account the unget buffer, and buffered reading.
* lstream.c (Lstream_unread):
Update unget_character_count here as appropriate.
* lstream.c (Lstream_rewind):
Reset unget_character_count here too.
* lstream.h:
* lstream.h (struct lstream):
Provide the character_tell method, add a new field,
unget_character_count, giving the number of characters ever passed
to Lstream_unread().
Declare Lstream_character_tell().
Make Lstream_ungetc(), which happens to be unused, an inline
function rather than a macro, in the course of updating it to
modify unget_character_count.
* print.c (output_string):
Use the new argument to buffer_insert_string_1().
* tests.c:
* tests.c (Ftest_character_tell):
New test function.
* tests.c (syms_of_tests):
Make it available.
* unicode.c:
* unicode.c (struct unicode_coding_stream):
* unicode.c (unicode_character_tell):
New method.
* unicode.c (unicode_convert):
Update the character counter as appropriate.
* unicode.c (coding_system_type_create_unicode):
Make the character_tell method available.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 16 Jan 2014 16:27:52 +0000 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
#!/bin/sh # Copyright (C) 2000 Andy Piper # 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. # This file builds the release kits for both cygwin and win32. You # must have both environments configured for it to work properly. In # particular you must provide a suitable value for NATIVE_ZLIB_DIR. # configuration NATIVE_ZLIB_DIR=/usr/local/mingw/lib PROGRAM_FILES='c:/Program Files/XEmacs' TMPINSTALL=/tmp/local # no configuration past this point INSTALL= FILES= BUILD=1 for OPT in $* do case $OPT in --install) INSTALL=1;; --installonly) INSTALL=1; BUILD='';; --help) echo "usage: build-msw-release.sh [--install]" && exit;; --*) ;; *) FILES="$FILES $OPT";; esac done # pick up version info . version.sh # decide on names emacs_ver=${emacs_major_version}.${emacs_minor_version}.${emacs_beta_version} cygwin_tarball=xemacs-i686-pc-cygwin-${emacs_ver}${emacs_kit_version}.tar.gz win32_tarball=xemacs-i586-pc-win32-${emacs_ver}${emacs_kit_version}.tar.gz DISTDIR=`pwd`/windows # check to see if we should build if test "$BUILD" = "1" then echo "Building the mswindows ${emacs_ver} release" # cleanup everything first if [ -f Makefile ] ; then make distclean fi # nuke the dist dir. rm -rf windows # create a dist directory mkdir -p windows/cygwin32 mkdir -p windows/win32 mkdir -p /usr/local mkdir -p ${TMPINSTALL} # first build win32 (cd nt; nmake -f xemacs.mak clean; nmake -f xemacs.mak) (cd "${PROGRAM_FILES}"; rm -rf ./XEmacs-${emacs_ver}) (cd nt; nmake -f xemacs.mak install; nmake -f xemacs.mak clean) # now build cygwin ./configure --with-dragndrop --with-postgresql=no --with-x=no \ --bindir=/usr/local/bin/i686-pc-cygwin --with-site-lisp=yes \ --with-ipv6-cname=no --with-netinstall make CFLAGS=-O3 MINGW_ZLIB_DIR=${NATIVE_ZLIB_DIR} beta # deal with the netinstaller (cd netinstall; strip setup.exe) cp netinstall/setup.exe windows # the win32 tar ball needs setup.exe cp netinstall/setup.exe \ "${PROGRAM_FILES}"/XEmacs-${emacs_ver}/i586-pc-win32 # make the win32 tarball (cd "${PROGRAM_FILES}"; tar czvf ${DISTDIR}/win32/${win32_tarball} \ ./XEmacs-${emacs_ver}) # make the tarball make prefix=${TMPINSTALL} bindir=${TMPINSTALL}/bin/i686-pc-cygwin install (cd ${TMPINSTALL}; tar czvf ${DISTDIR}/cygwin32/${cygwin_tarball} \ ./bin/i686-pc-cygwin \ ./lib/xemacs-${emacs_ver} \ ./lib/xemacs/lock \ ./man/man1/ctags.1 \ ./man/man1/etags.1 \ ./man/man1/gnuattach.1 \ ./man/man1/gnuclient.1 \ ./man/man1/gnudoit.1 \ ./man/man1/gnuserv.1 \ ./man/man1/xemacs.1; rm -rf bin lib man) # figure out the ini file. cygwin_tarball_size=`ls -l windows/cygwin32/${cygwin_tarball} | awk '{ print $5; }'` win32_tarball_size=`ls -l windows/win32/${win32_tarball} | awk '{ print $5; }'` (cd netinstall; make CYGWIN_SIZE=${cygwin_tarball_size} \ WIN32_SIZE=${win32_tarball_size} \ KIT_VERSION=${emacs_kit_version} setup-bin.ini ) cp netinstall/setup-bin.ini windows # tidy up make distclean fi # end of build # optionally install to the ftp site if test "$INSTALL" != "" then echo "Installing the mswindows ${emacs_ver} release" scp -r -oUser=slb -oProtocol=1 windows/* \ ftp.xemacs.org:/pub/xemacs/windows # update setup.ini ssh -1 -l slb ftp.xemacs.org 'cd /pub/xemacs/windows; sh makeini.sh' fi