Mercurial > hg > xemacs-beta
annotate build-msw-release.sh @ 5182:2e528066e2fc
Move #'sort*, #'fill, #'merge to C from cl-seq.el.
lisp/ChangeLog addition:
2010-04-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el (fill, sort*, merge): Move these functions to fns.c.
(stable-sort): Make this docstring reflect the argument names used
in the #'sort* docstring.
* cl-macs.el (stable-sort): Make #'stable-sort exactly equivalent
to #'sort* in compiled code.
* bytecomp.el (byte-compile-maybe-add-*):
New macro, for functions like #'sort and #'mapcar that, to be
strictly compatible, should only take two args, but in our
implementation can take more, because they're aliases of #'sort*
and #'mapcar*.
(byte-compile-mapcar, byte-compile-sort, byte-compile-fillarray):
Use this new macro.
(map-into): Add a byte-compile method for #'map-into in passing.
* apropos.el (apropos-print): Use #'sort* with a :key argument,
now it's in C.
* compat.el (extent-at): Ditto.
* register.el (list-registers): Ditto.
* package-ui.el (pui-list-packages): Ditto.
* help.el (sorted-key-descriptions): Ditto.
src/ChangeLog addition:
2010-03-31 Aidan Kehoe <kehoea@parhasard.net>
* fns.c (STRING_DATA_TO_OBJECT_ARRAY)
(BIT_VECTOR_TO_OBJECT_ARRAY, c_merge_predicate_key)
(c_merge_predicate_nokey, list_merge, array_merge)
(list_array_merge_into_list, list_list_merge_into_array)
(list_array_merge_into_array, CHECK_KEY_ARGUMENT, Fmerge)
(list_sort, array_sort, FsortX):
Move #'sort*, #'fill, #'merge from cl-seq.el to C, extending the
implementations of Fsort, Ffillarray, and merge() to do so.
* keymap.c (keymap_submaps, map_keymap_sort_predicate)
(describe_map_sort_predicate):
Change the calling semantics of the C sort predicates to return a
non-nil Lisp object if the first argument is less than the second,
rather than C integers.
* fontcolor-msw.c (sort_font_list_function):
* fileio.c (build_annotations):
* dired.c (Fdirectory_files):
* abbrev.c (Finsert_abbrev_table_description):
Call list_sort instead of Fsort, list_merge instead of merge() in
these functions.
man/ChangeLog addition:
2010-04-01 Aidan Kehoe <kehoea@parhasard.net>
* lispref/lists.texi (Rearrangement):
Update the documentation of #'sort here, now that it accepts any
type of sequence and the KEY keyword argument. (Though this is
probably now the wrong place for this function, given that.)
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Thu, 01 Apr 2010 20:22:50 +0100 |
parents | 8a653fbe5c27 |
children | 308d34e9f07d |
rev | line source |
---|---|
674 | 1 #!/bin/sh |
2 | |
4781
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
3 # Copyright (C) 2000 Andy Piper |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
4 |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
5 # This file is part of XEmacs. |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
6 |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
7 # XEmacs is free software; you can redistribute it and/or modify it |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
8 # under the terms of the GNU General Public License as published by |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
9 # the Free Software Foundation; either version 2, or (at your |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
10 # option) any later version. |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
11 |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
12 # XEmacs is distributed in the hope that it will be useful, but |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
13 # WITHOUT ANY WARRANTY; without even the implied warranty of |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
15 # General Public License for more details. |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
16 |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
17 # You should have received a copy of the GNU General Public License |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
18 # along with XEmacs; see the file COPYING. If not, write to the Free |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
19 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
20 # Boston, MA 02110-1301, USA. |
8a653fbe5c27
Add copyright and GPL v2 or later notices to Andy Piper's contributions, with
Jerry James <james@xemacs.org>
parents:
864
diff
changeset
|
21 |
674 | 22 # This file builds the release kits for both cygwin and win32. You |
23 # must have both environments configured for it to work properly. In | |
24 # particular you must provide a suitable value for NATIVE_ZLIB_DIR. | |
25 | |
26 # configuration | |
27 NATIVE_ZLIB_DIR=/usr/local/mingw/lib | |
28 PROGRAM_FILES='c:/Program Files/XEmacs' | |
864 | 29 TMPINSTALL=/tmp/local |
674 | 30 # no configuration past this point |
31 | |
32 INSTALL= | |
33 FILES= | |
34 BUILD=1 | |
35 | |
36 for OPT in $* | |
37 do | |
38 case $OPT in | |
39 --install) INSTALL=1;; | |
40 --installonly) INSTALL=1; BUILD='';; | |
41 --help) echo "usage: build-msw-release.sh [--install]" && exit;; | |
42 --*) ;; | |
43 *) FILES="$FILES $OPT";; | |
44 esac | |
45 done | |
46 | |
47 # pick up version info | |
48 . version.sh | |
49 | |
50 # decide on names | |
51 emacs_ver=${emacs_major_version}.${emacs_minor_version}.${emacs_beta_version} | |
708 | 52 cygwin_tarball=xemacs-i686-pc-cygwin-${emacs_ver}${emacs_kit_version}.tar.gz |
53 win32_tarball=xemacs-i586-pc-win32-${emacs_ver}${emacs_kit_version}.tar.gz | |
674 | 54 |
55 DISTDIR=`pwd`/windows | |
56 | |
57 # check to see if we should build | |
58 if test "$BUILD" = "1" | |
59 then | |
60 | |
61 echo "Building the mswindows ${emacs_ver} release" | |
62 | |
63 # cleanup everything first | |
64 if [ -f Makefile ] ; then | |
65 make distclean | |
66 fi | |
67 | |
708 | 68 # nuke the dist dir. |
69 rm -rf windows | |
70 | |
71 # create a dist directory | |
72 mkdir -p windows/cygwin32 | |
73 mkdir -p windows/win32 | |
74 mkdir -p /usr/local | |
864 | 75 mkdir -p ${TMPINSTALL} |
708 | 76 |
674 | 77 # first build win32 |
78 (cd nt; | |
708 | 79 nmake -f xemacs.mak clean; |
674 | 80 nmake -f xemacs.mak) |
81 (cd "${PROGRAM_FILES}"; | |
82 rm -rf ./XEmacs-${emacs_ver}) | |
83 (cd nt; | |
84 nmake -f xemacs.mak install; | |
85 nmake -f xemacs.mak clean) | |
86 | |
87 # now build cygwin | |
88 ./configure --with-dragndrop --with-postgresql=no --with-x=no \ | |
89 --bindir=/usr/local/bin/i686-pc-cygwin --with-site-lisp=yes \ | |
90 --with-ipv6-cname=no --with-netinstall | |
91 make CFLAGS=-O3 MINGW_ZLIB_DIR=${NATIVE_ZLIB_DIR} beta | |
92 | |
93 # deal with the netinstaller | |
94 (cd netinstall; | |
95 strip setup.exe) | |
96 cp netinstall/setup.exe windows | |
97 | |
98 # the win32 tar ball needs setup.exe | |
99 cp netinstall/setup.exe \ | |
100 "${PROGRAM_FILES}"/XEmacs-${emacs_ver}/i586-pc-win32 | |
101 | |
102 # make the win32 tarball | |
103 (cd "${PROGRAM_FILES}"; | |
104 tar czvf ${DISTDIR}/win32/${win32_tarball} \ | |
105 ./XEmacs-${emacs_ver}) | |
106 | |
107 # make the tarball | |
864 | 108 make prefix=${TMPINSTALL} bindir=${TMPINSTALL}/bin/i686-pc-cygwin install |
109 (cd ${TMPINSTALL}; | |
674 | 110 tar czvf ${DISTDIR}/cygwin32/${cygwin_tarball} \ |
111 ./bin/i686-pc-cygwin \ | |
112 ./lib/xemacs-${emacs_ver} \ | |
113 ./lib/xemacs/lock \ | |
114 ./man/man1/ctags.1 \ | |
115 ./man/man1/etags.1 \ | |
116 ./man/man1/gnuattach.1 \ | |
117 ./man/man1/gnuclient.1 \ | |
118 ./man/man1/gnudoit.1 \ | |
119 ./man/man1/gnuserv.1 \ | |
864 | 120 ./man/man1/xemacs.1; |
121 rm -rf bin lib man) | |
674 | 122 |
123 # figure out the ini file. | |
124 cygwin_tarball_size=`ls -l windows/cygwin32/${cygwin_tarball} | awk '{ print $5; }'` | |
125 win32_tarball_size=`ls -l windows/win32/${win32_tarball} | awk '{ print $5; }'` | |
126 | |
127 (cd netinstall; | |
128 make CYGWIN_SIZE=${cygwin_tarball_size} \ | |
708 | 129 WIN32_SIZE=${win32_tarball_size} \ |
130 KIT_VERSION=${emacs_kit_version} setup-bin.ini ) | |
674 | 131 cp netinstall/setup-bin.ini windows |
132 | |
133 # tidy up | |
134 make distclean | |
135 | |
136 fi | |
137 # end of build | |
138 | |
139 # optionally install to the ftp site | |
140 if test "$INSTALL" != "" | |
141 then | |
142 echo "Installing the mswindows ${emacs_ver} release" | |
143 scp -r -oUser=slb -oProtocol=1 windows/* \ | |
144 ftp.xemacs.org:/pub/xemacs/windows | |
145 # update setup.ini | |
146 ssh -1 -l slb ftp.xemacs.org 'cd /pub/xemacs/windows; sh makeini.sh' | |
147 fi | |
148 |