From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Joe Buehler Newsgroups: gmane.emacs.devel Subject: [PATCHES] 21.3.50 for Cygwin: patch 3 Date: Fri, 06 Dec 2002 13:33:21 -0500 Sender: emacs-devel-admin@gnu.org Message-ID: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Trace: main.gmane.org 1039200228 10150 80.91.224.249 (6 Dec 2002 18:43:48 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Fri, 6 Dec 2002 18:43:48 +0000 (UTC) Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 18KNRy-0002dV-00 for ; Fri, 06 Dec 2002 19:43:46 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.12 #1 (Debian)) id 18KNag-0001cL-00 for ; Fri, 06 Dec 2002 19:52:46 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18KNIm-0005GK-00; Fri, 06 Dec 2002 13:34:16 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.10.13) id 18KNIV-00058k-00 for emacs-devel@gnu.org; Fri, 06 Dec 2002 13:33:59 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18KNHw-0003n1-00 for emacs-devel@gnu.org; Fri, 06 Dec 2002 13:33:55 -0500 Original-Received: from main.gmane.org ([80.91.224.249]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18KNHv-0003kb-00 for emacs-devel@gnu.org; Fri, 06 Dec 2002 13:33:23 -0500 Original-Received: from list by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 18KNHs-0001wX-00 for ; Fri, 06 Dec 2002 19:33:20 +0100 Original-To: emacs-devel@gnu.org X-Injected-Via-Gmane: http://gmane.org/ Original-Received: from news by main.gmane.org with local (Exim 3.35 #1 (Debian)) id 18KNHr-0001wO-00 for ; Fri, 06 Dec 2002 19:33:19 +0100 Original-Path: not-for-mail Original-Lines: 537 Original-NNTP-Posting-Host: 64.47.34.2 Original-X-Trace: main.gmane.org 1039199599 7463 64.47.34.2 (6 Dec 2002 18:33:19 GMT) Original-X-Complaints-To: usenet@main.gmane.org Original-NNTP-Posting-Date: Fri, 6 Dec 2002 18:33:19 +0000 (UTC) User-Agent: Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.2) Gecko/20021126 X-Accept-Language: en-us, en Errors-To: emacs-devel-admin@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.0.11 Precedence: bulk List-Help: List-Post: List-Subscribe: , List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: Xref: main.gmane.org gmane.emacs.devel:9928 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:9928 Some Cygwin commands (e.g. cp) work transparently with or without the .exe extension on an executable file, but some commands (e.g. ln, chmod, chgrp, chown) require the exact file name. This patch adds the @EXEEXT@ string in the right places. It also fixes a minor CANNOT_DUMP problem in a makefile. Joe Buehler Index: ChangeLog =================================================================== RCS file: /cvsroot/emacs/emacs/ChangeLog,v retrieving revision 1.289 diff -u -r1.289 ChangeLog --- ChangeLog 27 Nov 2002 22:54:07 -0000 1.289 +++ ChangeLog 6 Dec 2002 17:38:35 -0000 @@ -1,3 +1,7 @@ +2002-12-06 Joe Buehler + + * Makefile.in: use @EXEEXT@ for Cygwin + 2002-11-27 Dave Love * configure.in: Use AC_CHECK_DECLS, not AC_DECL_SYS_SIGLIST. Index: ./lib-src/ChangeLog =================================================================== RCS file: /cvsroot/emacs/emacs/lib-src/ChangeLog,v retrieving revision 2.212 diff -u -r2.212 ChangeLog --- ./lib-src/ChangeLog 4 Dec 2002 11:19:42 -0000 2.212 +++ ./lib-src/ChangeLog 6 Dec 2002 17:38:39 -0000 @@ -1,3 +1,7 @@ +2002-12-06 Joe Buehler + + * Makefile.in: added @EXEEXT@ for Cygwin + 2002-12-04 Richard M. Stallman * Update getopt from gnulib version; changes described below. Index: ./lisp/ChangeLog =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v retrieving revision 1.4583 diff -u -r1.4583 ChangeLog --- ./lisp/ChangeLog 4 Dec 2002 17:20:06 -0000 1.4583 +++ ./lisp/ChangeLog 6 Dec 2002 17:38:48 -0000 @@ -1,3 +1,7 @@ +2002-12-06 Joe Buehler + + * Makefile.in: use @EXEEXT@ for Cygwin + 2002-12-04 Stefan Monnier * gdb-ui.el (gdb-inferior-io-mode-map): Remove (unused). Index: ./lwlib/ChangeLog =================================================================== RCS file: /cvsroot/emacs/emacs/lwlib/ChangeLog,v retrieving revision 1.74 diff -u -r1.74 ChangeLog --- ./lwlib/ChangeLog 21 Nov 2002 10:58:13 -0000 1.74 +++ ./lwlib/ChangeLog 6 Dec 2002 17:38:56 -0000 @@ -1,3 +1,7 @@ +2002-12-06 Joe Buehler + + * Makefile.in: use @EXEEXT@ for Cygwin + 2002-11-21 Dave Love * lwlib-Xaw.c [PROTOTYPES]: Provide ISO C arglists for functions Index: ./oldXMenu/ChangeLog =================================================================== RCS file: /cvsroot/emacs/emacs/oldXMenu/ChangeLog,v retrieving revision 1.14 diff -u -r1.14 ChangeLog --- ./oldXMenu/ChangeLog 22 Apr 2002 18:27:39 -0000 1.14 +++ ./oldXMenu/ChangeLog 6 Dec 2002 17:38:56 -0000 @@ -1,3 +1,7 @@ +2002-12-06 Joe Buehler + + * Makefile.in: use @EXEEXT@ for Cygwin + 2002-04-22 Jan D. * Activate.c: Add calls to GrabKeyboard to remove strange Index: ./src/ChangeLog =================================================================== RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v retrieving revision 1.2979 diff -u -r1.2979 ChangeLog --- ./src/ChangeLog 4 Dec 2002 11:44:42 -0000 1.2979 +++ ./src/ChangeLog 6 Dec 2002 17:39:00 -0000 @@ -1,3 +1,9 @@ +2002-12-06 Joe Buehler + + * Makefile.in: added @EXEEXT@ usage for Cygwin + + * Makefile.in: do not run "mv" on emacs if CANNOT_DUMP, since it does not exist + 2002-12-04 Richard M. Stallman * sysdep.c (fcntl.h): Test only HAVE_FCNTL_H. Index: Makefile.in =================================================================== RCS file: /cvsroot/emacs/emacs/Makefile.in,v retrieving revision 1.271 diff -u -r1.271 Makefile.in --- Makefile.in 11 Nov 2002 09:03:08 -0000 1.271 +++ Makefile.in 6 Dec 2002 16:34:32 -0000 @@ -212,8 +212,8 @@ TRANSFORM = @program_transform_name@ # What emacs should be called when installed. -EMACS = `echo emacs | sed '$(TRANSFORM)'` -EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'` +EMACS = `echo emacs@EXEEXT@ | sed '$(TRANSFORM)'` +EMACSFULL = `echo emacs-${version}@EXEEXT@ | sed '$(TRANSFORM)'` # Subdirectories to make recursively. `lisp' is not included # because the compiled lisp files are part of the distribution. @@ -355,7 +355,7 @@ exec_prefix=${exec_prefix} bindir=${bindir} \ libexecdir=${libexecdir} archlibdir=${archlibdir} \ INSTALL_STRIP=${INSTALL_STRIP}) - ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs ${bindir}/$(EMACSFULL) + ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs@EXEEXT@ ${bindir}/$(EMACSFULL) -chmod 1755 ${bindir}/$(EMACSFULL) rm -f ${bindir}/$(EMACS) -ln ${bindir}/$(EMACSFULL) ${bindir}/$(EMACS) @@ -725,7 +725,7 @@ bootstrap: bootstrap-clean-before info FRC (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) (cd src; $(MAKE) $(MFLAGS) bootstrap) - (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs) + (cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs@EXEEXT@) (cd src; $(MAKE) $(MFLAGS) mostlyclean) $(MAKE) $(MFLAGS) all Index: lib-src/Makefile.in =================================================================== RCS file: /cvsroot/emacs/emacs/lib-src/Makefile.in,v retrieving revision 1.131 diff -u -r1.131 Makefile.in --- lib-src/Makefile.in 18 Nov 2002 04:53:59 -0000 1.131 +++ lib-src/Makefile.in 6 Dec 2002 16:34:41 -0000 @@ -100,15 +100,15 @@ # Things that a user might actually run, # which should be installed in bindir. -INSTALLABLES = etags ctags emacsclient b2m ebrowse +INSTALLABLES = etags@EXEEXT@ ctags@EXEEXT@ emacsclient@EXEEXT@ b2m@EXEEXT@ ebrowse@EXEEXT@ INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog # Things that Emacs runs internally, or during the build process, # which should not be installed in bindir. -UTILITIES= profile digest-doc sorted-doc movemail cvtmail fakemail \ - yow hexl update-game-score +UTILITIES= profile@EXEEXT@ digest-doc@EXEEXT@ sorted-doc@EXEEXT@ movemail@EXEEXT@ cvtmail@EXEEXT@ fakemail@EXEEXT@ \ + yow@EXEEXT@ hexl@EXEEXT@ update-game-score@EXEEXT@ -DONT_INSTALL= test-distrib make-docfile +DONT_INSTALL= test-distrib@EXEEXT@ make-docfile@EXEEXT@ # Like UTILITIES, but they're not system-dependent, and should not be # deleted by the distclean target. @@ -272,12 +272,12 @@ maybe-blessmail: BLESSMAIL #ifdef MOVEMAIL_NEEDS_BLESSING /* Don\'t charge ahead and do it! Let the installer decide. - ./blessmail ${archlibdir}/movemail */ + ./blessmail ${archlibdir}/movemail@EXEEXT@ */ @if [ `wc -l ${etc}DOC ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp} -${libsrc}make-docfile: - cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile +${libsrc}make-docfile@EXEEXT@: + cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile@EXEEXT@ /* Some systems define this to cause parallel Make-ing. */ #ifndef MAKE_PARALLEL #define MAKE_PARALLEL #endif -temacs: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args +temacs@EXEEXT@: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args@EXEEXT@ $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \ - -o temacs ${STARTFILES} ${obj} ${otherobj} \ + -o temacs@EXEEXT@ ${STARTFILES} ${obj} ${otherobj} \ OBJECTS_MACHINE ${LIBES} /* We don't use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE often contain options that have to do with using Emacs's crt0, which are only good with temacs. */ -prefix-args: prefix-args.c $(config_h) - $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args +prefix-args@EXEEXT@: prefix-args.c $(config_h) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args@EXEEXT@ /* Don't lose if this was not defined. */ #ifndef OLDXMENU_OPTIONS @@ -1206,11 +1206,11 @@ macosx-app: ${emacsapp}Contents/MacOS/Emacs \ ${emacsapp}Contents/Resources/Emacs.rsrc -${emacsapp}Contents/MacOS/Emacs: emacs +${emacsapp}Contents/MacOS/Emacs: emacs@EXEEXT@ if [ -d ${emacsapp}Contents/MacOS/ ]; then true; else \ mkdir ${emacsapp}Contents/MacOS/; \ fi - cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs Emacs + cd ${emacsapp}Contents/MacOS/; cp ../../../../src/emacs@EXEEXT@ Emacs@EXEEXT@ ${emacsapp}Contents/Resources/Emacs.rsrc: ../mac/src/Emacs.r /Developer/Tools/Rez -useDF -o \ @@ -1219,16 +1219,16 @@ ../mac/src/Emacs.r #endif -${libsrc}emacstool: ${libsrc}emacstool.c - cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool +${libsrc}emacstool@EXEEXT@: ${libsrc}emacstool.c + cd ${libsrc}; ${MAKE} ${MFLAGS} emacstool@EXEEXT@ bootstrapclean: - rm -f bootstrap-emacs + rm -f bootstrap-emacs@EXEEXT@ mostlyclean: - rm -f temacs prefix-args core *.core \#* *.o libXMenu11.a liblw.a + rm -f temacs@EXEEXT@ prefix-args@EXEEXT@ core *.core \#* *.o libXMenu11.a liblw.a rm -f ../etc/DOC - rm -f bootstrap-emacs + rm -f bootstrap-emacs@EXEEXT@ clean: mostlyclean - rm -f emacs-* emacs + rm -f emacs-*@EXEEXT@ emacs@EXEEXT@ /**/# This is used in making a distribution. /**/# Do not use it on development directories! distclean: clean @@ -1241,7 +1241,7 @@ @echo "it deletes files that may require special tools to rebuild." rm -f TAGS versionclean: - -rm -f emacs emacs-* ../etc/DOC* + -rm -f emacs@EXEEXT@ emacs-*@EXEEXT@ ../etc/DOC* extraclean: distclean -rm -f *~ \#* m/?*~ s/?*~ @@ -1263,15 +1263,15 @@ ctagsfiles2 = [a-wA-W]*.[hc] TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) - ../lib-src/etags --include=TAGS-LISP --include=${lwlibdir}/TAGS \ + ../lib-src/etags@EXEEXT@ --include=TAGS-LISP --include=${lwlibdir}/TAGS \ --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) frc: TAGS-LISP: frc - $(MAKE) -f ${lispdir}Makefile TAGS-LISP ETAGS=../lib-src/etags + $(MAKE) -f ${lispdir}Makefile TAGS-LISP ETAGS=../lib-src/etags@EXEEXT@ $(lwlibdir)TAGS: - (cd $(lwlibdir); $(MAKE) -f $(lwlibdir)Makefile tags ETAGS=../lib-src/etags) + (cd $(lwlibdir); $(MAKE) -f $(lwlibdir)Makefile tags ETAGS=../lib-src/etags@EXEEXT@) tags: TAGS TAGS-LISP $(lwlibdir)TAGS .PHONY: tags @@ -1279,20 +1279,20 @@ /* Bootstrapping. */ -bootstrap: bootstrap-emacs +bootstrap: bootstrap-emacs@EXEEXT@ /* Dump an Emacs executable named bootstrap-emacs containing the files from loadup.el in source form. */ -bootstrap-emacs: temacs +bootstrap-emacs@EXEEXT@: temacs@EXEEXT@ #ifdef CANNOT_DUMP - ln temacs bootstrap-emacs + ln temacs@EXEEXT@ bootstrap-emacs@EXEEXT@ #else #ifdef HAVE_SHM - ./temacs -nl -batch -l loadup bootstrap + ./temacs@EXEEXT@ -nl -batch -l loadup bootstrap #else /* ! defined (HAVE_SHM) */ - ./temacs --batch --load loadup bootstrap + ./temacs@EXEEXT@ --batch --load loadup bootstrap #endif /* ! defined (HAVE_SHM) */ + mv -f emacs@EXEEXT@ bootstrap-emacs@EXEEXT@ #endif /* ! defined (CANNOT_DUMP) */ - mv -f emacs bootstrap-emacs