Commits

Anonymous committed 5b3cf22

[xemacs-hg @ 2002-06-04 06:09:51 by andyp]
merge 21.4 windows changes, minimally tested

  • Participants
  • Parent commits 4237561

Comments (0)

Files changed (5)

 
 See the file 'CHANGES-release' for a full list of mainline changes.
 
+to XEmacs 21.4.8 "Honest Recruiter (Windows)"
+
+  - All changes from 21.4.6 and 21.4.7.
+  - Make sure revert temporaries are not visiting files. Suggested by
+    Mike Alexander.
+  - File renaming fix from Mathias Grimmberger.
+  - Fix printer metrics on windows 95 from Jonathan Harris.
+  - Fix layout of widgets so that the search dialog works.
+  - Fix focus capture of widgets under X.
+
+to XEmacs 21.4.7 "Economic Science (Windows)"
+
+  - All changes from 21.4.6.
+  - Fix problems with auto-revert with noconfirm.
+  - Undo autoconf 2.5x changes.
+  - Undo 21.4.7 process change.
+
 to XEmacs 21.4.6 "Common Lisp (Windows)"
 
   - Made native registry entries match the installer.
   - Fixed problems wiht too many dialog popups.
   - Netinstaller fixed to correctly upgrade shortcuts when upgrading
     core XEmacs.
+  - Fix for virtual window managers from Adrian Aichner.
+  - Installer registers all C++ file types.
+  - Short-filename fix from Peter Arius.
+  - Fix for GC assertions from Adrian Aichner.
+  - Winclient DDE client from Alastair Houghton.
+  - Fix event assert from Mike Alexander.
+  - Warning removal noticed by Ben Wing.
+  - Redisplay glyph height fix from Ben Wing.
+  - Printer margin fix from Jonathan Harris.
+  - Error dialog fix suggested by Thomas Vogler.
+  - Fixed revert-buffer to not revert in the case that there is
+    nothing to be done.
+  - Glyph-baseline fix from Nix.
+  - Fixed clipping of wide glyphs in non-zero-length extents.
+  - Windows build fixes.
+  - Fixed :initial-focus so that it works.
 
 to XEmacs 21.4.5 "Civil Service (Windows)"
 
+2002-05-22  Andy Piper  <andy@xemacs.org>
+
+	* build-msw-release.sh (TMPINSTALL): install to a tmpdir so that
+	xemacs can be running while we build a dist.
+
+2002-05-07  Andy Piper  <andy@xemacs.org>
+
+	* configure.in: undo autoconf 2.5x change.
+
+2002-04-26  Andy Piper  <andy@xemacs.org>
+
+	* configure.in: make sure that a combined X and windows build gets
+	widgets.
+
+2002-04-26  Andy Piper  <andy@xemacs.org>
+
+	* configure.in: update to support autoconf 2.5x from Andreas
+	Schwab <schwab@suse.de> and/or Werner Fink <werner@suse.de>.
+
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* etc/sample.init.el: Fix comment typo about resize-minibuffer.
+
+	* etc/sample.init.el: Add description of initialization process,
+	the custom.el file, and code to load custom.el early instead of
+	late.
+
+2002-04-22  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* etc/photos/hniksic.png, etc/photos/hniksic.png: Update.
+
+2002-04-25  Mike Fabian  <mfabian@suse.de>
+
+	* configure.in: add option moduledir as mentioned in ./configure
+	--help
+
+2001-04-21  Martin Buchholz  <martin@xemacs.org>
+
+	* configure.in: Detect MacOS/X "Darwin".
+	Thanks to Greg Parker <gparker@cs.stanford.edu>.
+	
+2002-03-30  Steve Youngs  <youngs@xemacs.org>
+
+	* etc/package-index.LATEST.pgp: Update to current reality.
+
+2002-02-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* etc/TUTORIAL.se: New from Mats Lidell.
+
+2002-01-07  Jan Vroonhof  <jan@xemacs.org>
+
+	* configure.in: Make explicit "--with-widgets" mean "=yes".
+	If "--with-widgets=yes" autodetect athena.
+
+2001-12-29  Steve Youngs  <youngs@xemacs.org>
+
+	* etc/package-index.LATEST.pgp: Update.
+
+2001-12-13  William M. Perry  <wmperry@gnu.org>
+
+	* configure.in (GTK): add -Wno-shadow.
+	
+2002-01-23  Jarl Friis  <jarl@diku.dk>
+
+	* etc/BETA (http): Informing of xemacs-patches mailing list. Added
+	note on patch etiquette.
+
 2001-03-26  Paul Stodghill  <stodghil@cs.cornell.edu>
 
 	* configure.in: Don't #define __STDC__ in confdefs.h

File build-msw-release.sh

 # configuration
 NATIVE_ZLIB_DIR=/usr/local/mingw/lib
 PROGRAM_FILES='c:/Program Files/XEmacs'
+TMPINSTALL=/tmp/local
 # no configuration past this point
 
 INSTALL=
 mkdir -p windows/cygwin32
 mkdir -p windows/win32
 mkdir -p /usr/local
+mkdir -p ${TMPINSTALL}
 
 # first build win32
 (cd nt;
 	./XEmacs-${emacs_ver})
 
 # make the tarball
-make install
-(cd /usr/local;
+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} \
     ./man/man1/gnuclient.1 \
     ./man/man1/gnudoit.1 \
     ./man/man1/gnuserv.1 \
-    ./man/man1/xemacs.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; }'`

File configure.in

 	dnl Has the user specified one of the path options?
 	prefix | exec_prefix | bindir | datadir | statedir | libdir | \
 	mandir | infodir | infopath | lispdir | etcdir | pkgdir | \
-	archlibdir | docdir | package_path )
+	archlibdir | docdir | package_path | moduledir )
 	   dnl If the value was omitted, get it from the next argument.
 	   if test "$valomitted" = "yes"; then
 	     if test "$#" = 0; then
   dnl Cubix QBx/386
   i[[3-9]]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;
 
+  dnl Darwin, a.k.a. MacOS X (based on Mach and Freebsd)
+  *-*-darwin*)
+    opsys=darwin
+    RANLIB="ranlib -c" dnl Avoids a link error with lwlib-config.c
+    pdump=yes          dnl No "native" working dumper available
+    ;;
+
   dnl Data General AViiON Machines
   i586-dg-dgux*R4*   | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
   m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) opsys=dgux5-4r3 ;;

File netinstall/ChangeLog

 
 	* all: port from cygwin setup.
 
-<<<<<<< ChangeLog
-=======
-%%% $Id: ChangeLog,v 1.18 2002/06/04 06:04:38 andyp Exp $
-$Revision: 1.18 $
+%%% $Id: ChangeLog,v 1.19 2002/06/04 06:09:51 andyp Exp $
+$Revision: 1.19 $
 
->>>>>>> 1.2.2.11.2.10