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.devel Subject: Re: feature/package+vc 04c4c578c7 3/4: Allow for packages to be installed directly from VCS Date: Sat, 22 Oct 2022 10:45:43 +0000 Message-ID: <87ilkcp25k.fsf@posteo.net> References: <164484721900.31751.1453162457552427931@vcs2.savannah.gnu.org> <87bkqmqpvb.fsf@posteo.net> <871qris3xb.fsf@gnus.org> <877d1aqoc1.fsf@posteo.net> <87edvhqdrb.fsf@gnus.org> <871qrh2hh6.fsf@posteo.net> <87mta5oyec.fsf@gnus.org> <87sfjx10x1.fsf@posteo.net> <875ygsp0ng.fsf@gnus.org> <87h70c9bu4.fsf@posteo.net> <874jw73cjy.fsf@posteo.net> <87edv72z11.fsf@posteo.net> <87czaq1i3k.fsf@posteo.net> <87fsfkhnhm.fsf@posteo.net> <87mt9s47f1.fsf@posteo.net> <871qr0kfeu.fsf@posteo.net> 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="18941"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Lars Ingebrigtsen , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Oct 22 13:22:43 2022 Return-path: Envelope-to: ged-emacs-devel@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 1omCaR-0004lj-3w for ged-emacs-devel@m.gmane-mx.org; Sat, 22 Oct 2022 13:22:43 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omC0r-0006vS-5J; Sat, 22 Oct 2022 06:45:57 -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 1omC0o-0006vJ-1J for emacs-devel@gnu.org; Sat, 22 Oct 2022 06:45:54 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omC0j-0004dm-Pt for emacs-devel@gnu.org; Sat, 22 Oct 2022 06:45:53 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id C45F9240026 for ; Sat, 22 Oct 2022 12:45:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1666435547; bh=7m9/tHCjete3K/VOsRbZxsxssh33FrQikTRMuHhPu5c=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=kWQ7ntk8dDLpAfjz6mLgQv97Q479CtGx5AFsOedlq4GuNxax1YR/ch1L8gJiUnAHT xWXPIIUXv7KAzWq3A19ifYTSSAye/Kel50YBLJdkIJDUMfNIJ6sqxmfyyjwGWE27FC TncnG65BMZQPqd6NgUT64QpQHKhLKPLvKbZCZru+irWWDWjqtLrg6p4oqC7PGQzXca GoTxSXCR2bbYer+TB9FixNHIZs/CbNiWKmx1ZYdOhZATn2YQqedtTHL5aB1O2bleGr SA3GV/+CAU342660Iga9QZJGn9EXxftdI0oqK/mMV8ME9a2bW7YjTTzJE7G0V16l/4 ODDGMkSjMJm6A== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4MvdKN1Q2Dz6tqv; Sat, 22 Oct 2022 12:45:43 +0200 (CEST) In-Reply-To: (Stefan Monnier's message of "Fri, 21 Oct 2022 18:34:53 -0400") Autocrypt: addr=philipk@posteo.net; prefer-encrypt=nopreference; keydata= mDMEYHHqUhYJKwYBBAHaRw8BAQdAp3GdmYJ6tm5McweY6dEvIYIiry+Oz9rU4MH6NHWK0Ee0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiQBBMWCAA4FiEEDM2H44ZoPt9Ms0eHtVrAHPRh1FwFAmBx6lICGwMFCwkIBwIGFQoJ CAsCBBYCAwECHgECF4AACgkQtVrAHPRh1FyTkgEAjlbGPxFchvMbxzAES3r8QLuZgCxeAXunM9gh io0ePtUBALVhh9G6wIoZhl0gUCbQpoN/UJHI08Gm1qDob5zDxnIHuDgEYHHqUhIKKwYBBAGXVQEF AQEHQNcRB+MUimTMqoxxMMUERpOR+Q4b1KgncDZkhrO2ql1tAwEIB4h4BBgWCAAgFiEEDM2H44Zo Pt9Ms0eHtVrAHPRh1FwFAmBx6lICGwwACgkQtVrAHPRh1Fw1JwD/Qo7kvtib8jy7puyWrSv0MeTS g8qIxgoRWJE/KKdkCLEA/jb9b9/g8nnX+UcwHf/4VfKsjExlnND3FrBviXUW6NcB Received-SPF: pass client-ip=185.67.36.65; envelope-from=philipk@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: "Emacs-devel" Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:298270 Archived-At: --=-=-= Content-Type: text/plain Stefan Monnier writes: >>> I'm thinking of things like the code that handles `:doc` or `:make`. >>> These don't care about Git. >> For something like :make to work, we would also require :renames, right? > > No, it's done before renames. > >> But if that is added, then the version control could break. > > In the part of `elpa-admin.el` designed for "install from Git" > (i.e. the part that matches package+vc's goal), `:rename` is not taken > into account. I don't think we can reasonably do so, as you point out, > so I think `:renames` should be labeled as something we can't support > (and eventually deprecated for that reason). OK, so I won't add support for that right now. >> How does this look like: > > I'm a bit confused: it seems to do for `:core` what I expected to happen > for packages with a nil `:url` (and it doesn't drop `:core` packages, > like I'd expect). That was my mistake, I misremembered that core packages aren't mirrored in their own branches in elpa.git. I've removed it here: --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Generate-elpa-packages.eld-with-package-data.patch >From fe8530cde40d921b96ec29513d16d91114468e75 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Fri, 21 Oct 2022 23:18:30 +0200 Subject: [PATCH] Generate elpa-packages.eld with package data * elpa-admin.el (elpaa-publish-package-specs): Process specs and write file. (elpaa-batch-make-all-packages): Call 'elpaa-publish-package-specs'. --- elpa-admin.el | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/elpa-admin.el b/elpa-admin.el index 054c9bda86..00c3393499 100644 --- a/elpa-admin.el +++ b/elpa-admin.el @@ -762,13 +762,36 @@ of the current `process-environment'. Return the modified copy." (list pkgname)) spec))) +(defun elpaa-publish-package-specs (specs) + "Process and publish SPECS in elpa-packages.eld files." + (with-temp-buffer + ;; Remove :core packages, handle :url nil and and compress the + ;; contents of the "elpa-packages" + (prin1 + (mapcan + (lambda (spec) + (cond + ((and (plist-member (cdr spec) :url) + (null (plist-get (cdr spec) :url))) + `((,(car spec) + :url ,(concat "https://git.sv.gnu.org/git/" elpaa--gitrepo) + :branch ,(concat elpaa--branch-prefix (car spec)) + ,@(cdddr spec)))) + ((plist-member (cdr spec) :core) nil) + ((list spec)))) + specs) + (current-buffer)) + (write-region nil nil (expand-file-name "elpa-packages.eld" elpaa--release-subdir)) + (write-region nil nil (expand-file-name "elpa-packages.eld" elpaa--devel-subdir)))) + (defun elpaa-batch-make-all-packages (&rest _) "Check all the packages and build the relevant new tarballs." - (let* ((specs (elpaa--get-specs))) + (let ((specs (elpaa--get-specs))) (dolist (spec specs) (condition-case err (elpaa--make-one-package spec) - (error (message "Build error for %s: %S" (car spec) err)))))) + (error (message "Build error for %s: %S" (car spec) err)))) + (elpaa-publish-package-specs specs))) (defun elpaa-batch-make-one-package (&rest _) "Build the new tarballs (if needed) for one particular package." -- 2.38.0 --=-=-= Content-Type: text/plain > Other than that, it looks OK (in the nitpick area, I'd move the code to > its own function and then call it from `elpaa-batch-make-all-packages`). Done. > I like the `.eld` extension, and I guess "elpa-packages.eld" is as good > a name as any. > >> It currently makes the assumption that :core is the first element in the >> property list for each package specification. > > That's right: that element should be either `:core` or `:url`. Great. --=-=-=--