From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: David PONCE Newsgroups: gmane.emacs.devel Subject: Re: Fixing the lisp/loaddefs.el situation Date: Mon, 15 Sep 2003 08:51:32 +0200 (CEST) Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <30313518.1063608692738.JavaMail.www@wwinf0203> Reply-To: david.ponce@wanadoo.fr NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1063608967 27543 80.91.224.253 (15 Sep 2003 06:56:07 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 15 Sep 2003 06:56:07 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Mon Sep 15 08:56:05 2003 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 19ynHJ-00087W-00 for ; Mon, 15 Sep 2003 08:56:05 +0200 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 19ynJp-0002mx-00 for ; Mon, 15 Sep 2003 08:58:42 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.22) id 19ynDG-0007uO-6V for emacs-devel@quimby.gnus.org; Mon, 15 Sep 2003 02:51:54 -0400 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.22) id 19ynCy-0007u8-B9 for emacs-devel@gnu.org; Mon, 15 Sep 2003 02:51:36 -0400 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.22) id 19ynCw-0007ty-Re for emacs-devel@gnu.org; Mon, 15 Sep 2003 02:51:35 -0400 Original-Received: from [193.252.22.29] (helo=mwinf0202.wanadoo.fr) by monty-python.gnu.org with esmtp (Exim 4.22) id 19ynCw-0007ts-Bt; Mon, 15 Sep 2003 02:51:34 -0400 Original-Received: from wwinf0203 (wwinf0203 [172.22.133.30]) by mwinf0202.wanadoo.fr (SMTP Server) with ESMTP id C1F22A40016F; Mon, 15 Sep 2003 08:51:32 +0200 (CEST) Original-To: miles@gnu.org X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.2 Precedence: list List-Id: Emacs development discussions. List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:16401 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:16401 Hi Miles, >>Looks good. What about lisp/makefile-w32.in? > > > I have no idea about that; a cursory glance shows lots of things > commented out from the normal makefile, and some weird shit to deal with > different command interpreter types, so I think it's best to leave it to > the experts (if there be any). I propose you this patch for lisp/makefile.w32-in, took from your changes to lisp/Makefile.in. I managed to bootstrap today's CVS version of Emacs on my Windows NT box, using latest MinGW 3.0.0-1 toolkit and the "sh" shell environment provided by cygwin. Hope it will help. David Index: lisp/makefile.w32-in =================================================================== RCS file: /cvsroot/emacs/emacs/lisp/makefile.w32-in,v retrieving revision 1.31 diff -c -r1.31 makefile.w32-in *** lisp/makefile.w32-in 1 Sep 2003 15:45:13 -0000 1.31 --- lisp/makefile.w32-in 15 Sep 2003 06:39:05 -0000 *************** *** 87,92 **** --- 87,93 ---- $(lisp)/language/utf-8-lang.el \ $(lisp)/language/georgian.el \ $(lisp)/loaddefs.el \ + $(lisp)/loaddefs-boot.el \ $(lisp)/loadup.el \ $(lisp)/mail/blessmail.el \ $(lisp)/patcomp.el \ *************** *** 352,373 **** recompile: doit $(emacs) -f batch-byte-recompile-directory $(lisp) ! # Prepare a bootstrap in the lisp subdirectory. Build loaddefs.el, ! # because it's not sure it's up-to-date, and if it's not, that might ! # lead to errors during the bootstrap because something fails to ! # autoload as expected. Remove compiled Lisp files so that ! # bootstrap-emacs will be built from sources only. # Need separate version for sh and native cmd.exe bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el bootstrap-clean-CMD: # if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads -for %f in (. $(WINS)) do for %g in (%f\*.elc) do @$(DEL) %g bootstrap-clean-SH: # if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc -for dir in . $(WINS); do rm -f $$dir/*.elc; done # Generate/update files for the bootstrap process. --- 353,385 ---- recompile: doit $(emacs) -f batch-byte-recompile-directory $(lisp) ! # Prepare a bootstrap in the lisp subdirectory. ! # ! # Build loaddefs.el, because it's not sure it's up-to-date, and if it's not, ! # that might lead to errors during the bootstrap because something fails to ! # autoload as expected. However, if there is no emacs binary, then we can't ! # build autoloads yet, so just make sure there's some loaddefs.el file, as ! # it's necessary for generating the binary (because loaddefs.el is an ! # automatically generated file, we don't want to store it in the source ! # repository). ! # ! # Remove compiled Lisp files so that bootstrap-emacs will be built from ! # sources only. # Need separate version for sh and native cmd.exe bootstrap-clean: bootstrap-clean-$(SHELLTYPE) loaddefs.el bootstrap-clean-CMD: # if exist $(EMACS) $(MAKE) $(MFLAGS) autoloads + if not exist $(lisp)\loaddefs.el cp $(lisp)/loaddefs-boot.el $(lisp)/loaddefs.el -for %f in (. $(WINS)) do for %g in (%f\*.elc) do @$(DEL) %g bootstrap-clean-SH: # if test -f $(EMACS); then $(MAKE) $(MFLAGS) autoloads; fi # -rm -f $(lisp)/*.elc $(lisp)/*/*.elc + if ! test -r $(lisp)/loaddefs.el; then \ + cp $(lisp)/loaddefs-boot.el $(lisp)/loaddefs.el; \ + fi -for dir in . $(WINS); do rm -f $$dir/*.elc; done # Generate/update files for the bootstrap process.