From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#62734: Always fully rebuild autoloads in package-generate-autoloads Date: Sat, 29 Apr 2023 11:18:25 +0000 Message-ID: <874jozym0u.fsf@posteo.net> References: <87lej2oz14.fsf@le0.gs> <874jp0aw7h.fsf@posteo.net> <83pm7oqa7d.fsf@gnu.org> <87o7n7ga4x.fsf@posteo.net> <83o7n7ri64.fsf@gnu.org> <87fs8jg93g.fsf@posteo.net> <83mt2rqm57.fsf@gnu.org> <87354jnlrc.fsf@posteo.net> <83y1mbou6s.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35830"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 62734@debbugs.gnu.org, leo.gaskin@le0.gs To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Apr 29 13:19:21 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1psibp-0009CG-Av for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 29 Apr 2023 13:19:21 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psibY-0002vb-TM; Sat, 29 Apr 2023 07:19:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psibW-0002vE-Sr for bug-gnu-emacs@gnu.org; Sat, 29 Apr 2023 07:19:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psibW-0007JL-9O for bug-gnu-emacs@gnu.org; Sat, 29 Apr 2023 07:19:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psibV-0000Ko-Nn for bug-gnu-emacs@gnu.org; Sat, 29 Apr 2023 07:19:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 29 Apr 2023 11:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62734 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 62734-submit@debbugs.gnu.org id=B62734.16827670841190 (code B ref 62734); Sat, 29 Apr 2023 11:19:01 +0000 Original-Received: (at 62734) by debbugs.gnu.org; 29 Apr 2023 11:18:04 +0000 Original-Received: from localhost ([127.0.0.1]:35331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psiaZ-0000J6-To for submit@debbugs.gnu.org; Sat, 29 Apr 2023 07:18:04 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:57669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psiaW-0000IU-0s for 62734@debbugs.gnu.org; Sat, 29 Apr 2023 07:18:02 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C38FF2403B0 for <62734@debbugs.gnu.org>; Sat, 29 Apr 2023 13:17:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1682767073; bh=cjgk/LW+kJ1GC98QmvGbR5Wpgn2w+MPLy9pFepYOudU=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=NTdupO+LF+mPDLOAq2UMjhgc1NimzmlvLZKvcKCFEXSTE1DML5xsnfsu94vScG2+Q 9AmvsyPGyeo/IEYSjf5LECTgYaG76xpGVYLnfWQ6/EF1NiUfB1Wir0Fw/T0Xco39bc jUq9IpSbvTeXMNvItsMREsEske3FzCU3NOE87NSXUpXeioeKAFWfTZa5T50qDLI6rM VoWx+MaMJprVye4yMQ5UFbhkmE8MkebrOT4M3E9rbD2BRx/V49hyn9dRhXmPLIiXUl JBE97gyNZPpVzjU31F26BMo9whPxSB46/MOAgo3PSXUDB8QIRKTs4tYYk1W9WzQI+D /Zcx77i2XmiBQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Q7n5F0qVXz6tn4; Sat, 29 Apr 2023 13:17:52 +0200 (CEST) In-Reply-To: <83y1mbou6s.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 29 Apr 2023 13:32:11 +0300") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:260814 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Philip Kaludercic >> Cc: leo.gaskin@le0.gs, 62734@debbugs.gnu.org >> Date: Sat, 29 Apr 2023 08:19:35 +0000 >> >> >> Rebuilding an installation means scraping for new autoload >> >> cookies, re-compiling Emacs Lisp files, building and installing >> >> any documentation, downloading any missing dependencies. >> > >> > Thanks. As a tangent: this is confusing terminology, so it is >> > unfortunate that it was selected for this operation. >> >> Is there a different way you would have put this? What we do here is >> sort of combining the steps that the ELPA server and a local >> package-install do into one, and in my mind this constitutes building >> software. > > Compilation? Setup? Scraping for auto-loads doesn't have anything to do with "compiling" (and might be confused with byte compilation). "Setup" might be imaginable, I will think about it. > "Building" is a strange term when we are talking about a Lisp package. How come? >> > I don't follow: a file that didn't change doesn't need its autoloads >> > updated, right? >> >> Right, but if we want to add some additional code to the autoloads (as >> we are with package.el, when injecting load-path modification), then >> loaddefs-generate does not re-use the old data, and instead just throws >> it away and creates a new file with contents of EXTRA-DATA, but without >> any autoload information. > > That is definitely a bug. But a package without autoloads is still a > valid use case, and we should support it. > >> I think the central issue here is the >> >> (and (not defs) extra-data) >> >> check. Just because we did not find any new definitions to autoload >> /and/ EXTRA-DATA is non-nil, does not mean the old contents should be >> discarded. The else-case already does the right thing, so I really do >> think that getting rid of the `if' could resolve the issue: > > What happens if a package has no autoloads? The doc string says in > that case passing EXTRA-DATA will produce OUTPUT-FILE regardless. > Does your patch handle that? (It's hard to tell, given all the > whitespace changes in the patch.) It would, as the else-case of the if branch I am proposing to eliminate would still insert the EXTRA-DATA. Here is a patch generated without any whitespace changes: --=-=-= Content-Type: text/plain Content-Disposition: inline diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el index 1007be62dd9..8da0795870c 100644 --- a/lisp/emacs-lisp/loaddefs-gen.el +++ b/lisp/emacs-lisp/loaddefs-gen.el @@ -597,15 +597,6 @@ loaddefs-generate defs)))))) (progress-reporter-done progress)) - ;; If we have no autoloads data, but we have EXTRA-DATA, then - ;; generate the (almost) empty file anyway. - (if (and (not defs) extra-data) - (with-temp-buffer - (insert (loaddefs-generate--rubric output-file nil t)) - (search-backward "\f") - (insert extra-data) - (ensure-empty-lines 1) - (write-region (point-min) (point-max) output-file nil 'silent)) ;; We have some data, so generate the loaddef files. First ;; group per output file. (dolist (fdefs (seq-group-by (lambda (x) (expand-file-name (car x))) @@ -663,7 +654,7 @@ loaddefs-generate (write-region (point-min) (point-max) loaddefs-file nil 'silent) (byte-compile-info (file-relative-name loaddefs-file (car (ensure-list dir))) - t "GEN")))))))) + t "GEN"))))))) (defun loaddefs-generate--print-form (def) "Print DEF in a format that makes sense for version control." --=-=-=--